Update dependencies (#207)

rob729 · web-flow · commit a187438cfe47 · 2025-12-26T16:12:11.000+05:30
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -109,6 +109,9 @@ android {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
+    lint {
+        disable += "InvalidFragmentVersionForActivityResult"
+    }
     namespace = "com.rob729.newsfeed"
 }
 
@@ -163,9 +166,11 @@ dependencies {
     implementation(libs.androidx.datastore.preferences)
     implementation(libs.androidx.runtime.tracing)
 
-    implementation(libs.coil)
+    implementation(libs.coil.ktor)
     implementation(libs.coil.compose)
 
+    implementation(libs.ktor.client.android)
+
     implementation(libs.kotlinx.serialization)
 
     implementation(libs.orbit.viewmodel)
diff --git a/app/src/main/java/com/rob729/newsfeed/di/AppGraph.kt b/app/src/main/java/com/rob729/newsfeed/di/AppGraph.kt
@@ -13,8 +13,7 @@ import kotlin.reflect.KClass
 
 @DependencyGraph(
     scope = AppScope::class,
-    bindingContainers = [AppModule::class],
-    additionalScopes = [ViewModelScope::class]
+    bindingContainers = [AppModule::class]
 )
 interface AppGraph {
 
diff --git a/app/src/main/java/com/rob729/newsfeed/di/MetroViewModelFactory.kt b/app/src/main/java/com/rob729/newsfeed/di/MetroViewModelFactory.kt
@@ -2,12 +2,13 @@ package com.rob729.newsfeed.di
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.Provider
 import kotlin.reflect.KClass
 
-@ContributesBinding(ViewModelScope::class)
+@ContributesBinding(AppScope::class)
 @Inject
 class MetroViewModelFactory(
     private val viewModelProviders: Map<KClass<out ViewModel>, Provider<ViewModel>>
diff --git a/app/src/main/java/com/rob729/newsfeed/di/ViewModelGraph.kt b/app/src/main/java/com/rob729/newsfeed/di/ViewModelGraph.kt
diff --git a/app/src/main/java/com/rob729/newsfeed/di/ViewModelScope.kt b/app/src/main/java/com/rob729/newsfeed/di/ViewModelScope.kt
diff --git a/app/src/main/java/com/rob729/newsfeed/ui/components/NewsFeedItem.kt b/app/src/main/java/com/rob729/newsfeed/ui/components/NewsFeedItem.kt
@@ -27,8 +27,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.core.content.ContextCompat.startActivity
-import coil.compose.AsyncImage
+import coil3.compose.AsyncImage
 import com.rob729.newsfeed.model.ui.NewsArticleUiData
 import com.rob729.newsfeed.ui.theme.lexendDecaFontFamily
 import com.rob729.newsfeed.utils.CommonUtils
diff --git a/app/src/main/java/com/rob729/newsfeed/ui/components/NewsSourcePill.kt b/app/src/main/java/com/rob729/newsfeed/ui/components/NewsSourcePill.kt
@@ -24,7 +24,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import coil.compose.AsyncImage
+import coil3.compose.AsyncImage
 import com.rob729.newsfeed.AppPreferences.NewsSource
 import com.rob729.newsfeed.ui.theme.lexendDecaFontFamily
 
diff --git a/app/src/main/java/com/rob729/newsfeed/ui/components/SearchResultItem.kt b/app/src/main/java/com/rob729/newsfeed/ui/components/SearchResultItem.kt
@@ -29,7 +29,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import coil.compose.AsyncImage
+import coil3.compose.AsyncImage
 import com.rob729.newsfeed.model.ui.NewsArticleUiData
 import com.rob729.newsfeed.ui.theme.lexendDecaFontFamily
 import com.rob729.newsfeed.utils.CommonUtils
diff --git a/app/src/main/java/com/rob729/newsfeed/utils/CommonUtils.kt b/app/src/main/java/com/rob729/newsfeed/utils/CommonUtils.kt
@@ -6,8 +6,9 @@ import android.net.Uri
 import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.ContextCompat
-import coil.request.CachePolicy
-import coil.request.ImageRequest
+import coil3.request.CachePolicy
+import coil3.request.ImageRequest
+import coil3.request.crossfade
 import com.rob729.newsfeed.R
 
 object CommonUtils {
diff --git a/app/src/main/java/com/rob729/newsfeed/vm/BookmarkedArticlesVM.kt b/app/src/main/java/com/rob729/newsfeed/vm/BookmarkedArticlesVM.kt
@@ -2,13 +2,13 @@ package com.rob729.newsfeed.vm
 
 import androidx.lifecycle.ViewModel
 import com.rob729.newsfeed.di.ViewModelKey
-import com.rob729.newsfeed.di.ViewModelScope
 import com.rob729.newsfeed.model.mapper.mapBookmarkedNewsArticleToNewsArticleUiData
 import com.rob729.newsfeed.model.state.bookmarkedArticles.BookmarkedArticleSideEffect
 import com.rob729.newsfeed.model.state.bookmarkedArticles.BookmarkedArticlesState
 import com.rob729.newsfeed.model.ui.NewsArticleUiData
 import com.rob729.newsfeed.repository.NewsRepository
 import com.rob729.newsfeed.repository.PreferenceRepository
+import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesIntoMap
 import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.binding
@@ -17,7 +17,7 @@ import org.orbitmvi.orbit.Container
 import org.orbitmvi.orbit.ContainerHost
 import org.orbitmvi.orbit.viewmodel.container
 
-@ContributesIntoMap(ViewModelScope::class, binding<ViewModel>())
+@ContributesIntoMap(AppScope::class, binding<ViewModel>())
 @ViewModelKey(BookmarkedArticlesVM::class)
 @Inject
 class BookmarkedArticlesVM(
diff --git a/app/src/main/java/com/rob729/newsfeed/vm/HomeViewModel.kt b/app/src/main/java/com/rob729/newsfeed/vm/HomeViewModel.kt
@@ -2,7 +2,6 @@ package com.rob729.newsfeed.vm
 
 import androidx.lifecycle.ViewModel
 import com.rob729.newsfeed.di.ViewModelKey
-import com.rob729.newsfeed.di.ViewModelScope
 import com.rob729.newsfeed.model.NewsResource
 import com.rob729.newsfeed.model.database.NewsDbEntity
 import com.rob729.newsfeed.model.mapper.mapArticleDbDataToNewsArticleUiData
@@ -14,6 +13,7 @@ import com.rob729.newsfeed.model.ui.NewsEntityUiData
 import com.rob729.newsfeed.model.ui.PaginationData
 import com.rob729.newsfeed.repository.NewsRepository
 import com.rob729.newsfeed.repository.PreferenceRepository
+import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesIntoMap
 import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.binding
@@ -23,7 +23,7 @@ import org.orbitmvi.orbit.ContainerHost
 import org.orbitmvi.orbit.syntax.Syntax
 import org.orbitmvi.orbit.viewmodel.container
 
-@ContributesIntoMap(ViewModelScope::class, binding<ViewModel>())
+@ContributesIntoMap(AppScope::class, binding<ViewModel>())
 @ViewModelKey(HomeViewModel::class)
 @Inject
 class HomeViewModel(
diff --git a/app/src/main/java/com/rob729/newsfeed/vm/SearchViewModel.kt b/app/src/main/java/com/rob729/newsfeed/vm/SearchViewModel.kt
@@ -3,7 +3,6 @@ package com.rob729.newsfeed.vm
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.rob729.newsfeed.di.ViewModelKey
-import com.rob729.newsfeed.di.ViewModelScope
 import com.rob729.newsfeed.model.NewsResource
 import com.rob729.newsfeed.model.api.NewsApiResponse
 import com.rob729.newsfeed.model.mapper.mapNetworkArticleToNewsArticleUiData
@@ -16,6 +15,7 @@ import com.rob729.newsfeed.repository.NewsRepository
 import com.rob729.newsfeed.repository.PreferenceRepository
 import com.rob729.newsfeed.utils.Constants.SEARCH_QUERY_UPDATE_DEBOUNCE_TIME
 import com.rob729.newsfeed.utils.SearchHistoryHelper
+import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesIntoMap
 import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.binding
@@ -30,7 +30,7 @@ import org.orbitmvi.orbit.syntax.Syntax
 import org.orbitmvi.orbit.viewmodel.container
 
 @OptIn(FlowPreview::class)
-@ContributesIntoMap(ViewModelScope::class, binding<ViewModel>())
+@ContributesIntoMap(AppScope::class, binding<ViewModel>())
 @ViewModelKey(SearchViewModel::class)
 @Inject
 class SearchViewModel(
diff --git a/app/src/main/java/com/rob729/newsfeed/vm/SettingsViewModel.kt b/app/src/main/java/com/rob729/newsfeed/vm/SettingsViewModel.kt
@@ -4,14 +4,14 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.rob729.newsfeed.AppPreferences
 import com.rob729.newsfeed.di.ViewModelKey
-import com.rob729.newsfeed.di.ViewModelScope
 import com.rob729.newsfeed.repository.PreferenceRepository
+import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesIntoMap
 import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.binding
 import kotlinx.coroutines.launch
 
-@ContributesIntoMap(ViewModelScope::class, binding<ViewModel>())
+@ContributesIntoMap(AppScope::class, binding<ViewModel>())
 @ViewModelKey(SettingsViewModel::class)
 @Inject
 class SettingsViewModel(
diff --git a/app/src/main/java/com/rob729/newsfeed/workManager/NewsSourceImagePrefetch.kt b/app/src/main/java/com/rob729/newsfeed/workManager/NewsSourceImagePrefetch.kt
@@ -3,8 +3,8 @@ package com.rob729.newsfeed.workManager
 import android.content.Context
 import androidx.work.Worker
 import androidx.work.WorkerParameters
-import coil.imageLoader
-import coil.request.ImageRequest
+import coil3.imageLoader
+import coil3.request.ImageRequest
 import com.rob729.newsfeed.R
 import com.rob729.newsfeed.utils.Constants
 
diff --git a/baselineprofile/build.gradle.kts b/baselineprofile/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.test)
     alias(libs.plugins.kotlin.android)
@@ -6,15 +8,17 @@ plugins {
 
 android {
     namespace = "com.rob729.baselineprofile"
-    compileSdk = 34
+    compileSdk = 36
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "1.8"
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
     }
 
     defaultConfig {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,40 +1,41 @@
 [versions]
-activityCompose = "1.11.0"
-androidGradlePlugin = "8.13.0"
+activityCompose = "1.12.2"
+androidGradlePlugin = "8.13.2"
 baselineProfile = "1.4.1"
 benchmarkMacroJunit4 = "1.4.1"
 browser = "1.9.0"
-coil = "2.7.0"
+coil = "3.3.0"
 constraintlayoutCompose = "1.1.1"
 coreKtx = "1.17.0"
 detekt = "1.23.8"
 espressoCore = "3.6.1"
 firebaseCrashlytics = "3.0.6"
-googleServices = "4.4.3"
+googleServices = "4.4.4"
 junit = "4.13.2"
 junitVersion = "1.2.1"
-kotlin = "2.2.20"
+kotlin = "2.3.0"
 kotlinx-datetime = "0.7.1"
 ksp = "2.2.20-2.0.2"
-lifecycleViewmodelCompose = "2.9.3"
-loggingInterceptor = "5.1.0"
-navigationCompose = "2.9.4"
-orbitViewmodel = "10.0.0"
+lifecycleViewmodelCompose = "2.10.0"
+loggingInterceptor = "5.3.2"
+navigationCompose = "2.9.6"
+orbitViewmodel = "11.0.0"
 pluto = "2.2.2"
 profileinstaller = "1.4.1"
 retrofit = "3.0.0"
-roomRuntime = "2.8.0"
+roomRuntime = "2.8.4"
 rules = "1.7.0"
-runtimeTracing = "1.9.1"
+runtimeTracing = "1.9.3"
 startupRuntime = "1.2.0"
 uiautomator = "2.3.0"
-workRuntimeKtx = "2.10.4"
-datastore = "1.1.7"
-protobufJavalite = "4.32.1"
-protobuf = "0.9.5"
-metro = "0.6.10"
+workRuntimeKtx = "2.11.0"
+datastore = "1.2.0"
+protobufJavalite = "4.33.2"
+protobuf = "0.9.6"
+metro = "0.9.2"
 kotlinxSerialization = "1.9.0"
 kotlinxSerializationConvertor = "3.0.0"
+ktorClientAndroid = "3.3.3"
 
 
 [libraries]
@@ -66,12 +67,12 @@ androidx-uiautomator = { module = "androidx.test.uiautomator:uiautomator", versi
 androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntimeKtx" }
 bundle-core = { module = "com.plutolib.plugins:bundle-core", version.ref = "pluto" }
 bundle-core-no-op = { module = "com.plutolib.plugins:bundle-core-no-op", version.ref = "pluto" }
-coil = { module = "io.coil-kt:coil", version.ref = "coil" }
-coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
-compose-bom = "androidx.compose:compose-bom:2025.09.00"
+coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
+coil-ktor = { module  = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" }
+compose-bom = "androidx.compose:compose-bom:2025.12.01"
 compose-ui = { module = "androidx.compose.ui:ui" }
 detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
-firebase-bom = "com.google.firebase:firebase-bom:34.2.0"
+firebase-bom = "com.google.firebase:firebase-bom:34.7.0"
 firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
 firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
 junit = { module = "junit:junit", version.ref = "junit" }
@@ -85,6 +86,7 @@ retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit
 protobuf-javalite = { module = "com.google.protobuf:protobuf-kotlin", version.ref = "protobufJavalite" }
 kotlinx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerialization"}
 kotlinx-serialization-convertor =  { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "kotlinxSerializationConvertor" }
+ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktorClientAndroid" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,9 @@ android {`
`109`	`109`	`excludes += "/META-INF/{AL2.0,LGPL2.1}"`
`110`	`110`	`}`
`111`	`111`	`}`
	`112`	`+ lint {`
	`113`	`+ disable += "InvalidFragmentVersionForActivityResult"`
	`114`	`+ }`
`112`	`115`	`namespace = "com.rob729.newsfeed"`
`113`	`116`	`}`
`114`	`117`
`@@ -163,9 +166,11 @@ dependencies {`
`163`	`166`	`implementation(libs.androidx.datastore.preferences)`
`164`	`167`	`implementation(libs.androidx.runtime.tracing)`
`165`	`168`
`166`		`- implementation(libs.coil)`
	`169`	`+ implementation(libs.coil.ktor)`
`167`	`170`	`implementation(libs.coil.compose)`
`168`	`171`
	`172`	`+ implementation(libs.ktor.client.android)`
	`173`	`+`
`169`	`174`	`implementation(libs.kotlinx.serialization)`
`170`	`175`
`171`	`176`	`implementation(libs.orbit.viewmodel)`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,7 @@ import kotlin.reflect.KClass`
`13`	`13`
`14`	`14`	`@DependencyGraph(`
`15`	`15`	`scope = AppScope::class,`
`16`		`- bindingContainers = [AppModule::class],`
`17`		`- additionalScopes = [ViewModelScope::class]`
	`16`	`+ bindingContainers = [AppModule::class]`
`18`	`17`	`)`
`19`	`18`	`interface AppGraph {`
`20`	`19`