Merge remote-tracking branch 'feilongfl/master'

# Conflicts:
#	build.gradle

Author: newhinton

.github/workflows/android.yml

@@ -19,13 +19,13 @@ 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"
+      run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;24.0.8215888"
     - name: Build rclone
       run: ./gradlew rclone:buildNative
     - name: Build app

app/build.gradle

@@ -10,7 +10,7 @@ android {
         }
     }
     compileSdkVersion 30
-    ndkVersion '22.1.7171670'
+    ndkVersion '24.0.8215888'
     defaultConfig {
         applicationId 'de.felixnuesse.extract'
         minSdkVersion 21

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

rclone/build.gradle

@@ -14,12 +14,12 @@
 //  - 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
-def buildTag = 'v1.55.1'
-ext.ndkVersion = '22.1.7171670'
+def buildTag = 'v1.58.1'
+ext.ndkVersion = '24.0.8215888'
 
 //
 // DO NOT EDIT ANYTHING BELOW