diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index deb8026b..d5cd4500 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -31,6 +31,12 @@ dependencyResolutionManagement { } } mavenCentral() + maven { + url = uri("https://oss.sonatype.org/content/repositories/snapshots") + content { + includeGroup("com.google.dagger") + } + } } versionCatalogs { diff --git a/build-logic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/androidBuildLogic.kt b/build-logic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/androidBuildLogic.kt index c54abd23..e2864446 100644 --- a/build-logic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/androidBuildLogic.kt +++ b/build-logic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/androidBuildLogic.kt @@ -48,6 +48,14 @@ internal fun TestedExtension.configureCommonAndroidExtension(project: Project) { with(project) { dependencies.add("coreLibraryDesugaring", the().desugarJdkLibs) } + + project.configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == "com.google.dagger") { + useVersion(project.the().versions.hilt.get()) + } + } + } } /** diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 32ff8ef0..b8ac5349 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -kotlin = "2.0.21" -ksp = "2.0.21-1.0.28" +kotlin = "2.1.0" +ksp = "2.1.0-1.0.29" androidGradlePlugin = "8.9.0-alpha03" gradle-develocityPlugin = "3.18" gradle-toolchainsResolverPlugin = "0.8.0" @@ -17,7 +17,7 @@ fladle = "0.17.5" skie = "0.9.3" desugarJdkLibs = "2.1.3" leakcanary = "2.14" -hilt = "2.52" +hilt = "HEAD-SNAPSHOT" kotlinx-coroutines = "1.9.0" kotlinx-datetime = "0.6.1" kotlinx-serialization = "1.7.3" diff --git a/settings.gradle.kts b/settings.gradle.kts index 73e2e0d8..8d80ec40 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,6 +17,12 @@ pluginManagement { } } mavenCentral() + maven { + url = uri("https://oss.sonatype.org/content/repositories/snapshots") + content { + includeGroup("com.google.dagger") + } + } } fun extractVersionFromCatalog(key: String) = file("$rootDir/gradle/libs.versions.toml") @@ -44,6 +50,12 @@ dependencyResolutionManagement { } } mavenCentral() + maven { + url = uri("https://oss.sonatype.org/content/repositories/snapshots") + content { + includeGroup("com.google.dagger") + } + } } }