Merge pull request #1 from ChristianKatzmann/ck/drop_ktx

DatL4g · web-flow · commit d366e87fa8e0 · 2025-08-05T20:49:21.000+02:00
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 <br/>
 <br/>
 The Firebase Kotlin SDK is a Kotlin-first SDK for Firebase. It's API is similar to the 
-<a href="https://firebase.github.io/firebase-android-sdk/reference/kotlin/firebase-ktx/">Firebase Android SDK Kotlin Extensions</a> 
+<a href="https://firebase.google.com/docs/reference/kotlin/packages">Firebase Android SDK Kotlin Extensions</a> 
 but also supports multiplatform projects, enabling you to use Firebase directly from your common source targeting 
 <strong>iOS</strong>, <strong>Android</strong>, <strong>Desktop</strong> or <strong>Web</strong>, enabling the use of 
 Firebase as a backend for <a href="https://www.jetbrains.com/lp/compose-multiplatform/">Compose Multiplatform</a>, for example.
diff --git a/firebase-app/build.gradle.kts b/firebase-app/build.gradle.kts
@@ -138,7 +138,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.common.ktx)
+                api(libs.google.firebase.common)
             }
         }
 
diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
@@ -140,7 +140,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.auth.ktx)
+                api(libs.google.firebase.auth)
             }
         }
     }
diff --git a/firebase-common-internal/build.gradle.kts b/firebase-common-internal/build.gradle.kts
@@ -127,7 +127,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.common.ktx)
+                api(libs.google.firebase.common)
             }
         }
 
diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts
@@ -125,7 +125,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.common.ktx)
+                api(libs.google.firebase.common)
             }
         }
 
diff --git a/firebase-config/build.gradle.kts b/firebase-config/build.gradle.kts
@@ -133,7 +133,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.config.ktx)
+                api(libs.google.firebase.config)
             }
         }
 
diff --git a/firebase-crashlytics/build.gradle.kts b/firebase-crashlytics/build.gradle.kts
@@ -121,7 +121,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.crashlytics.ktx)
+                api(libs.google.firebase.crashlytics)
             }
         }
 
diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -147,7 +147,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.database.ktx)
+                api(libs.google.firebase.database)
             }
         }
         getByName("jvmMain") {
diff --git a/firebase-installations/build.gradle.kts b/firebase-installations/build.gradle.kts
@@ -137,7 +137,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.installations.ktx)
+                api(libs.google.firebase.installations)
             }
         }
 
diff --git a/firebase-perf/build.gradle.kts b/firebase-perf/build.gradle.kts
@@ -132,7 +132,7 @@ kotlin {
 
         getByName("androidMain") {
             dependencies {
-                api(libs.google.firebase.perf.ktx)
+                api(libs.google.firebase.perf)
             }
         }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -29,16 +29,16 @@ androidx-test-runner = { module = "androidx.test:runner", version.ref = "android
 firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase-bom" }
 gitlive-firebase-java-sdk = { module = "dev.gitlive:firebase-java-sdk", version.ref = "gitlive-firebase-java-sdk" }
 google-firebase-analytics = { module = "com.google.firebase:firebase-analytics"}
-google-firebase-auth-ktx = { module = "com.google.firebase:firebase-auth-ktx"}
-google-firebase-common-ktx = { module = "com.google.firebase:firebase-common-ktx"}
-google-firebase-config-ktx = { module = "com.google.firebase:firebase-config-ktx"}
-google-firebase-crashlytics-ktx = { module = "com.google.firebase:firebase-crashlytics-ktx"}
-google-firebase-database-ktx = { module = "com.google.firebase:firebase-database-ktx"}
+google-firebase-auth = { module = "com.google.firebase:firebase-auth"}
+google-firebase-common = { module = "com.google.firebase:firebase-common"}
+google-firebase-config = { module = "com.google.firebase:firebase-config"}
+google-firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics"}
+google-firebase-database = { module = "com.google.firebase:firebase-database"}
 google-firebase-firestore = { module = "com.google.firebase:firebase-firestore"}
 google-firebase-functions = { module = "com.google.firebase:firebase-functions"}
-google-firebase-installations-ktx = { module = "com.google.firebase:firebase-installations-ktx"}
+google-firebase-installations = { module = "com.google.firebase:firebase-installations"}
 google-firebase-messaging = { module = "com.google.firebase:firebase-messaging"}
-google-firebase-perf-ktx = { module = "com.google.firebase:firebase-perf-ktx"}
+google-firebase-perf = { module = "com.google.firebase:firebase-perf"}
 google-firebase-storage = { module = "com.google.firebase:firebase-storage"}
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 junit = { module = "junit:junit", version.ref = "junit" }

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ kotlin {`
`138`	`138`
`139`	`139`	`getByName("androidMain") {`
`140`	`140`	`dependencies {`
`141`		`- api(libs.google.firebase.common.ktx)`
	`141`	`+ api(libs.google.firebase.common)`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ kotlin {`
`140`	`140`
`141`	`141`	`getByName("androidMain") {`
`142`	`142`	`dependencies {`
`143`		`- api(libs.google.firebase.auth.ktx)`
	`143`	`+ api(libs.google.firebase.auth)`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ kotlin {`
`127`	`127`
`128`	`128`	`getByName("androidMain") {`
`129`	`129`	`dependencies {`
`130`		`- api(libs.google.firebase.common.ktx)`
	`130`	`+ api(libs.google.firebase.common)`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ kotlin {`
`125`	`125`
`126`	`126`	`getByName("androidMain") {`
`127`	`127`	`dependencies {`
`128`		`- api(libs.google.firebase.common.ktx)`
	`128`	`+ api(libs.google.firebase.common)`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ kotlin {`
`133`	`133`
`134`	`134`	`getByName("androidMain") {`
`135`	`135`	`dependencies {`
`136`		`- api(libs.google.firebase.config.ktx)`
	`136`	`+ api(libs.google.firebase.config)`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ kotlin {`
`121`	`121`
`122`	`122`	`getByName("androidMain") {`
`123`	`123`	`dependencies {`
`124`		`- api(libs.google.firebase.crashlytics.ktx)`
	`124`	`+ api(libs.google.firebase.crashlytics)`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ kotlin {`
`147`	`147`
`148`	`148`	`getByName("androidMain") {`
`149`	`149`	`dependencies {`
`150`		`- api(libs.google.firebase.database.ktx)`
	`150`	`+ api(libs.google.firebase.database)`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`	`getByName("jvmMain") {`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ kotlin {`
`137`	`137`
`138`	`138`	`getByName("androidMain") {`
`139`	`139`	`dependencies {`
`140`		`- api(libs.google.firebase.installations.ktx)`
	`140`	`+ api(libs.google.firebase.installations)`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ kotlin {`
`132`	`132`
`133`	`133`	`getByName("androidMain") {`
`134`	`134`	`dependencies {`
`135`		`- api(libs.google.firebase.perf.ktx)`
	`135`	`+ api(libs.google.firebase.perf)`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`