Merge pull request #1159 from tunjid/tj/agp-9

Migrate to AGP 9

Author: tunjid

.github/workflows/build.yml

@@ -80,11 +80,11 @@ jobs:
           GOOGLE_SERVICES_ENCODED: ${{ secrets.GOOGLE_SERVICES_BASE_64 }}
         run: |
           # Create the directory structure
-          mkdir -p "composeApp/src/release/"
+          mkdir -p "androidApp/src/release/"
 
           # Decode the env variable into the file
           echo "$GOOGLE_SERVICES_ENCODED" | openssl base64 -d -A \
-            -out "composeApp/src/release/google-services.json"
+            -out "androidApp/src/release/google-services.json"
 
       - name: Build App
         run: ./gradlew assembleRelease

.github/workflows/publish.yml

@@ -29,11 +29,11 @@ jobs:
           GOOGLE_SERVICES_ENCODED: ${{ secrets.GOOGLE_SERVICES_BASE_64 }}
         run: |
           # Create the directory structure
-          mkdir -p "composeApp/src/release/"
+          mkdir -p "androidApp/src/release/"
 
           # Decode the env variable into the file
           echo "$GOOGLE_SERVICES_ENCODED" | openssl base64 -d -A \
-            -out "composeApp/src/release/google-services.json"
+            -out "androidApp/src/release/google-services.json"
 
       - name: Build Unsigned AAB
         env:
@@ -49,7 +49,7 @@ jobs:
         uses: r0adkll/sign-android-release@v1
         id: sign_app
         with:
-          releaseDirectory: composeApp/build/outputs/bundle/release
+          releaseDirectory: androidApp/build/outputs/bundle/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY_BASE_64 }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -70,26 +70,26 @@ jobs:
           packageName: com.tunjid.heron
           releaseFiles: ${{steps.sign_app.outputs.signedReleaseFile}}
           track: internal
-          mappingFile: composeApp/build/outputs/mapping/release/mapping.txt
-          debugSymbols: composeApp/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib
+          mappingFile: androidApp/build/outputs/mapping/release/mapping.txt
+          debugSymbols: androidApp/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib
 
 
       - name: Extract signed APKs
         run: |
           curl -L -o bundletool.jar https://github.com/google/bundletool/releases/download/1.18.3/bundletool-all-1.18.3.jar
           java -jar bundletool.jar build-apks \
             --bundle=${{ steps.sign_app.outputs.signedReleaseFile }} \
-            --output=composeApp/build/outputs/apk/release/heron.apks \
+            --output=androidApp/build/outputs/apk/release/heron.apks \
             --mode=universal
 
-          unzip -o composeApp/build/outputs/apk/release/heron.apks -d composeApp/build/outputs/apk/release/
+          unzip -o androidApp/build/outputs/apk/release/heron.apks -d androidApp/build/outputs/apk/release/
 
       - name: Upload to GitHub releases
         uses: softprops/action-gh-release@v2
         with:
           tag_name: v${{ github.run_number }}
           name: Heron v${{ github.run_number }}
-          files: composeApp/build/outputs/apk/release/universal.apk
+          files: androidApp/build/outputs/apk/release/universal.apk
           draft: true
           allow_updates: true
 

androidApp/build.gradle.kts

@@ -0,0 +1,96 @@
+/*
+ *    Copyright 2024 Adetunji Dahunsi
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+import java.util.Properties
+
+plugins {
+    id("android-application-convention")
+    id("release-convention")
+    alias(libs.plugins.composeCompiler)
+    alias(libs.plugins.googleServices)
+}
+
+android {
+    namespace = "com.tunjid.heron"
+
+    defaultConfig {
+        applicationId = "com.tunjid.heron"
+        versionCode = providers.gradleProperty("heron.versionCode")
+            .get()
+            .toInt()
+        versionName = scmVersion.version
+    }
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+    val releaseSigning = when {
+        // Do not sign the build output, it will be signed on CI
+        providers.gradleProperty("heron.isRelease").orNull.toBoolean() -> null
+        file("debugKeystore.properties").exists() -> signingConfigs.create("release") {
+            val props = Properties()
+            file("debugKeystore.properties")
+                .inputStream()
+                .use(props::load)
+            storeFile = file(props.getProperty("keystore"))
+            storePassword = props.getProperty("keystore.password")
+            keyAlias = props.getProperty("keyAlias")
+            keyPassword = props.getProperty("keyPassword")
+        }
+        else -> signingConfigs["debug"]
+    }
+    buildTypes {
+        all {
+            signingConfig = releaseSigning
+        }
+        debug {
+            applicationIdSuffix = ".debug"
+        }
+        release {
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
+        }
+    }
+}
+
+dependencies {
+    implementation(project(":composeApp"))
+    implementation(project(":data:models"))
+    implementation(project(":data:database"))
+    implementation(project(":data:core"))
+    implementation(project(":data:logging"))
+    implementation(project(":data:platform"))
+    implementation(project(":scaffold"))
+
+    implementation(libs.compose.multiplatform.components.resources)
+    implementation(libs.compose.multiplatform.runtime)
+    implementation(libs.compose.multiplatform.foundation.foundation)
+    implementation(libs.compose.multiplatform.material)
+    implementation(libs.compose.multiplatform.ui.ui)
+    implementation(libs.compose.multiplatform.ui.tooling.preview)
+
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.core.splashscreen)
+
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.messaging)
+
+    debugImplementation(libs.compose.multiplatform.ui.tooling.preview)
+}