Versions bumped, some cleanup and Fdroid Inclusion Policy changes (#224)

.github/workflows/main.yml

@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Java 17
         uses: actions/setup-java@v3
         with:
@@ -76,7 +76,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Java 17
         uses: actions/setup-java@v3
         with:

.github/workflows/pr.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Repo"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "Setup Java 17"
         uses: actions/setup-java@v3
         with:
@@ -31,13 +31,13 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: Debug APK
-          path: zeapp/app/build/outputs/apk/debug/app-debug.apk
+          path: zeapp/android/build/outputs/apk/debug/android-debug.apk
 
   format:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Repo"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "Setup Java 17"
         uses: actions/setup-java@v3
         with:
@@ -53,7 +53,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Repo"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "Setup Java 17"
         uses: actions/setup-java@v3
         with:
@@ -68,7 +68,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Repo"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "Setup Java 17"
         uses: actions/setup-java@v3
         with:
@@ -83,7 +83,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Repo"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "Setup Java 17"
         uses: actions/setup-java@v3
         with:

.gitignore

@@ -559,3 +559,4 @@ obj/
 # End of https://www.toptal.com/developers/gitignore/api/python,android,androidstudio,intellij+all,windows,linux,macos,sublimetext,java,kotlin,circuitpython
 /zeapp/app/release/output-metadata.json
 /zeapp/app/debug/output-metadata.json
+/zeapp/versions.properties

zeapp/.gitignore

@@ -13,4 +13,4 @@
 .externalNativeBuild
 .cxx
 local.properties
-versions.properties
+versions.properties!/versions.properties

zeapp/android/build.gradle.kts

@@ -9,9 +9,6 @@ plugins {
     alias(libs.plugins.detekt.gradle)
     alias(libs.plugins.dagger.hilt)
     alias(libs.plugins.kotlin.kapt)
-    alias(libs.plugins.google.play.services)
-    alias(libs.plugins.firebase.appdistribution)
-    alias(libs.plugins.firebase.crashlytics)
     alias(libs.plugins.license.report.gradle)
     alias(libs.plugins.baselineprofile)
 }
@@ -82,13 +79,8 @@ android {
             buildConfigField(
                 "String",
                 "OPEN_API_TOKEN",
-                "\"${System.getenv("DALE2_TOKEN")}\"" ?: "\"\"",
+                "\"${System.getenv("DALE2_TOKEN")}\"",
             )
-
-            firebaseAppDistribution {
-                releaseNotesFile = "./release-notes.txt"
-                groups = "testers"
-            }
         }
         create("benchmark") {
             signingConfig = signingConfigs.getByName("debug")
@@ -160,9 +152,9 @@ detekt {
     baseline = file("detekt-baseline.xml")
     buildUponDefaultConfig = true
     reports {
-        html { enabled = true }
-        xml { enabled = true }
-        txt { enabled = false }
+        html { required = true }
+        xml { required = true }
+        txt { required = false }
     }
 }
 
@@ -185,9 +177,6 @@ dependencies {
     implementation(libs.dagger.hilt)
     implementation(libs.coil.compose)
     implementation(libs.coil.transformations)
-    implementation(platform(libs.firebase))
-    implementation(libs.firebase.analytics)
-    implementation(libs.firebase.crashlytics)
     implementation(libs.timber)
     debugImplementation(libs.androidx.compose.ui.tooling)
     debugImplementation(libs.androidx.compose.ui.test.manifest)

zeapp/android/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:theme="@style/Theme.ZeBadgeApp"
-        tools:targetApi="31">
+        tools:targetApi="34">
         <profileable android:shell="true" />
 
         <activity

zeapp/badge/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 kotlin {
     targetHierarchy.default()
 
-    android {
+    androidTarget {
         compilations.all {
             kotlinOptions {
                 jvmTarget = "1.8"

zeapp/benchmark/build.gradle.kts

@@ -18,7 +18,7 @@ android {
     }
 
     defaultConfig {
-        minSdk = 24
+        minSdk = 29
         targetSdk = 34
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -36,9 +36,9 @@ android {
     }
 
     testOptions.managedDevices.devices {
-        create<com.android.build.api.dsl.ManagedVirtualDevice>("pixel6Api31") {
+        create<com.android.build.api.dsl.ManagedVirtualDevice>("pixel6Api34") {
             device = "Pixel 6"
-            apiLevel = 31
+            apiLevel = 34
             systemImageSource = "aosp"
         }
     }
@@ -48,14 +48,14 @@ android {
 }
 
 dependencies {
-    implementation("androidx.test.ext:junit:1.1.5")
-    implementation("androidx.test.uiautomator:uiautomator:2.2.0")
-    implementation("androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha16")
+    implementation(libs.androidx.test.ext.junit)
+    implementation(libs.androidx.uiautomator)
+    implementation(libs.androidx.benchmark.macro.junit4)
 }
 
 baselineProfile {
 
     // This specifies the managed devices to use that you run the tests on. The
     // default is none.
-    managedDevices += "pixel6Api31"
+    managedDevices += "pixel6Api34"
 }

zeapp/build.gradle.kts

@@ -6,12 +6,9 @@ plugins {
     alias(libs.plugins.kotlin.kapt) apply false
     alias(libs.plugins.detekt.gradle) apply false
     alias(libs.plugins.dagger.hilt) apply false
-    alias(libs.plugins.google.play.services) apply false
-    alias(libs.plugins.firebase.appdistribution) apply false
-    alias(libs.plugins.firebase.crashlytics) apply false
     alias(libs.plugins.license.report.gradle) apply false
     id("com.android.test") version "8.0.2" apply false
-    kotlin("multiplatform").version("1.8.21").apply(false)
+    kotlin("multiplatform").version("1.9.10").apply(false)
 }
 
 tasks.register("clean", Delete::class) {

zeapp/gradle.properties

@@ -28,5 +28,5 @@ android.nonTransitiveRClass=true
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 
-kotlin.version=1.9.0
-compose.version=1.4.3
+kotlin.version=1.9.10
+compose.version=1.5.3

zeapp/gradle/libs.versions.toml

@@ -7,50 +7,46 @@ android-library = { id = "com.android.library", version.ref = "android-gradle-pl
 baselineprofile = { id = "androidx.baselineprofile", version.ref = "benchmark"}
 dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger-hilt" }
 detekt-gradle = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt-gradle" }
-firebase-appdistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebase-appdistribution" }
-firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics" }
-google-play-services = { id = "com.google.gms.google-services", version.ref = "google-play-services" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin"  }
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 ktlint-gradle = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint-gradle" }
 license-report-gradle = { id = "com.jaredsburrows.license", version.ref = "license-report-gradle" }
 
 [versions]
 
-android-gradle-plugin = "8.1.1"
-androidx-activity = "1.7.2"
-androidx-compose-bom = "2023.08.00"
-androidx-compose-compiler = "1.5.2"
-androidx-core = "1.10.1"
+android-gradle-plugin = "8.1.2"
+androidx-activity = "1.8.0"
+androidx-compose-bom = "2023.10.00"
+androidx-compose-compiler = "1.5.3"
+androidx-core = "1.12.0"
 androidx-datastore = "1.0.0"
-androidx-lifecycle = "2.6.1"
+androidx-lifecycle = "2.6.2"
 androidx-test-ext-junit = "1.1.5"
 appcompat = "1.6.1"
 benchmark = "1.2.0-alpha16"
-core-ktx = "1.10.1"
-dagger-hilt = "2.46.1"
-detekt-gradle = "1.23.0"
+benchmarkMacroJunit4 = "1.2.0-rc02"
+core-ktx = "1.12.0"
+dagger-hilt = "2.48.1"
+detekt-gradle = "1.23.1"
 espresso-core = "3.5.1"
-firebase = "32.2.3"
-firebase-appdistribution = "4.0.0"
-firebase-crashlytics = "2.9.6"
-google-play-services = "4.3.15"
 jSerialComm = "2.10.3"
 junit = "4.13.2"
-kotlin = "1.9.0"
+kotlin = "1.9.10"
 kotlinx-coroutines-core = "1.7.3"
-ktlint-gradle = "11.5.0"
+ktlint-gradle = "11.6.1"
 license-report-gradle = "0.9.3"
-material = "1.9.0"
-material3-wsc = "1.1.1"
-mik3y-usb-serial = "3.5.1"
+material = "1.10.0"
+material3-wsc = "1.1.2"
+mik3y-usb-serial = "3.6.0"
 retrofit = "2.9.0"
 timber = "5.0.1"
-zxing ="3.5.1"
+uiautomator = "2.2.0"
+zxing ="3.5.2"
 
 [libraries]
 
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
+androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "benchmarkMacroJunit4" }
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
 androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
@@ -62,16 +58,14 @@ androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx
 androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
 androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
+androidx-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "uiautomator" }
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 coil-compose = "io.coil-kt:coil-compose:2.4.0"
 coil-transformations = "com.github.Commit451.coil-transformations:transformations:2.0.2"
 core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }
 dagger-hilt = { module = "com.google.dagger:hilt-android", version.ref = "dagger-hilt" }
 dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "dagger-hilt" }
 espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
-firebase = { module = "com.google.firebase:firebase-bom", version.ref = "firebase" }
-firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" }
-firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx" }
 jSerialComm = { module = "com.fazecast:jSerialComm", version.ref = "jSerialComm" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines-core" }
@@ -83,10 +77,9 @@ retrofit2-retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref =
 timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
 zxing = { module = "com.google.zxing:core", version.ref = "zxing" }
 
-
-test-assertk = "com.willowtreeapps.assertk:assertk-jvm:0.26.1"
+test-assertk = "com.willowtreeapps.assertk:assertk-jvm:0.27.0"
 test-junit = "junit:junit:4.13.2"
-test-compose-junit = "androidx.compose.ui:ui-test-junit4:1.5.0"
-test-compose-manifest = "androidx.compose.ui:ui-test-manifest:1.5.0"
-test-mockk = "io.mockk:mockk:1.13.5"
+test-compose-junit = "androidx.compose.ui:ui-test-junit4:1.5.3"
+test-compose-manifest = "androidx.compose.ui:ui-test-manifest:1.5.3"
+test-mockk = "io.mockk:mockk:1.13.7"
 test-coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3"

zeapp/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

zeapp/settings.gradle.kts

@@ -14,7 +14,7 @@ pluginManagement {
 
 plugins {
     // See https://jmfayard.github.io/refreshVersions
-    id("de.fayard.refreshVersions") version "0.51.0"
+    id("de.fayard.refreshVersions") version "0.60.3"
 }
 
 refreshVersions {