Update dependencies and build RClone in a go module.

This commit updates build tools, android gradle plugin and RClone to
their latest version.

Also, the RClone build recipe now creates a go module instead of git.
his will make sure dependencies are pinned to the version expected by
RClone.

Author: gilbsgilbs

.github/workflows/android.yml

@@ -27,7 +27,9 @@ jobs:
       run: |
         BUILD_TOOLS_VERSION="$(grep -E "^io\.github\.x0b\.rcx\.buildToolsVersion=" gradle.properties | cut -d'=' -f2)"
         NDK_VERSION="$(grep -E "^io\.github\.x0b\.rcx\.ndkVersion=" gradle.properties | cut -d'=' -f2)"
-        yes | sudo "${ANDROID_HOME}/tools/bin/sdkmanager" "build-tools;${BUILD_TOOLS_VERSION}" "ndk;${NDK_VERSION}"
+
+        yes | sudo "${ANDROID_HOME}/tools/bin/sdkmanager" --licenses
+        sudo "${ANDROID_HOME}/tools/bin/sdkmanager" "build-tools;${BUILD_TOOLS_VERSION}" "ndk;${NDK_VERSION}"
     - name: Build app
       run: ./gradlew assembleOssDebug
     - name: Upload APK

.gitignore

@@ -2,6 +2,9 @@
 *.apk
 *.ap_
 
+# Built libraries
+*.so
+
 # Files for the ART/Dalvik VM
 *.dex
 

app/src/main/java/ca/pkay/rcloneexplorer/RemoteConfig/DriveConfig.java

@@ -2,10 +2,8 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -18,7 +16,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.fragment.app.Fragment;
 import androidx.preference.PreferenceManager;
 import ca.pkay.rcloneexplorer.MainActivity;

build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
 
         for (String taskName : getGradle().getStartParameter().getTaskNames()) {
             if (taskName.endsWith('RcxDebug') || taskName.endsWith('RcxRelease')) {

gradle.properties

@@ -14,8 +14,8 @@ android.useAndroidX=true
 # android.enableR8=true
 org.gradle.jvmargs=-Xmx1536m
 
-io.github.x0b.rcx.rCloneVersion=1.51.0
-io.github.x0b.rcx.buildToolsVersion=30.0.1
+io.github.x0b.rcx.rCloneVersion=1.52.3
+io.github.x0b.rcx.buildToolsVersion=29.0.3
 io.github.x0b.rcx.ndkVersion=21.3.6528147
 
 # When configured, Gradle will run in incubating parallel mode.

rclone/.gitignore

@@ -1 +1 @@
-/gopath
+/cache

rclone/build.gradle

@@ -3,8 +3,9 @@ import java.nio.file.Paths
 ext {
     NDK_VERSION = project.properties['io.github.x0b.rcx.ndkVersion']
     RCLONE_VERSION = project.properties['io.github.x0b.rcx.rCloneVersion']
-    RCLONE_REPOSITORY = 'github.com/rclone/rclone'
-    GO_PATH = Paths.get(projectDir.absolutePath, 'gopath').toAbsolutePath().toString()
+    RCLONE_MODULE = 'github.com/rclone/rclone'
+    CACHE_PATH = Paths.get(projectDir.absolutePath, 'cache').toAbsolutePath().toString()
+    GOPATH = Paths.get(CACHE_PATH, "gopath").toString()
 }
 
 def findSdkDir() {
@@ -83,29 +84,35 @@ def buildRclone(compiler, arch, abi, env = [:]) {
     return {
         doLast {
             exec {
-                environment 'GOPATH', GO_PATH
+                environment 'GOPATH', GOPATH
                 def crossCompiler = getCrossCompiler(compiler)
                 environment 'CC', crossCompiler
                 environment 'CC_FOR_TARGET', crossCompiler
                 environment 'GOOS', 'android'
                 environment 'GOARCH', arch
                 environment 'CGO_ENABLED', '1'
                 env.each {entry -> environment "$entry.key", "$entry.value"}
-                commandLine 'go', 'build', '-tags', 'linux', '-o', getLibrclone(abi), RCLONE_REPOSITORY
+                workingDir CACHE_PATH
+                commandLine 'go', 'build', '-tags', 'linux', '-o', getLibrclone(abi), RCLONE_MODULE
             }
         }
     }
 }
 
-task fetchRclone(type: Exec) {
-    mkdir GO_PATH
-    environment 'GOPATH', GO_PATH
-    commandLine 'go', 'get', '-d', RCLONE_REPOSITORY
+task createRcloneModule(type: Exec) {
+    // We create a fake go module as it's the only way to checkout
+    // a specific tag.
+    onlyIf { !Paths.get(CACHE_PATH, 'go.mod').toFile().exists() }
+    mkdir CACHE_PATH
+    workingDir CACHE_PATH
+    environment 'GOPATH', GOPATH
+    commandLine 'go', 'mod', 'init', 'rclone'
 }
 
-task checkoutRclone(type: Exec, dependsOn: fetchRclone) {
-    workingDir Paths.get(GO_PATH, 'src', *RCLONE_REPOSITORY.split('/'))
-    commandLine 'git', 'checkout', 'v' + RCLONE_VERSION
+task checkoutRclone(type: Exec, dependsOn: createRcloneModule) {
+    workingDir CACHE_PATH
+    environment 'GOPATH', GOPATH
+    commandLine 'go', 'get', '-v', '-d', "${RCLONE_MODULE}@v${RCLONE_VERSION}"
 }
 
 task cleanNative {