Android: get deps as a zip archive and sqlite3 from official source

diff --git a/build/android/app/build.gradle b/build/android/app/build.gradle
index e3619af177280a85942a9dcb14562ce97d3789f4..8e87424b524de5e451b75051d224fb0c14a9808b 100644 (file)
--- a/build/android/app/build.gradle
+++ b/build/android/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 android {
        compileSdkVersion 29
        buildToolsVersion '29.0.3'
-       ndkVersion '21.1.6352462'
+       ndkVersion '21.2.6472646'
        defaultConfig {
                applicationId 'net.minetest.minetest'
                minSdkVersion 16

diff --git a/build/android/build.gradle b/build/android/build.gradle
index 8707b563cf5fac3e4a4d0a30aebb7e448ccb947f..4cde1c3d62c3a2a1db6356b2ba975a9eebd63b97 100644 (file)
--- a/build/android/build.gradle
+++ b/build/android/build.gradle
@@ -15,8 +15,8 @@ buildscript {
                jcenter()
        }
        dependencies {
-               classpath 'com.android.tools.build:gradle:3.6.3'
-               classpath 'org.ajoberstar.grgit:grgit-gradle:4.0.2'
+               classpath 'com.android.tools.build:gradle:4.0.0'
+               classpath 'de.undercouch:gradle-download-task:4.0.4'
                // NOTE: Do not place your application dependencies here; they belong
                // in the individual module build.gradle files
        }
@@ -31,4 +31,5 @@ allprojects {
 
 task clean(type: Delete) {
        delete rootProject.buildDir
+       delete 'native/deps'
 }

diff --git a/build/android/gradle/wrapper/gradle-wrapper.properties b/build/android/gradle/wrapper/gradle-wrapper.properties
index d612cf3334b517640b1e6d873445f6c09c2f9c3e..59a00ebacb9c1d7bf2e9740d08bfcb98ff8a9aa3 100644 (file)
--- a/build/android/gradle/wrapper/gradle-wrapper.properties
+++ b/build/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,2 +1,2 @@
-#Mon Apr 06 00:06:16 CEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+#Fri Jun 05 19:18:07 CEST 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

diff --git a/build/android/native/build.gradle b/build/android/native/build.gradle
index cbd50db6a3b0ce4cb6e83a4a0dbb25e899921d47..b072766b0ecb52cb6e6d9d6e074e5cd9d09619bf 100644 (file)
--- a/build/android/native/build.gradle
+++ b/build/android/native/build.gradle
@@ -1,16 +1,16 @@
 apply plugin: 'com.android.library'
-import org.ajoberstar.grgit.Grgit
+apply plugin: 'de.undercouch.download'
 
 android {
        compileSdkVersion 29
        buildToolsVersion '29.0.3'
-       ndkVersion '21.1.6352462'
+       ndkVersion '21.2.6472646'
        defaultConfig {
                minSdkVersion 16
                targetSdkVersion 29
                externalNativeBuild {
                        ndkBuild {
-                               arguments '-j8',
+                               arguments '-j' + Runtime.getRuntime().availableProcessors(),
                                                "versionMajor=${versionMajor}",
                                                "versionMinor=${versionMinor}",
                                                "versionPatch=${versionPatch}",
@@ -45,15 +45,54 @@ android {
        }
 }
 
-task cloneGitRepo() {
-       def destination = file('deps')
-       if(!destination.exists()) {
-               def grgit = Grgit.clone(
-                               dir: destination,
-                               uri: 'https://github.com/minetest/minetest_android_deps_binaries'
-               )
-               grgit.close()
+// get precompiled deps
+def folder = 'minetest_android_deps_binaries'
+
+task downloadDeps(type: Download) {
+       src 'https://github.com/minetest/' + folder + '/archive/master.zip'
+       dest new File(buildDir, 'deps.zip')
+       overwrite false
+}
+
+task getDeps(dependsOn: downloadDeps, type: Copy) {
+       def deps = file('deps')
+       def f = file("$buildDir/" + folder + "-master")
+
+       if (!deps.exists() && !f.exists()) {
+               from zipTree(downloadDeps.dest)
+               into buildDir
+       }
+
+       doLast {
+               if (!deps.exists()) {
+                       file(f).renameTo(file(deps))
+               }
+       }
+}
+
+// get sqlite
+def sqlite_ver = '3320200'
+task downloadSqlite(dependsOn: getDeps, type: Download) {
+       src 'https://www.sqlite.org/2020/sqlite-amalgamation-' + sqlite_ver + '.zip'
+       dest new File(buildDir, 'sqlite.zip')
+       overwrite false
+}
+
+task getSqlite(dependsOn: downloadSqlite, type: Copy) {
+       def sqlite = file('deps/Android/sqlite')
+       def f = file("$buildDir/sqlite-amalgamation-" + sqlite_ver)
+
+       if (!sqlite.exists() && !f.exists()) {
+               from zipTree(downloadSqlite.dest)
+               into buildDir
+       }
+
+       doLast {
+               if (!sqlite.exists()) {
+                       file(f).renameTo(file(sqlite))
+               }
        }
 }
 
-preBuild.dependsOn cloneGitRepo
+preBuild.dependsOn getDeps
+preBuild.dependsOn getSqlite