Merge branch 'master' of https://github.com/GitLiveApp/firebase-kotli…

…n-sdk into feat/Documentation
GitLiveApp · Jun 18, 2024 · 07e0d72 · 07e0d72
2 parents f396917 + 096f468
commit 07e0d72
Show file tree

Hide file tree

Showing 19 changed files with 125 additions and 117 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,8 +14,12 @@ repositories {
 }
 
 plugins {
-    kotlin("multiplatform") apply false
-    kotlin("native.cocoapods") apply false
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlinx.serialization) apply false
+    alias(libs.plugins.multiplatform) apply false
+    alias(libs.plugins.native.cocoapods) apply false
+    alias(libs.plugins.test.logger.plugin) apply false
+    alias(libs.plugins.ben.manes.versions) apply false
     id("base")
     id("com.github.ben-manes.versions") version "0.42.0"
     id("org.jetbrains.dokka") version "1.9.20"
@@ -166,31 +170,27 @@ subprojects {
     }
 
     afterEvaluate  {
-
-        val coroutinesVersion: String by project
-        val firebaseBoMVersion: String by project
-
         dependencies {
-            "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
-            "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion")
-            "androidMainImplementation"(platform("com.google.firebase:firebase-bom:$firebaseBoMVersion"))
+            "commonMainImplementation"(libs.kotlinx.coroutines.core)
+            "androidMainImplementation"(libs.kotlinx.coroutines.play.services)
+            "androidMainImplementation"(platform(libs.firebase.bom))
             "commonTestImplementation"(kotlin("test-common"))
             "commonTestImplementation"(kotlin("test-annotations-common"))
             if (this@afterEvaluate.name != "firebase-crashlytics") {
-                "jvmMainApi"("dev.gitlive:firebase-java-sdk:0.4.3")
-                "jvmMainApi"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion") {
+                "jvmMainApi"(libs.gitlive.firebase.java.sdk)
+                "jvmMainApi"(libs.kotlinx.coroutines.play.services) {
                     exclude("com.google.android.gms")
                 }
                 "jsTestImplementation"(kotlin("test-js"))
                 "jvmTestImplementation"(kotlin("test-junit"))
-                "jvmTestImplementation"("junit:junit:4.13.2")
+                "jvmTestImplementation"(libs.junit)
             }
             "androidInstrumentedTestImplementation"(kotlin("test-junit"))
             "androidUnitTestImplementation"(kotlin("test-junit"))
-            "androidInstrumentedTestImplementation"("junit:junit:4.13.2")
-            "androidInstrumentedTestImplementation"("androidx.test:core:1.5.0")
-            "androidInstrumentedTestImplementation"("androidx.test.ext:junit:1.1.5")
-            "androidInstrumentedTestImplementation"("androidx.test:runner:1.5.2")
+            "androidInstrumentedTestImplementation"(libs.junit)
+            "androidInstrumentedTestImplementation"(libs.androidx.test.core)
+            "androidInstrumentedTestImplementation"(libs.androidx.test.junit)
+            "androidInstrumentedTestImplementation"(libs.androidx.test.runner)
         }
     }
 

diff --git a/firebase-analytics/build.gradle.kts b/firebase-analytics/build.gradle.kts
@@ -121,10 +121,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                val apiVersion: String by project
-                val languageVersion: String by project
-                this.apiVersion = apiVersion
-                this.languageVersion = languageVersion
+                this.apiVersion = libs.versions.settings.api.get()
+                this.languageVersion = libs.versions.settings.language.get()
                 progressiveMode = true
                 if (name.lowercase().contains("ios")) {
                     optIn("kotlinx.cinterop.ExperimentalForeignApi")
@@ -147,7 +145,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api("com.google.firebase:firebase-analytics")
+                api(libs.google.firebase.analytics)
             }
         }
     }

diff --git a/firebase-app/build.gradle.kts b/firebase-app/build.gradle.kts
@@ -117,10 +117,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                val apiVersion: String by project
-                val languageVersion: String by project
-                this.apiVersion = apiVersion
-                this.languageVersion = languageVersion
+                this.apiVersion = libs.versions.settings.api.get()
+                this.languageVersion = libs.versions.settings.language.get()
                 progressiveMode = true
                 if (name.lowercase().contains("ios")) {
                     optIn("kotlinx.cinterop.ExperimentalForeignApi")
@@ -142,7 +140,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api("com.google.firebase:firebase-common-ktx")
+                api(libs.google.firebase.common.ktx)
             }
         }
 

diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
@@ -129,10 +129,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                val apiVersion: String by project
-                val languageVersion: String by project
-                this.apiVersion = apiVersion
-                this.languageVersion = languageVersion
+                this.apiVersion = libs.versions.settings.api.get()
+                this.languageVersion = libs.versions.settings.language.get()
                 progressiveMode = true
                 optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
                 if (name.lowercase().contains("ios")) {
@@ -157,7 +155,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api("com.google.firebase:firebase-auth-ktx")
+                api(libs.google.firebase.auth.ktx)
             }
         }
     }

diff --git a/firebase-common-internal/build.gradle.kts b/firebase-common-internal/build.gradle.kts
@@ -110,10 +110,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                val apiVersion: String by project
-                val languageVersion: String by project
-                this.apiVersion = apiVersion
-                this.languageVersion = languageVersion
+                this.apiVersion = libs.versions.settings.api.get()
+                this.languageVersion = libs.versions.settings.language.get()
                 progressiveMode = true
                 optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
                 optIn("kotlinx.serialization.ExperimentalSerializationApi")
@@ -122,11 +120,9 @@ kotlin {
         }
 
         getByName("commonMain") {
-            val serializationVersion: String by project
-
             dependencies {
                 implementation(project(":firebase-common"))
-                api("org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationVersion")
+                api(libs.kotlinx.serialization.core)
             }
         }
 
@@ -138,7 +134,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api("com.google.firebase:firebase-common-ktx")
+                api(libs.google.firebase.common.ktx)
             }
         }
 

diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts
@@ -110,10 +110,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                val apiVersion: String by project
-                val languageVersion: String by project
-                this.apiVersion = apiVersion
-                this.languageVersion = languageVersion
+                this.apiVersion = libs.versions.settings.api.get()
+                this.languageVersion = libs.versions.settings.language.get()
                 progressiveMode = true
                 optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
                 optIn("kotlinx.serialization.ExperimentalSerializationApi")
@@ -122,10 +120,8 @@ kotlin {
         }
 
         getByName("commonMain") {
-            val serializationVersion: String by project
-
             dependencies {
-                api("org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationVersion")
+                api(libs.kotlinx.serialization.core)
             }
         }
 
@@ -137,7 +133,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api("com.google.firebase:firebase-common-ktx")
+                api(libs.google.firebase.common.ktx)
             }
         }
 

diff --git a/firebase-config/build.gradle.kts b/firebase-config/build.gradle.kts
@@ -125,10 +125,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                val apiVersion: String by project
-                val languageVersion: String by project
-                this.apiVersion = apiVersion
-                this.languageVersion = languageVersion
+                this.apiVersion = libs.versions.settings.api.get()
+                this.languageVersion = libs.versions.settings.language.get()
                 progressiveMode = true
                 optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
                 if (name.lowercase().contains("ios")) {
@@ -153,7 +151,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api("com.google.firebase:firebase-config-ktx")
+                api(libs.google.firebase.config.ktx)
             }
         }
 

diff --git a/firebase-crashlytics/build.gradle.kts b/firebase-crashlytics/build.gradle.kts
@@ -100,10 +100,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                val apiVersion: String by project
-                val languageVersion: String by project
-                this.apiVersion = apiVersion
-                this.languageVersion = languageVersion
+                this.apiVersion = libs.versions.settings.api.get()
+                this.languageVersion = libs.versions.settings.language.get()
                 progressiveMode = true
                 optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
                 if (name.lowercase().contains("ios")) {
@@ -127,7 +125,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api("com.google.firebase:firebase-crashlytics-ktx")
+                api(libs.google.firebase.crashlytics.ktx)
             }
         }
 

diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -126,10 +126,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                val apiVersion: String by project
-                val languageVersion: String by project
-                this.apiVersion = apiVersion
-                this.languageVersion = languageVersion
+                this.apiVersion = libs.versions.settings.api.get()
+                this.languageVersion = libs.versions.settings.language.get()
                 progressiveMode = true
                 optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
                 optIn("kotlinx.coroutines.FlowPreview")
@@ -160,7 +158,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api("com.google.firebase:firebase-database-ktx")
+                api(libs.google.firebase.database.ktx)
             }
         }
         getByName("jvmMain") {

diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts
@@ -138,10 +138,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                val apiVersion: String by project
-                val languageVersion: String by project
-                this.apiVersion = apiVersion
-                this.languageVersion = languageVersion
+                this.apiVersion = libs.versions.settings.api.get()
+                this.languageVersion = libs.versions.settings.language.get()
                 progressiveMode = true
                 optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
                 optIn("kotlinx.serialization.InternalSerializationApi")
@@ -169,7 +167,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api("com.google.firebase:firebase-firestore")
+                api(libs.google.firebase.firestore)
             }
         }
 

diff --git a/firebase-functions/build.gradle.kts b/firebase-functions/build.gradle.kts
@@ -116,10 +116,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                val apiVersion: String by project
-                val languageVersion: String by project
-                this.apiVersion = apiVersion
-                this.languageVersion = languageVersion
+                this.apiVersion = libs.versions.settings.api.get()
+                this.languageVersion = libs.versions.settings.language.get()
                 progressiveMode = true
                 optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
                 optIn("kotlinx.serialization.InternalSerializationApi")
@@ -145,7 +143,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api("com.google.firebase:firebase-functions")
+                api(libs.google.firebase.functions)
             }
         }
 

diff --git a/firebase-installations/build.gradle.kts b/firebase-installations/build.gradle.kts
@@ -120,10 +120,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                val apiVersion: String by project
-                val languageVersion: String by project
-                this.apiVersion = apiVersion
-                this.languageVersion = languageVersion
+                this.apiVersion = libs.versions.settings.api.get()
+                this.languageVersion = libs.versions.settings.language.get()
                 progressiveMode = true
                 if (name.lowercase().contains("ios")) {
                     optIn("kotlinx.cinterop.ExperimentalForeignApi")
@@ -146,7 +144,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api("com.google.firebase:firebase-installations-ktx")
+                api(libs.google.firebase.installations.ktx)
             }
         }
 

diff --git a/firebase-messaging/build.gradle.kts b/firebase-messaging/build.gradle.kts
@@ -120,10 +120,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                val apiVersion: String by project
-                val languageVersion: String by project
-                this.apiVersion = apiVersion
-                this.languageVersion = languageVersion
+                this.apiVersion = libs.versions.settings.api.get()
+                this.languageVersion = libs.versions.settings.language.get()
                 progressiveMode = true
                 optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
                 if (name.lowercase().contains("ios")) {
@@ -148,7 +146,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api("com.google.firebase:firebase-messaging")
+                api(libs.google.firebase.messaging)
             }
         }
     }

diff --git a/firebase-perf/build.gradle.kts b/firebase-perf/build.gradle.kts
@@ -112,10 +112,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                val apiVersion: String by project
-                val languageVersion: String by project
-                this.apiVersion = apiVersion
-                this.languageVersion = languageVersion
+                this.apiVersion = libs.versions.settings.api.get()
+                this.languageVersion = libs.versions.settings.language.get()
                 progressiveMode = true
                 optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
                 if (name.lowercase().contains("ios")) {
@@ -139,7 +137,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api("com.google.firebase:firebase-perf-ktx")
+                api(libs.google.firebase.perf.ktx)
             }
         }
 

diff --git a/firebase-storage/build.gradle.kts b/firebase-storage/build.gradle.kts
@@ -121,10 +121,8 @@ kotlin {
     sourceSets {
         all {
             languageSettings.apply {
-                val apiVersion: String by project
-                val languageVersion: String by project
-                this.apiVersion = apiVersion
-                this.languageVersion = languageVersion
+                this.apiVersion = libs.versions.settings.api.get()
+                this.languageVersion = libs.versions.settings.language.get()
                 progressiveMode = true
                 if (name.lowercase().contains("ios")) {
                     optIn("kotlinx.cinterop.ExperimentalForeignApi")
@@ -147,7 +145,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api("com.google.firebase:firebase-storage")
+                api(libs.google.firebase.storage)
             }
         }
     }