Refactor: Migrate to AGP 9.0 project structure

Migrate composeApp and data modules from the legacy android plugins to `com.android.kotlin.multiplatform.library`, and extract the Android application entry-point into a dedicated androidApp module.

Author: Rolf-Smit

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4.0.0
       - name: Build Android App
-        run: ./gradlew composeApp:assembleDebug
+        run: ./gradlew androidApp:assembleDebug
       - name: Run JVM Tests
         run: ./gradlew domain:jvmTest
   ios:

androidApp/build.gradle.kts

@@ -0,0 +1,102 @@
+/*
+ * Abysner - Dive planner
+ * Copyright (C) 2024 Neotech
+ *
+ * Abysner is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see https://www.gnu.org/licenses/.
+ */
+
+import java.util.Properties
+
+val abysnerVersion: String by project.properties
+val abysnerBuildNumber: String by project.properties
+
+plugins {
+    alias(libs.plugins.androidApplication)
+    alias(libs.plugins.compose.compiler)
+}
+
+android {
+    namespace = "nl.neotech.app.abysner"
+    compileSdk = libs.versions.android.compileSdk.get().toInt()
+
+
+    defaultConfig {
+        applicationId = "nl.neotech.app.abysner"
+        minSdk = libs.versions.android.minSdk.get().toInt()
+        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        versionCode = abysnerBuildNumber.toInt()
+        versionName = abysnerVersion
+    }
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+
+    val keystorePropertiesFile = rootProject.file("keystore.properties")
+    val keystoreProperties = Properties()
+    try {
+        keystoreProperties.load(keystorePropertiesFile.inputStream())
+    } catch (_: Exception) {
+        logger.warn("w: Unable to load keystore.properties file!")
+    }
+
+    signingConfigs {
+        create("release") {
+            keyAlias = keystoreProperties.getProperty("keyAlias")
+            keyPassword = keystoreProperties.getProperty("keyPassword")
+            keystoreProperties.getProperty("storeFile")?.let {
+                storeFile = rootProject.file(it)
+            }
+            storePassword = keystoreProperties.getProperty("storePassword")
+            storeType = keystoreProperties.getProperty("storeType") ?: "JKS"
+        }
+    }
+
+    buildTypes {
+        getByName("debug") {
+            applicationIdSuffix = ".debug"
+        }
+        getByName("release") {
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+            signingConfig = signingConfigs.getByName("release")
+        }
+        create("development") {
+            applicationIdSuffix = ".development"
+            initWith(getByName("debug"))
+            matchingFallbacks += listOf("release")
+            isMinifyEnabled = true
+            isDebuggable = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    buildFeatures {
+        compose = true
+    }
+}
+
+
+dependencies {
+    implementation(project(":composeApp"))
+    implementation(libs.androidx.activity.compose)
+
+    debugImplementation(libs.androidx.ui.tooling)
+}
+

…rc/androidMain/ic_launcher-playstore.png androidApp/ic_launcher-playstore.pngcomposeApp/src/androidMain/ic_launcher-playstore.png renamed to androidApp/ic_launcher-playstore.png composeApp/src/androidMain/ic_launcher-playstore.png renamed to androidApp/ic_launcher-playstore.png

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:name="org.neotech.app.abysner.AbysnerApplication"
+        android:theme="@style/Theme.Abysner">
+        <activity
+            android:exported="true"
+            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mnc|colorMode|density|fontScale|fontWeightAdjustment|keyboard|layoutDirection|locale|mcc|navigation|smallestScreenSize|touchscreen|uiMode"
+            android:name="org.neotech.app.abysner.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

composeApp/proguard-rules.pro androidApp/proguard-rules.procomposeApp/proguard-rules.pro renamed to androidApp/proguard-rules.pro

@@ -12,12 +12,10 @@
 
 package org.neotech.app.abysner
 
-import android.app.Activity
 import android.app.Application
 import org.neotech.app.abysner.di.AppComponent
 import org.neotech.app.abysner.di.PlatformComponentImpl
 import org.neotech.app.abysner.di.create
-import java.lang.ref.WeakReference
 
 class AbysnerApplication: Application() {
 
@@ -32,6 +30,3 @@ class AbysnerApplication: Application() {
     fun appComponent(): AppComponent = appComponent
 }
 
-// This is required for closeApp, but maybe a interface/implementation navigation class would be better
-// where the current activity is just injected, and the implementation is platform specific?
-internal var currentActivity: WeakReference<Activity> = WeakReference(null)