added multiplatform buildkonfig

DatL4g · Apr 11, 2024 · f10a3fc · f10a3fc
1 parent b427b55
commit f10a3fc
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 43 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,6 +12,7 @@ plugins {
     alias(libs.plugins.cocoapods) apply false
     alias(libs.plugins.compose) apply false
     alias(libs.plugins.crashlytics) apply false
+    alias(libs.plugins.konfig) apply false
     alias(libs.plugins.multiplatform) apply false
     alias(libs.plugins.moko.resources) apply false
     alias(libs.plugins.sekret) apply false

diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -1,3 +1,4 @@
+import com.codingfeline.buildkonfig.compiler.FieldSpec
 import com.mikepenz.aboutlibraries.plugin.DuplicateMode
 import com.mikepenz.aboutlibraries.plugin.DuplicateRule
 import org.jetbrains.compose.ExperimentalComposeLibrary
@@ -9,6 +10,7 @@ plugins {
     alias(libs.plugins.multiplatform)
     alias(libs.plugins.android.application)
     alias(libs.plugins.compose)
+    alias(libs.plugins.konfig)
     alias(libs.plugins.moko.resources)
     alias(libs.plugins.sekret)
     alias(libs.plugins.serialization)
@@ -32,6 +34,14 @@ aboutLibraries {
     excludeFields = arrayOf("generated")
 }
 
+buildkonfig {
+    packageName = artifact
+
+    defaultConfigs {
+        buildConfigField(FieldSpec.Type.STRING, "packageName", artifact)
+    }
+}
+
 sekret {
     properties {
         enabled.set(true)

diff --git a/composeApp/src/androidMain/kotlin/dev/datlag/aniflow/PackageName.android.kt b/composeApp/src/androidMain/kotlin/dev/datlag/aniflow/PackageName.android.kt
diff --git a/composeApp/src/androidMain/kotlin/dev/datlag/aniflow/module/PlatformModule.android.kt b/composeApp/src/androidMain/kotlin/dev/datlag/aniflow/module/PlatformModule.android.kt
@@ -6,10 +6,10 @@ import androidx.datastore.core.DataStoreFactory
 import androidx.datastore.core.okio.OkioStorage
 import coil3.ImageLoader
 import coil3.request.allowHardware
+import dev.datlag.aniflow.BuildKonfig
 import dev.datlag.aniflow.Sekret
 import dev.datlag.aniflow.firebase.FirebaseFactory
 import dev.datlag.aniflow.firebase.initialize
-import dev.datlag.aniflow.getPackageName
 import dev.datlag.aniflow.other.Constants
 import dev.datlag.aniflow.other.StateSaver
 import dev.datlag.aniflow.settings.DataStoreUserSettings
@@ -65,20 +65,20 @@ actual object PlatformModule {
             if (StateSaver.sekretLibraryLoaded) {
                 FirebaseFactory.initialize(
                     context = instance<Context>(),
-                    projectId = Sekret.firebaseProject(getPackageName()),
-                    applicationId = Sekret.firebaseAndroidApplication(getPackageName())!!,
-                    apiKey = Sekret.firebaseAndroidApiKey(getPackageName())!!,
+                    projectId = Sekret.firebaseProject(BuildKonfig.packageName),
+                    applicationId = Sekret.firebaseAndroidApplication(BuildKonfig.packageName)!!,
+                    apiKey = Sekret.firebaseAndroidApiKey(BuildKonfig.packageName)!!,
                     googleAuthProvider = instanceOrNull()
                 )
             } else {
                 FirebaseFactory.Empty
             }
         }
         bindSingleton(Constants.Sekret.ANILIST_CLIENT_ID) {
-            Sekret.anilistClientId(getPackageName()) ?: ""
+            Sekret.anilistClientId(BuildKonfig.packageName) ?: ""
         }
         bindSingleton(Constants.Sekret.ANILIST_CLIENT_SECRET) {
-            Sekret.anilistClientSecret(getPackageName()) ?: ""
+            Sekret.anilistClientSecret(BuildKonfig.packageName) ?: ""
         }
         bindSingleton {
             val app: Context = instance()

diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/PackageName.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/PackageName.kt
diff --git a/composeApp/src/iosMain/kotlin/dev/datlag/aniflow/PackageName.ios.kt b/composeApp/src/iosMain/kotlin/dev/datlag/aniflow/PackageName.ios.kt
diff --git a/composeApp/src/iosMain/kotlin/dev/datlag/aniflow/module/PlatformModule.ios.kt b/composeApp/src/iosMain/kotlin/dev/datlag/aniflow/module/PlatformModule.ios.kt
@@ -44,20 +44,20 @@ actual object PlatformModule {
         }
         bindSingleton<FirebaseFactory> {
             FirebaseFactory.initialize(
-                projectId = firebaseProject(getPackageName()),
-                applicationId = firebaseIosApplication(getPackageName()),
-                apiKey = firebaseIosApiKey(getPackageName()),
+                projectId = firebaseProject(BuildKonfig.packageName),
+                applicationId = firebaseIosApplication(BuildKonfig.packageName),
+                apiKey = firebaseIosApiKey(BuildKonfig.packageName),
                 googleAuthProvider = instanceOrNull()
             )
         }
         bindEagerSingleton<IosCodeAuthFlowFactory> {
             IosCodeAuthFlowFactory()
         }
         bindSingleton(Constants.Sekret.ANILIST_CLIENT_ID) {
-            anilistClientId(getPackageName())
+            anilistClientId(BuildKonfig.packageName)
         }
         bindSingleton(Constants.Sekret.ANILIST_CLIENT_SECRET) {
-            anilistClientSecret(getPackageName())
+            anilistClientSecret(BuildKonfig.packageName)
         }
     }
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,15 +4,15 @@ aboutlibraries = "11.1.0"
 activity = "1.8.2"
 android = "8.2.2"
 android-core = "1.12.0"
-android-credentials = "1.3.0-alpha01"
+android-credentials = "1.3.0-alpha02"
 apollo = "4.0.0-beta.4"
 appcompat = "1.6.1"
 coil = "3.0.0-alpha06"
 compose = "1.6.1"
 complete-kotlin = "1.1.0"
 coroutines = "1.8.0"
 crashlytics-plugin = "2.9.9"
-datastore = "1.1.0-beta02"
+datastore = "1.1.0-rc01"
 datetime = "0.5.0"
 decompose = "3.0.0-alpha09"
 desugar = "2.0.4"
@@ -30,6 +30,7 @@ kasechange = "1.4.1"
 kmpalette = "3.1.0"
 kodein = "7.21.2"
 kolor = "1.4.4"
+konfig = "0.15.1"
 kotlin = "1.9.22"
 ksp = "1.9.22-1.0.17"
 ktor = "2.3.9"
@@ -116,6 +117,7 @@ cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotli
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }
 complete-kotlin = { id = "com.louiscad.complete-kotlin", version.ref = "complete-kotlin" }
 crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "crashlytics-plugin" }
+konfig = { id = "com.codingfeline.buildkonfig", version.ref = "konfig" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 ktorfit = { id = "de.jensklingenberg.ktorfit", version.ref = "ktorfit" }
 moko-resources = { id = "dev.icerock.mobile.multiplatform-resources", version.ref = "moko-resources" }