Bump Android API and SDK versions

.github/workflows/android.yml

@@ -24,10 +24,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install deps
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends openjdk-11-jdk-headless
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+            distribution: 'temurin'
+            java-version: '17'
 
       - name: Build with gradle
         run: |

build-android/build.gradle

@@ -10,10 +10,10 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '8.5.0' apply false
+    id 'com.android.library' version '8.5.0' apply false
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register('clean', Delete) {
+	delete rootProject.buildDir
 }

build-android/gradle.properties

@@ -5,3 +5,4 @@ android.nonTransitiveRClass=true
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.parallel.threads=8
+android.nonFinalResIds=false

build-android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sun Aug 07 11:51:41 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

build-android/principia/build.gradle

@@ -4,15 +4,16 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
     ndkVersion "26.2.11394342"
+    namespace 'com.bithack.principia'
 
     defaultConfig {
         applicationId "com.bithack.principia"
         minSdk 21
-        targetSdk 33
         versionCode 36
         versionName "2024.06.28"
+        targetSdk 34
 
         externalNativeBuild {
             ndkBuild {
@@ -57,19 +58,20 @@ dependencies {
 }
 
 // get precompiled deps
-task downloadDeps(type: Download) {
-	src 'https://github.com/principia-game/principia-android-deps/releases/download/latest/deps.zip'
-	dest new File(buildDir, 'deps.zip')
-	overwrite false
+tasks.register('downloadDeps', Download) {
+    src 'https://github.com/principia-game/android-deps/releases/download/latest/deps.zip'
+    dest new File(buildDir, 'deps.zip')
+    overwrite false
 }
 
-task getDeps(dependsOn: downloadDeps, type: Copy) {
-	def deps = new File(buildDir.parent, '../deps')
-	if (!deps.exists()) {
-		deps.mkdir()
-		from zipTree(downloadDeps.dest)
-		into deps
-	}
+tasks.register('getDeps', Copy) {
+    dependsOn downloadDeps
+    def deps = new File(buildDir.parent, '../deps')
+    if (!deps.exists()) {
+        deps.mkdir()
+        from zipTree(downloadDeps.dest)
+        into deps
+    }
 }
 
 preBuild.dependsOn getDeps

build-android/principia/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bithack.principia" android:installLocation="auto">
+    android:installLocation="auto">
 
     <supports-screens android:resizeable="true" android:smallScreens="false" android:normalScreens="true"
         android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />