From c82902716ffa3ed81bce1a3fd5c3a23c0b302f42 Mon Sep 17 00:00:00 2001
From: x0b <devsignin+x0b@gmail.com>
Date: Fri, 7 May 2021 11:00:52 +0000
Subject: [PATCH] rcx: fix build hacks for v1.12.0

---
 metadata/io.github.x0b.rcx.yml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/metadata/io.github.x0b.rcx.yml b/metadata/io.github.x0b.rcx.yml
index 6237dfb1da..e5b4ca8564 100644
--- a/metadata/io.github.x0b.rcx.yml
+++ b/metadata/io.github.x0b.rcx.yml
@@ -42,25 +42,18 @@ Builds:
   - versionName: 1.12.0
     versionCode: 200
     commit: v1.12.0
+    sudo:
+      - apt-get update | apt-get update
+      - apt-get install -y -t testing golang-go
     gradle:
       - oss
     output: app/build/outputs/apk/oss/release/app-oss-universal-release-unsigned.apk
     build:
-      - curl -o go.tar.gz https://dl.google.com/go/go1.15.8.linux-amd64.tar.gz
-      - echo 'd3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b  go.tar.gz'
-        | sha256sum -c
-      - mkdir -p golang
-      - tar -C golang -xzf go.tar.gz
       - export GOPATH="$PWD"
-      - export GOROOT="$PWD/golang/go"
-      - export PATH="$GOROOT/bin:$PATH"
-      - sed -i "27i    environment 'GO111MODULE', 'off'" rclone/build.gradle
-      - sed -i "27i    ignoreExitValue true" rclone/build.gradle
-      - sed -i -e 's/commandLine '\''go'\''/commandLine '\''\/home\/vagrant\/build\/io.github.x0b.rcx\/golang\/go\/bin\/go'\''/g'
-        rclone/build.gradle
-      - sed -i -e 's/'\''ndk-bundle'\'',/'\''..\/android-ndk'\'', '\''r20b'\'',/g'
-        rclone/build.gradle
-    ndk: r20b
+      - sed -i -e 's|System.getenv('\''ANDROID_HOME'\''), '\''ndk'\'', '\''21.3.6528147'\'',|'\'''"$$NDK$$"''\'',
+        |g' rclone/build.gradle
+      - sed -i -e 's|21.3.6528147|21.4.7075529|g' app/build.gradle
+    ndk: r21e
     preassemble:
       - rclone:buildNative