From 1a1db753ebc907a9335ce85592455f9a51cd157c Mon Sep 17 00:00:00 2001 From: Yang Date: Wed, 18 Sep 2024 11:54:14 +1000 Subject: [PATCH 1/8] WIP - need KSP and new dagger release. --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 32ff8ef0..3843e31c 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-Beta1" +ksp = "2.1.0-Beta1-1.0.25" androidGradlePlugin = "8.9.0-alpha03" gradle-develocityPlugin = "3.18" gradle-toolchainsResolverPlugin = "0.8.0" From 1dcbf0581c689d412997febf5decb5f57aac8906 Mon Sep 17 00:00:00 2001 From: Yang Date: Thu, 26 Sep 2024 16:47:09 +1000 Subject: [PATCH 2/8] Dagger HEAD-SNAPSHOT. iOS tests stuck. --- build-logic/settings.gradle.kts | 6 ++++++ .../kstreamlined/buildlogic/androidBuildLogic.kt | 8 ++++++++ gradle/libs.versions.toml | 2 +- settings.gradle.kts | 12 ++++++++++++ 4 files changed, 27 insertions(+), 1 deletion(-) 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 3843e31c..9924efc0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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") + } + } } } From ea77eb161d3e30f52a2d57774d076c5725d36dfa Mon Sep 17 00:00:00 2001 From: Yang Date: Sat, 19 Oct 2024 12:34:15 +1100 Subject: [PATCH 3/8] 2.1.0-Beta2. --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9924efc0..fcec8dea 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -kotlin = "2.1.0-Beta1" -ksp = "2.1.0-Beta1-1.0.25" +kotlin = "2.1.0-Beta2" +ksp = "2.1.0-Beta2-1.0.25" androidGradlePlugin = "8.9.0-alpha03" gradle-develocityPlugin = "3.18" gradle-toolchainsResolverPlugin = "0.8.0" From be1b5a5588b1589f4f3637f94168f98d0d29a816 Mon Sep 17 00:00:00 2001 From: Yang Date: Sat, 26 Oct 2024 12:51:06 +1100 Subject: [PATCH 4/8] KSP 2.1.0-Beta2-1.0.26. --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fcec8dea..aad5eb2c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] kotlin = "2.1.0-Beta2" -ksp = "2.1.0-Beta2-1.0.25" +ksp = "2.1.0-Beta2-1.0.26" androidGradlePlugin = "8.9.0-alpha03" gradle-develocityPlugin = "3.18" gradle-toolchainsResolverPlugin = "0.8.0" From 6e84a519f92cc1208ac9fe1e093328b0b252dbf8 Mon Sep 17 00:00:00 2001 From: Yang Date: Wed, 6 Nov 2024 11:28:22 +1100 Subject: [PATCH 5/8] Kotlin 2.1.0-RC. --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aad5eb2c..96adab7a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -kotlin = "2.1.0-Beta2" -ksp = "2.1.0-Beta2-1.0.26" +kotlin = "2.1.0-RC" +ksp = "2.1.0-RC-1.0.26" androidGradlePlugin = "8.9.0-alpha03" gradle-develocityPlugin = "3.18" gradle-toolchainsResolverPlugin = "0.8.0" From 474a693c7b8f66ed86426023c7a3a5ab92ba7a73 Mon Sep 17 00:00:00 2001 From: Yang Date: Fri, 8 Nov 2024 15:59:18 +1100 Subject: [PATCH 6/8] KSP 2.1.0-RC-1.0.27. --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 96adab7a..1cfefacc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] kotlin = "2.1.0-RC" -ksp = "2.1.0-RC-1.0.26" +ksp = "2.1.0-RC-1.0.27" androidGradlePlugin = "8.9.0-alpha03" gradle-develocityPlugin = "3.18" gradle-toolchainsResolverPlugin = "0.8.0" From 0d4b98ee52b4830a642b78d3e77215f6f80a9653 Mon Sep 17 00:00:00 2001 From: Yang Date: Wed, 20 Nov 2024 10:02:45 +1100 Subject: [PATCH 7/8] Kotlin 2.1.0-RC2. --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1cfefacc..4f6bb0d7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -kotlin = "2.1.0-RC" -ksp = "2.1.0-RC-1.0.27" +kotlin = "2.1.0-RC2" +ksp = "2.1.0-RC2-1.0.28" androidGradlePlugin = "8.9.0-alpha03" gradle-develocityPlugin = "3.18" gradle-toolchainsResolverPlugin = "0.8.0" From 1d5737626639884a6419d35ccb0d5858a531c381 Mon Sep 17 00:00:00 2001 From: Yang Date: Thu, 28 Nov 2024 12:04:51 +1100 Subject: [PATCH 8/8] Kotlin 2.1.0, KSP 1.0.29. --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4f6bb0d7..b8ac5349 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -kotlin = "2.1.0-RC2" -ksp = "2.1.0-RC2-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"