Refactor config services

.github/workflows/apk-release.yml

@@ -62,36 +62,33 @@ jobs:
         env:
           KEYSTORE_PROPERTIES: ${{ secrets.KEYSTORE_PROPERTIES }} 
 
-      - name: Spotless check quest application
-        run: ./gradlew :quest:spotlessCheck
-        working-directory: android
+      # - name: Spotless check quest application
+      #   run: ./gradlew :quest:spotlessCheck
+      #   working-directory: android
 
-      - name: Generate AAB (Android App Bundle) file
-        if: ${{ false }}
-        run: ./gradlew :quest:bundle${{steps.product-flavor.outputs.idCapitalized}} -x :quest:test${{steps.product-flavor.outputs.idCapitalized}}DebugUnitTest --stacktrace
-        working-directory: android
+      # - name: Generate AAB (Android App Bundle) file
+      #   if: ${{ false }}
+      #   run: ./gradlew :quest:bundle${{steps.product-flavor.outputs.idCapitalized}} -x :quest:test${{steps.product-flavor.outputs.idCapitalized}}DebugUnitTest --stacktrace
+      #   working-directory: android
 
-      - name: Upload AAB file to tag assets
-        if: ${{ false }}
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: android/quest/build/outputs/bundle/${{steps.product-flavor.outputs.id}}/release/quest-${{steps.product-flavor.outputs.id}}-release.aab
-          asset_name: "quest-$tag.aab"
-          tag: ${{ github.ref }}
-          overwrite: true
+      # - name: Upload AAB file to tag assets
+      #   if: ${{ false }}
+      #   uses: svenstaro/upload-release-action@v2
+      #   with:
+      #     repo_token: ${{ secrets.GITHUB_TOKEN }}
+      #     file: android/quest/build/outputs/bundle/${{steps.product-flavor.outputs.id}}/release/quest-${{steps.product-flavor.outputs.id}}-release.aab
+      #     asset_name: "quest-$tag.aab"
+      #     tag: ${{ github.ref }}
+      #     overwrite: true
 
       - name: Generate APK (Android App PacKage) file
         run: ./gradlew :quest:assemble${{steps.product-flavor.outputs.idCapitalized}} -x :quest:test${{steps.product-flavor.outputs.idCapitalized}}DebugUnitTest --stacktrace
         working-directory: android
 
       - name: Upload APK file to tag assets
-        uses: svenstaro/upload-release-action@v2
+        uses: wzieba/Firebase-Distribution-Github-Action@v1
         with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: android/quest/build/outputs/apk/${{steps.product-flavor.outputs.id}}/release/quest-${{steps.product-flavor.outputs.id}}-release.apk
-          asset_name: "quest-$tag.apk"
-          tag: ${{ github.ref }}
-          prerelease: ${{ contains(github.ref, '-alpha') || contains(github.ref, '-beta') }}
-          overwrite: true
-
+          appId: ${{secrets.FIREBASE_APP_ID}}
+          serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
+          groups: dev
+          file: android/quest/build/outputs/apk/${{steps.product-flavor.outputs.id}}/release/quest-${{steps.product-flavor.outputs.id}}-release.apk

android/build.gradle.kts

@@ -6,15 +6,15 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 buildscript {
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
         classpath(Deps.kotlin_coveralls_plugin)
         classpath("com.android.tools.build:gradle:8.2.2")
         classpath(Deps.dokka_plugin)
     }
 }
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.9.22"
+    id("org.jetbrains.kotlin.jvm") version "1.9.24"
     id("com.github.kt3k.coveralls") version "2.12.2"
     id("org.jetbrains.kotlin.plugin.serialization") version "1.8.10"
     id("com.google.dagger.hilt.android") version Deps.versions.hiltVersion apply false
@@ -25,6 +25,7 @@ plugins {
     id("com.google.gms.google-services") version "4.3.14" apply false
     id("com.google.firebase.firebase-perf") version "1.4.2" apply false
     id("com.google.firebase.crashlytics") version "2.9.5"
+    id("com.google.firebase.appdistribution") version "5.0.0" apply false
 }
 
 allprojects {
@@ -35,6 +36,18 @@ allprojects {
         mavenCentral()
         maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
         maven(url = "https://jcenter.bintray.com/")
+        ProjectProperties.readProperties("local.properties")
+            .takeIf { it.getProperty("dtreeRepositoryUsername") != null && it.getProperty("dtreeRepositoryPassword") != null }
+            ?.let {
+                maven {
+                    url = uri("https://maven.pkg.github.com/d-tree-org/android-fhir")
+                    name = "dtreeRepository"
+                    credentials {
+                        username = it["dtreeRepositoryUsername"]?.toString()
+                        password = it["dtreeRepositoryPassword"]?.toString()
+                    }
+                }
+            }
         maven {
             name = "fhirsdk"
             url = uri("/Users/ndegwamartin/.m2.dev/fhirsdk")
@@ -45,7 +58,7 @@ allprojects {
 subprojects {
     apply {
         plugin("com.diffplug.spotless")
-        plugin(  "jacoco")
+        plugin("jacoco")
     }
 
     configure<SpotlessExtension> {

android/buildSrc/src/main/kotlin/Deps.kt

@@ -23,7 +23,7 @@ object Deps {
         const val atsl_runner = "1.5.2"
         const val caffeine = "2.9.0"
         const val constraint_layout = "1.1.3"
-        const val coroutines = "1.7.3"
+        const val coroutines = "1.8.1"
         const val core = "1.7.0"
         const val cql_engine = "1.3.14-SNAPSHOT"
         const val desugar = "2.0.4"
@@ -32,7 +32,7 @@ object Deps {
         const val guava = "28.2-android"
         const val hapi_r4 = "5.3.0"
         const val junit5_api = "5.9.3"
-        const val kotlin = "1.8.22"
+        const val kotlin = "1.9.24"
         const val lifecycle = "2.2.0"
         const val material = "1.5.0"
         const val okhttp_logging_interceptor = "4.0.0"

android/buildSrc/src/main/kotlin/Properties.kt

@@ -0,0 +1,19 @@
+import java.io.File
+import java.io.FileInputStream
+import java.io.InputStreamReader
+import java.util.Properties
+
+object ProjectProperties {
+    fun readProperties(file: String): Properties {
+        val properties = Properties()
+        val localProperties = File(file)
+        if (localProperties.isFile) {
+            InputStreamReader(FileInputStream(localProperties), Charsets.UTF_8).use { reader
+                ->
+                properties.load(reader)
+            }
+        } else  println("\u001B[34mFILE_NOT_FOUND_EXCEPTION: File $file not found\u001B[0m")
+
+        return properties
+    }
+}

android/buildSrc/src/main/kotlin/fhir-properties.gradle.kts

@@ -1,45 +1,23 @@
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.extra
-import java.io.File
-import java.io.FileInputStream
-import java.io.FileNotFoundException
-import java.io.InputStreamReader
-import java.util.Properties
-
 val fhirAuthArray = arrayOf(
-    "FHIR_BASE_URL", "OAUTH_BASE_URL", "OAUTH_CIENT_ID", "OAUTH_CLIENT_SECRET", "OAUTH_SCOPE"
+    "FHIR_BASE_URL", "OAUTH_BASE_URL", "OAUTH_CIENT_ID", "OAUTH_CLIENT_SECRET", "OAUTH_SCOPE", "APP_ID"
 )
 //KEYSTORE CREDENTIALS
 val keystoreAuthArray = arrayOf(
     "KEYSTORE_ALIAS", "KEY_PASSWORD", "KEYSTORE_PASSWORD"
 )
 
-val localProperties = readProperties((properties["localPropertiesFile"] ?: "${rootProject.projectDir}/local.properties").toString())
+val localProperties = ProjectProperties.readProperties((properties["localPropertiesFile"] ?: "${rootProject.projectDir}/local.properties").toString())
 
 fhirAuthArray.forEach { property ->
     extra.set(property, localProperties.getProperty(property, when {
         property.contains("URL") -> "https://sample.url/fhir/"
-        else -> "sample_" + property
+        else -> "sample_$property"
     }
     ))
 }
 
-
-val keystoreProperties = readProperties((properties["keystorePropertiesFile"] ?: "${rootProject.projectDir}/keystore.properties").toString())
+val keystoreProperties = ProjectProperties.readProperties((properties["keystorePropertiesFile"] ?: "${rootProject.projectDir}/keystore.properties").toString())
 
 keystoreAuthArray.forEach { property ->
-    extra.set(property, keystoreProperties.getProperty(property, "sample_" + property))
-}
-
-fun Project.readProperties(file: String): Properties {
-    val properties = Properties()
-    val localProperties = File(file)
-    if (localProperties.isFile) {
-        InputStreamReader(FileInputStream(localProperties), Charsets.UTF_8).use { reader
-            ->
-            properties.load(reader)
-        }
-    } else  println("\u001B[34mFILE_NOT_FOUND_EXCEPTION: File $file not found\u001B[0m")
-
-    return properties
+    extra.set(property, keystoreProperties.getProperty(property, "sample_$property"))
 }