update all dependencies, gradle 9, read version code from git

barnhill · barnhill · commit dc60df28a71e · 2026-02-04T00:05:53.000-06:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,8 +1,9 @@
 @file:Suppress("UnstableApiUsage")
 
+import org.gradle.internal.extensions.core.extra
+
 plugins {
     alias(libs.plugins.android)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.ksp)
     alias(libs.plugins.kotlin.serialization.plugin)
     alias(libs.plugins.compose.compiler)
@@ -15,14 +16,17 @@ plugins {
     id("com.google.android.gms.oss-licenses-plugin")
 }
 
+val gitVersionName: String by rootProject.extra
+val gitVersionCode: String by rootProject.extra
 android {
+    namespace = "com.pnuema.bible.android"
     compileSdk = libs.versions.targetSdk.get().toInt()
     defaultConfig {
         applicationId = "com.pnuema.bible.android"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = gitVersionCode.toInt()
+        versionName = gitVersionName
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary = true
@@ -36,34 +40,85 @@ android {
             }
         }
     }
+
+    signingConfigs {
+        val bibleCertLocation: String? by rootProject.extra
+        val certLocation: String = if (System.getenv("bibleCertLocation") == null) bibleCertLocation!! else System.getenv("bibleCertLocation")
+
+        val bibleKeystorePassword: String? by rootProject.extra
+        val certPass: String = if (System.getenv("bibleKeystorePassword") == null) bibleKeystorePassword!! else System.getenv("bibleKeystorePassword")
+
+        register("release") {
+            storeFile = file(certLocation)
+            storePassword = certPass
+            keyAlias = "bible"
+            keyPassword = certPass
+        }
+        named("debug") {
+            storeFile = file("debug.keystore")
+            storePassword = "android"
+            keyAlias = "androiddebugkey"
+            keyPassword = "android"
+        }
+    }
+
     buildTypes {
-        named("release") {
+        release {
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+            isDebuggable = false
+            isMinifyEnabled = false
+            isShrinkResources = false
+            enableUnitTestCoverage = false
+            signingConfig = signingConfigs.getByName("release")
+        }
+        debug {
+            versionNameSuffix = "-debug"
+            applicationIdSuffix = ".debug"
+            isDebuggable = true
             isMinifyEnabled = false
-            setProguardFiles(listOf(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"))
+            isShrinkResources = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+            enableUnitTestCoverage = true
+            signingConfig = signingConfigs.getByName("debug")
         }
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    kotlin {
-        jvmToolchain(JavaVersion.VERSION_17.toString().toInt())
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     buildFeatures {
-        buildConfig = true
         compose = true
+        buildConfig = true
     }
 
-    namespace = "com.pnuema.bible.android"
+    testOptions {
+        unitTests.isReturnDefaultValues = true
+    }
 
     sourceSets {
-        getByName("main").java.srcDirs("src/main/kotlin")
+        getByName("test") {
+            kotlin.directories += "src/test/java"
+            kotlin.directories += "src/test/kotlin"
+        }
+        getByName("androidTest") {
+            kotlin.directories += "src/androidTest/java"
+            kotlin.directories += "src/androidTest/kotlin"
+        }
     }
 }
 
+kotlin {
+    jvmToolchain(JavaVersion.VERSION_21.toString().toInt())
+}
+
 tasks.named<com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask>("dependencyUpdates").configure {
     // optional parameters
     checkForGradleUpdate = true
diff --git a/app/debug.keystore b/app/debug.keystore
diff --git a/app/google-services.json b/app/google-services.json
@@ -3,7 +3,7 @@
     "project_number": "502741197718",
     "firebase_url": "https://fireflyapp-fe9f5.firebaseio.com",
     "project_id": "fireflyapp-fe9f5",
-    "storage_bucket": "fireflyapp-fe9f5.appspot.com"
+    "storage_bucket": "fireflyapp-fe9f5.firebasestorage.app"
   },
   "client": [
     {
@@ -42,6 +42,35 @@
           ]
         }
       }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:502741197718:android:b4bae16c7b34142ab133b7",
+        "android_client_info": {
+          "package_name": "com.pnuema.bible.android.debug"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "502741197718-473d1vgh9iihepoprgk4a69ol90m9bh2.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAx3psYNordbZdD5xUdl2JXxIBgXlBMiMM"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "502741197718-473d1vgh9iihepoprgk4a69ol90m9bh2.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
     }
   ],
   "configuration_version": "1"
diff --git a/app/src/main/java/com/pnuema/bible/android/ui/elements/CircleImageView.java b/app/src/main/java/com/pnuema/bible/android/ui/elements/CircleImageView.java
@@ -38,7 +38,15 @@ protected void onDraw( @NonNull final Canvas canvas ) {
         if (0 == getWidth() || 0 == getHeight()) {
             return;
         }
+
+        if (!(drawable instanceof BitmapDrawable)) {
+            return;
+        }
+
         final Bitmap b = ( (BitmapDrawable) drawable ).getBitmap();
+        if (b == null) {
+            return;
+        }
         final Bitmap bitmap = b.copy( Bitmap.Config.ARGB_8888, true );
 
         final int w = getWidth( )/*, h = getHeight( )*/;
diff --git a/app/src/main/kotlin/com/pnuema/bible/android/ui/read/viewModel/ReadViewModel.kt b/app/src/main/kotlin/com/pnuema/bible/android/ui/read/viewModel/ReadViewModel.kt
@@ -32,7 +32,7 @@ class ReadViewModel @Inject constructor(private val fireflyRepository: FireflyRe
             fireflyRepository.getVersions().collect { versions ->
                 _stateVersion.update {
                     VersionUiState.Version(versions.versions.first {
-                        it.abbreviation.lowercase() == CurrentSelected.version.lowercase()
+                        it.abbreviation.equals(CurrentSelected.version, ignoreCase = true)
                     }.toViewState())
                 }
             }
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
@@ -12,7 +12,7 @@
         <item name="android:statusBarColor">@color/primary</item>
     </style>
 
-    <style name="AppTheme.NoActionBar">
+    <style name="AppTheme.NoActionBar" parent="AppTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -12,7 +12,7 @@
         <item name="android:statusBarColor">@color/primary</item>
     </style>
 
-    <style name="AppTheme.NoActionBar">
+    <style name="AppTheme.NoActionBar" parent="AppTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.gradle.internal.extensions.core.extra
+
 buildscript {
     repositories {
         google()
@@ -10,7 +12,6 @@ buildscript {
 
 plugins {
     alias(libs.plugins.android) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.ksp) apply false
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.google.services) apply false
@@ -29,3 +30,20 @@ tasks {
         distributionType = Wrapper.DistributionType.BIN
     }
 }
+
+rootProject.extra.set("gitVersionName", fetchGitVersionName())
+rootProject.extra.set("gitVersionCode", fetchGitVersionCode())
+
+fun fetchGitVersionCode(): String = "git rev-list HEAD --count".execute()
+
+fun fetchGitVersionName(): String = "git describe HEAD".execute()
+
+fun String.execute(): String {
+    val process = ProcessBuilder(*split(" ").toTypedArray())
+        .redirectOutput(ProcessBuilder.Redirect.PIPE)
+        .redirectError(ProcessBuilder.Redirect.PIPE)
+        .start()
+    process.waitFor()
+    return process.inputStream.bufferedReader().readText().trim()
+}
+
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,39 +1,39 @@
 [versions]
 minSdk = "26"
 targetSdk = "36"
-gradle = "8.14.3"
+gradle = "9.1.0"
 
 #libs
-compose-bom = "2025.07.00"
-activityCompose = "1.10.1"
-hiltAndroid = "2.57"
-ktx = "1.16.0"
-fragment-ktx = "1.8.8"
-lifecycle-viewmodel-ktx = "2.9.2"
+compose-bom = "2026.01.01"
+activityCompose = "1.12.3"
+hiltAndroid = "2.59.1"
+ktx = "1.17.0"
+fragment-ktx = "1.8.9"
+lifecycle-viewmodel-ktx = "2.10.0"
 lifecycle-extensions = "2.2.0"
-ossLicensesPlugin = "0.10.6"
-room-version = "2.7.2"
-datastore-preferences = "1.2.0-alpha02"
-material = "1.12.0"
-play-services-oss-licenses = "17.2.1"
-ksp-symbol-processing = "2.2.0-2.0.2"
+ossLicensesPlugin = "0.10.10"
+room-version = "2.8.4"
+datastore-preferences = "1.2.0"
+material = "1.13.0"
+play-services-oss-licenses = "17.4.0"
+ksp-symbol-processing = "2.3.5"
 recyclerview = "1.4.0"
 constraintlayout = "2.2.1"
-firebase-bom = "34.0.0"
+firebase-bom = "34.8.0"
 retrofit = "3.0.0"
-kotlin-serialization = "1.9.0"
-okhttp = "5.1.0"
-navigation = "2.9.2"
+kotlin-serialization = "1.10.0"
+okhttp = "5.3.2"
+navigation = "2.9.7"
 
 #plugins
-kotlin= "2.2.0"
-gradlePlugins-agp = "8.11.1"
-googleServices = "4.4.3"
-gradleCacheFix = "3.0.1"
-firebasePerfPlugin = "2.0.0"
-crashlyticsPlugin = "3.0.5"
-tomlChecker = "0.52.0"
-kotlin-serialization-plugin = "2.2.0"
+kotlin= "2.3.0"
+gradlePlugins-agp = "9.0.0"
+googleServices = "4.4.4"
+gradleCacheFix = "3.0.3"
+firebasePerfPlugin = "2.0.2"
+crashlyticsPlugin = "3.0.6"
+tomlChecker = "0.53.0"
+kotlin-serialization-plugin = "2.3.0"
 
 [libraries]
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
@@ -87,7 +87,6 @@ okhttp = [
 
 [plugins]
 android = { id = "com.android.application", version.ref = "gradlePlugins-agp" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-serialization-plugin = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-serialization-plugin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp-symbol-processing" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -13,7 +13,7 @@ pluginManagement {
 }
 
 plugins {
-    id("com.gradle.develocity") version "4.1"
+    id("com.gradle.develocity") version "4.3.2"
 }
 
 dependencyResolutionManagement {

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class ReadViewModel @Inject constructor(private val fireflyRepository: FireflyRe`
`32`	`32`	`fireflyRepository.getVersions().collect { versions ->`
`33`	`33`	`_stateVersion.update {`
`34`	`34`	`VersionUiState.Version(versions.versions.first {`
`35`		`- it.abbreviation.lowercase() == CurrentSelected.version.lowercase()`
	`35`	`+ it.abbreviation.equals(CurrentSelected.version, ignoreCase = true)`
`36`	`36`	`}.toViewState())`
`37`	`37`	`}`
`38`	`38`	`}`