Android project sdk upgrade and ci adjustments

.cirrus.yml

@@ -241,6 +241,13 @@ build_android_task:
     memory: 8G
     greedy: true
   git_submodules_script: git submodule update --init --recursive
+  gradle_cache:
+    folder: ~/.gradle/caches
+    fingerprint_script:
+      - echo $CIRRUS_OS
+      - cat **/*.gradle* **/gradle-wrapper.properties || true
+    populate_script:
+      - mkdir -p ~/.gradle/caches
   build_prepare_script: |
     cd Android && ./and-build.sh prepare
   build_debug_library_and_runtime_script: |
@@ -255,6 +262,11 @@ build_android_task:
     cd Android && ./and-build.sh archive_project
   proj_artifacts:
     path: AGS-*-android-proj-*.zip
+  # FIXME: adjust the cleanup so Cirrus CI doesn't re-upload the cache every time.
+  cleanup_gradle_script: |
+    rm -rf ~/.gradle/daemon/
+    rm -rf ~/.gradle/caches/transforms-1
+    rm -rf ~/.gradle/caches/journal-1
 
 
 build_emscripten_task:

Android/agsplayer/app/build.gradle

@@ -4,11 +4,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion "33.0.1"
+    compileSdk = 34
+    buildToolsVersion = '34.0.0'
     // the android plugin has a bug that requires specifying ndkVersion in every module, even when unused
     // this version should match what is installed in the CI
-    ndkVersion '25.1.8937393'
+    ndkVersion '25.2.9519653'
+    namespace "uk.co.adventuregamestudio.agsplayer"
 
     defaultConfig {
         applicationId "uk.co.adventuregamestudio.agsplayer"
@@ -46,14 +47,14 @@ dependencies {
     // implementation fileTree(include: ['*.aar'], dir: 'libs')
     // implementation files('libs/uk.co.adventuregamestudio.runtime.aar')
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.0'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation project(path: ':runtime')
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
-    testImplementation 'junit:junit:4.13.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }

Android/agsplayer/build.gradle

@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.7.21"
+    ext.kotlin_version = "1.9.10"
     repositories {
-        google()
         mavenCentral()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -16,8 +16,8 @@ buildscript {
 
 allprojects {
     repositories {
-        google()
         mavenCentral()
+        google()
     }
 }
 

Android/agsplayer/gradle.properties

@@ -6,16 +6,33 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.caching=true
+org.gradle.configureondemand=true
+org.gradle.daemon=true
+
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+org.gradle.parallel=true
+org.gradle.workers.max=10
+
+# additional things for timeout
+org.gradle.daemon.idletimeout=10800000
+# Set the socket timeout to 10 minutes (good for proxies)
+systemProp.org.gradle.internal.http.socketTimeout=600000
+ # the number of retries (initial included) (default 3)
+systemProp.org.gradle.internal.repository.max.retries=10
+ # the initial time before retrying, in milliseconds (default 125)
+systemProp.org.gradle.internal.repository.initial.backoff=500
+
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=false
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+org.gradle.configuration-cache=true

Android/agsplayer/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jan 18 22:02:09 BRT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+zipStorePath=wrapper/dists