diff --git a/gradle-plugin/src/functionalTest/resources/testProjects/androidAnnotationProcessor/build.gradle.kts b/gradle-plugin/src/functionalTest/resources/testProjects/androidAnnotationProcessor/build.gradle.kts index 4e9234b3..b9980021 100644 --- a/gradle-plugin/src/functionalTest/resources/testProjects/androidAnnotationProcessor/build.gradle.kts +++ b/gradle-plugin/src/functionalTest/resources/testProjects/androidAnnotationProcessor/build.gradle.kts @@ -14,6 +14,6 @@ android { } dependencies { - implementation("com.google.dagger:dagger:2.48.1") - annotationProcessor("com.google.dagger:dagger-compiler:2.48.1") + implementation("com.google.dagger:dagger:2.53") + annotationProcessor("com.google.dagger:dagger-compiler:2.53") } diff --git a/gradle-plugin/src/functionalTest/resources/testProjects/androidKapt/build.gradle.kts b/gradle-plugin/src/functionalTest/resources/testProjects/androidKapt/build.gradle.kts index 9c7d0c75..912b3540 100644 --- a/gradle-plugin/src/functionalTest/resources/testProjects/androidKapt/build.gradle.kts +++ b/gradle-plugin/src/functionalTest/resources/testProjects/androidKapt/build.gradle.kts @@ -1,8 +1,8 @@ plugins { id("com.android.application") version "8.11.1" id("io.github.schwarzit.lightsaber") - kotlin("android") version "2.0.21" - kotlin("kapt") version "2.0.21" + kotlin("android") version "2.1.21" + kotlin("kapt") version "2.1.21" } android { @@ -16,6 +16,6 @@ android { } dependencies { - implementation("com.google.dagger:dagger:2.48.1") - kapt("com.google.dagger:dagger-compiler:2.48.1") + implementation("com.google.dagger:dagger:2.53") + kapt("com.google.dagger:dagger-compiler:2.53") } diff --git a/gradle-plugin/src/functionalTest/resources/testProjects/androidKsp1/build.gradle.kts b/gradle-plugin/src/functionalTest/resources/testProjects/androidKsp1/build.gradle.kts index b1c64b4e..6609c09b 100644 --- a/gradle-plugin/src/functionalTest/resources/testProjects/androidKsp1/build.gradle.kts +++ b/gradle-plugin/src/functionalTest/resources/testProjects/androidKsp1/build.gradle.kts @@ -1,8 +1,8 @@ plugins { id("com.android.application") version "8.11.1" id("io.github.schwarzit.lightsaber") - kotlin("android") version "2.0.21" - id("com.google.devtools.ksp") version "2.0.21-1.0.28" + kotlin("android") version "2.1.21" + id("com.google.devtools.ksp") version "2.1.21-2.0.2" } @OptIn(com.google.devtools.ksp.KspExperimental::class) @@ -21,6 +21,6 @@ android { } dependencies { - implementation("com.google.dagger:dagger:2.48.1") - ksp("com.google.dagger:dagger-compiler:2.48.1") + implementation("com.google.dagger:dagger:2.53") + ksp("com.google.dagger:dagger-compiler:2.53") } diff --git a/gradle-plugin/src/functionalTest/resources/testProjects/androidKsp2/build.gradle.kts b/gradle-plugin/src/functionalTest/resources/testProjects/androidKsp2/build.gradle.kts index 35e603d9..d8cbe47b 100644 --- a/gradle-plugin/src/functionalTest/resources/testProjects/androidKsp2/build.gradle.kts +++ b/gradle-plugin/src/functionalTest/resources/testProjects/androidKsp2/build.gradle.kts @@ -1,8 +1,8 @@ plugins { id("com.android.application") version "8.11.1" id("io.github.schwarzit.lightsaber") - kotlin("android") version "2.0.21" - id("com.google.devtools.ksp") version "2.0.21-1.0.28" + kotlin("android") version "2.1.21" + id("com.google.devtools.ksp") version "2.1.21-2.0.2" } @OptIn(com.google.devtools.ksp.KspExperimental::class) @@ -21,6 +21,6 @@ android { } dependencies { - implementation("com.google.dagger:dagger:2.48.1") - ksp("com.google.dagger:dagger-compiler:2.48.1") + implementation("com.google.dagger:dagger:2.53") + ksp("com.google.dagger:dagger-compiler:2.53") } diff --git a/gradle-plugin/src/functionalTest/resources/testProjects/annotationProcessor/build.gradle.kts b/gradle-plugin/src/functionalTest/resources/testProjects/annotationProcessor/build.gradle.kts index c1f396fe..2bf4073f 100644 --- a/gradle-plugin/src/functionalTest/resources/testProjects/annotationProcessor/build.gradle.kts +++ b/gradle-plugin/src/functionalTest/resources/testProjects/annotationProcessor/build.gradle.kts @@ -4,6 +4,6 @@ plugins { } dependencies { - implementation("com.google.dagger:dagger:2.48.1") - annotationProcessor("com.google.dagger:dagger-compiler:2.48.1") + implementation("com.google.dagger:dagger:2.53") + annotationProcessor("com.google.dagger:dagger-compiler:2.53") } diff --git a/gradle-plugin/src/functionalTest/resources/testProjects/kapt/build.gradle.kts b/gradle-plugin/src/functionalTest/resources/testProjects/kapt/build.gradle.kts index 8b03b0b8..2e8d7bb0 100644 --- a/gradle-plugin/src/functionalTest/resources/testProjects/kapt/build.gradle.kts +++ b/gradle-plugin/src/functionalTest/resources/testProjects/kapt/build.gradle.kts @@ -1,10 +1,10 @@ plugins { - kotlin("jvm") version "2.0.21" - kotlin("kapt") version "2.0.21" + kotlin("jvm") version "2.1.21" + kotlin("kapt") version "2.1.21" id("io.github.schwarzit.lightsaber") } dependencies { - implementation("com.google.dagger:dagger:2.48.1") - kapt("com.google.dagger:dagger-compiler:2.48.1") + implementation("com.google.dagger:dagger:2.53") + kapt("com.google.dagger:dagger-compiler:2.53") } diff --git a/gradle-plugin/src/functionalTest/resources/testProjects/ksp1/build.gradle.kts b/gradle-plugin/src/functionalTest/resources/testProjects/ksp1/build.gradle.kts index 527b52fe..30f27ca9 100644 --- a/gradle-plugin/src/functionalTest/resources/testProjects/ksp1/build.gradle.kts +++ b/gradle-plugin/src/functionalTest/resources/testProjects/ksp1/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - kotlin("jvm") version "2.0.21" - id("com.google.devtools.ksp") version "2.0.21-1.0.28" + kotlin("jvm") version "2.1.21" + id("com.google.devtools.ksp") version "2.1.21-2.0.2" id("io.github.schwarzit.lightsaber") } @@ -10,6 +10,6 @@ ksp { } dependencies { - implementation("com.google.dagger:dagger:2.48.1") - ksp("com.google.dagger:dagger-compiler:2.48.1") + implementation("com.google.dagger:dagger:2.53") + ksp("com.google.dagger:dagger-compiler:2.53") } diff --git a/gradle-plugin/src/functionalTest/resources/testProjects/ksp2/build.gradle.kts b/gradle-plugin/src/functionalTest/resources/testProjects/ksp2/build.gradle.kts index 02544376..e5107d01 100644 --- a/gradle-plugin/src/functionalTest/resources/testProjects/ksp2/build.gradle.kts +++ b/gradle-plugin/src/functionalTest/resources/testProjects/ksp2/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - kotlin("jvm") version "2.0.21" - id("com.google.devtools.ksp") version "2.0.21-1.0.28" + kotlin("jvm") version "2.1.21" + id("com.google.devtools.ksp") version "2.1.21-2.0.2" id("io.github.schwarzit.lightsaber") } @@ -10,6 +10,6 @@ ksp { } dependencies { - implementation("com.google.dagger:dagger:2.48.1") - ksp("com.google.dagger:dagger-compiler:2.48.1") + implementation("com.google.dagger:dagger:2.53") + ksp("com.google.dagger:dagger-compiler:2.53") } diff --git a/gradle-plugin/src/main/kotlin/schwarz/it/lightsaber/gradle/processors/Processor.kt b/gradle-plugin/src/main/kotlin/schwarz/it/lightsaber/gradle/processors/Processor.kt index 1924f515..72220374 100644 --- a/gradle-plugin/src/main/kotlin/schwarz/it/lightsaber/gradle/processors/Processor.kt +++ b/gradle-plugin/src/main/kotlin/schwarz/it/lightsaber/gradle/processors/Processor.kt @@ -41,7 +41,7 @@ private fun Dependency.isAtLeastVersion(major: Int, minor: Int): Boolean { } private const val MAJOR = 2 -private const val MINOR = 48 +private const val MINOR = 53 internal fun Project.lightsaberOutputDir(tech: String) = layout.buildDirectory.dir("generated/lightsaber/$tech") diff --git a/gradle-plugin/src/test/kotlin/schwarz/it/lightsaber/gradle/LightsaberPluginTest.kt b/gradle-plugin/src/test/kotlin/schwarz/it/lightsaber/gradle/LightsaberPluginTest.kt index a98a1227..8cb4b75d 100644 --- a/gradle-plugin/src/test/kotlin/schwarz/it/lightsaber/gradle/LightsaberPluginTest.kt +++ b/gradle-plugin/src/test/kotlin/schwarz/it/lightsaber/gradle/LightsaberPluginTest.kt @@ -631,13 +631,13 @@ class LightsaberPluginTest { @EnumSource(Processor::class) fun noAndroid(processor: Processor) { try { - createProject(processor, version = "2.47") + createProject(processor, version = "2.52") fail("wtf?") } catch (e: GradleException) { assertThat(e) .hasCauseThat() .hasMessageThat() - .isEqualTo("This version of lightsaber only supports dagger 2.48 or greater") + .isEqualTo("This version of lightsaber only supports dagger 2.53 or greater") } } @@ -645,14 +645,14 @@ class LightsaberPluginTest { @EnumSource(Processor::class) fun android(processor: Processor) { try { - createAndroidProject(AndroidProject.Application, processor, version = "2.47") + createAndroidProject(AndroidProject.Application, processor, version = "2.52") fail("wtf?") } catch (e: GradleException) { assertThat(e) .hasCauseThat() .hasCauseThat() .hasMessageThat() - .isEqualTo("This version of lightsaber only supports dagger 2.48 or greater") + .isEqualTo("This version of lightsaber only supports dagger 2.53 or greater") } } } @@ -666,7 +666,7 @@ private fun Project.androidComponents(block: (AndroidComponentsExtension<*, *, * private fun createProject( processor: Processor?, - version: String = "2.48", + version: String = "2.53", block: Project.() -> Unit = { /* no-op */ }, ): Project { val project = ProjectBuilder.builder() @@ -719,7 +719,7 @@ private fun createProject( private fun createAndroidProject( type: AndroidProject, processor: Processor?, - version: String = "2.48", + version: String = "2.53", block: Project.() -> Unit = { /* no-op */ }, ): Project { val project = ProjectBuilder.builder() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index df2cdfe4..17d83596 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] -kotlin = "2.0.21" -dagger = "2.48.1" +kotlin = "2.1.21" +dagger = "2.53" junit_jupiter = "5.13.3" kctfork = "0.6.0" -ksp = "2.0.21-1.0.28" +ksp = "2.1.21-2.0.2" anvil = "2.4.9" [libraries]