From 61e327e066fd7c01a8e507f29c334b429ea127a1 Mon Sep 17 00:00:00 2001
From: YuLong Yao <feilongphone@gmail.com>
Date: Tue, 31 May 2022 05:35:11 +0800
Subject: [PATCH 1/4] build: update go version

---
 .github/workflows/android.yml | 4 ++--
 rclone/build.gradle           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 39be8cef..3e15acd9 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -19,10 +19,10 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    - name: Set up Go 1.16
+    - name: Set up Go 1.18
       uses: actions/setup-go@v1
       with:
-        go-version: 1.16
+        go-version: 1.18
       id: go
     - name: Force NDK version
       run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;22.1.7171670"
diff --git a/rclone/build.gradle b/rclone/build.gradle
index 170e2460..67d2ec2d 100644
--- a/rclone/build.gradle
+++ b/rclone/build.gradle
@@ -14,7 +14,7 @@
 //  - windows x86 (with NDK 21b installed)
 //
 // Prerequisits:
-//  - go 1.14 - go 1.16
+//  - go 1.18
 //  - ndk
 
 // Rclone version - any git reference (tag, branch, hash) should work
@@ -100,7 +100,7 @@ task fetchRclone(type: Exec) {
     mkdir "gopath"
     environment 'GOPATH', goPath
     environment "GO111MODULE", "on"
-    commandLine 'go', 'get', '-d', repositoryRef
+    commandLine 'go', 'install', repositoryRef
 
     ignoreExitValue true
     errorOutput = new ByteArrayOutputStream()

From e4a53009c9630215df761e7368322c93ccfd5d69 Mon Sep 17 00:00:00 2001
From: YuLong Yao <feilongphone@gmail.com>
Date: Tue, 31 May 2022 05:36:41 +0800
Subject: [PATCH 2/4] rclone: update rclone to 1.58.1

---
 rclone/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rclone/build.gradle b/rclone/build.gradle
index 67d2ec2d..b22ce9bb 100644
--- a/rclone/build.gradle
+++ b/rclone/build.gradle
@@ -18,7 +18,7 @@
 //  - ndk
 
 // Rclone version - any git reference (tag, branch, hash) should work
-def buildTag = 'v1.55.1'
+def buildTag = 'v1.58.1'
 ext.ndkVersion = '22.1.7171670'
 
 //

From 663aaf220a81842f6100d221b7b8621ac503f7f6 Mon Sep 17 00:00:00 2001
From: YuLong Yao <feilongphone@gmail.com>
Date: Tue, 31 May 2022 05:37:09 +0800
Subject: [PATCH 3/4] build: update gradle to 7.2.1

---
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index bd711f6f..3629a808 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index abb7023c..d544f86d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,6 +2,6 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 # Warning: Update checksum when updating gradle, or Android Studio will crash!
-distributionSha256Sum=765442b8069c6bee2ea70713861c027587591c6b1df2c857a23361512560894e
+distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302

From 57edef53dcfcd9eb8d0e8c4523ceb3245f20a712 Mon Sep 17 00:00:00 2001
From: YuLong Yao <feilongphone@gmail.com>
Date: Tue, 31 May 2022 05:37:27 +0800
Subject: [PATCH 4/4] build: update ndk version

---
 .github/workflows/android.yml | 2 +-
 app/build.gradle              | 2 +-
 rclone/build.gradle           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 3e15acd9..0ea55d54 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -25,7 +25,7 @@ jobs:
         go-version: 1.18
       id: go
     - name: Force NDK version
-      run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;22.1.7171670"
+      run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;24.0.8215888"
     - name: Build rclone
       run: ./gradlew rclone:buildNative
     - name: Build app
diff --git a/app/build.gradle b/app/build.gradle
index 9d9786b1..45ede8b3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ android {
         }
     }
     compileSdkVersion 30
-    ndkVersion '22.1.7171670'
+    ndkVersion '24.0.8215888'
     defaultConfig {
         applicationId 'io.github.x0b.rcx'
         minSdkVersion 21
diff --git a/rclone/build.gradle b/rclone/build.gradle
index b22ce9bb..0e57dc2e 100644
--- a/rclone/build.gradle
+++ b/rclone/build.gradle
@@ -19,7 +19,7 @@
 
 // Rclone version - any git reference (tag, branch, hash) should work
 def buildTag = 'v1.58.1'
-ext.ndkVersion = '22.1.7171670'
+ext.ndkVersion = '24.0.8215888'
 
 //
 // DO NOT EDIT ANYTHING BELOW