Skip to content

Commit a53ab64

Browse files
authored
Remove deprecated ktx packages from sessions (#5391)
1 parent b6451b8 commit a53ab64

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

firebase-sessions/firebase-sessions.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ android {
4848
}
4949

5050
dependencies {
51-
api("com.google.firebase:firebase-common:20.4.0")
52-
api("com.google.firebase:firebase-common-ktx:20.4.0")
51+
api("com.google.firebase:firebase-common:20.4.0")
5352

5453
implementation("com.google.firebase:firebase-components:17.1.3")
5554
implementation(project(":firebase-installations-interop")) {
@@ -67,7 +66,7 @@ dependencies {
6766
exclude(group = "com.google.firebase", module = "firebase-common")
6867
exclude(group = "com.google.firebase", module = "firebase-components")
6968
}
70-
runtimeOnly("com.google.firebase:firebase-datatransport:18.1.8"){
69+
runtimeOnly("com.google.firebase:firebase-datatransport:18.1.8") {
7170
exclude(group = "com.google.firebase", module = "firebase-common")
7271
exclude(group = "com.google.firebase", module = "firebase-components")
7372
}

firebase-sessions/src/androidTest/kotlin/com/google/firebase/sessions/FirebaseSessionsTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ package com.google.firebase.sessions
1919
import androidx.test.core.app.ApplicationProvider
2020
import androidx.test.ext.junit.runners.AndroidJUnit4
2121
import com.google.common.truth.Truth.assertThat
22+
import com.google.firebase.Firebase
2223
import com.google.firebase.FirebaseApp
2324
import com.google.firebase.FirebaseOptions
24-
import com.google.firebase.ktx.Firebase
25-
import com.google.firebase.ktx.initialize
25+
import com.google.firebase.initialize
2626
import org.junit.After
2727
import org.junit.Before
2828
import org.junit.Test

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ package com.google.firebase.sessions
1919
import android.app.Application
2020
import android.util.Log
2121
import com.google.android.datatransport.TransportFactory
22+
import com.google.firebase.Firebase
2223
import com.google.firebase.FirebaseApp
24+
import com.google.firebase.app
2325
import com.google.firebase.inject.Provider
2426
import com.google.firebase.installations.FirebaseInstallationsApi
25-
import com.google.firebase.ktx.Firebase
26-
import com.google.firebase.ktx.app
2727
import com.google.firebase.sessions.api.FirebaseSessionsDependencies
2828
import com.google.firebase.sessions.api.SessionSubscriber
2929
import com.google.firebase.sessions.settings.SessionsSettings

firebase-sessions/src/test/kotlin/com/google/firebase/sessions/ApplicationInfoTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import android.content.Context
2020
import android.os.Build
2121
import androidx.test.core.app.ApplicationProvider
2222
import com.google.common.truth.Truth.assertThat
23+
import com.google.firebase.Firebase
2324
import com.google.firebase.FirebaseApp
2425
import com.google.firebase.FirebaseOptions
25-
import com.google.firebase.ktx.Firebase
26-
import com.google.firebase.ktx.initialize
26+
import com.google.firebase.initialize
2727
import com.google.firebase.sessions.testing.FakeFirebaseApp
2828
import org.junit.After
2929
import org.junit.Test

firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeFirebaseApp.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import android.content.Context
2020
import android.os.Bundle
2121
import androidx.test.core.app.ApplicationProvider
2222
import androidx.test.core.content.pm.PackageInfoBuilder
23+
import com.google.firebase.Firebase
2324
import com.google.firebase.FirebaseApp
2425
import com.google.firebase.FirebaseOptions
25-
import com.google.firebase.ktx.Firebase
26-
import com.google.firebase.ktx.initialize
26+
import com.google.firebase.initialize
2727
import org.robolectric.Shadows
2828

2929
internal class FakeFirebaseApp(metadata: Bundle? = null) {

0 commit comments

Comments
 (0)