Skip to content

Update Kotlin to 2.2 #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 18, 2025
Merged

Update Kotlin to 2.2 #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e562cf
Update kotlin
renovate[bot] Jun 26, 2025
ec704a1
Update kctfork to v0.8.0
renovate[bot] Jul 2, 2025
bd58955
Upgrade dagger
BraisGabin Jul 18, 2025
2bd6eb2
Make it work
BraisGabin Jul 18, 2025
0bf9fd8
Merge branch 'main' into k2.2
BraisGabin Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...gin/src/functionalTest/resources/testProjects/androidAnnotationProcessor/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ android {
}

dependencies {
implementation("com.google.dagger:dagger:2.53")
annotationProcessor("com.google.dagger:dagger-compiler:2.53")
implementation("com.google.dagger:dagger:2.56")
annotationProcessor("com.google.dagger:dagger-compiler:2.56")
}
8 changes: 4 additions & 4 deletions gradle-plugin/src/functionalTest/resources/testProjects/androidKapt/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id("com.android.application") version "8.11.1"
id("io.github.schwarzit.lightsaber")
kotlin("android") version "2.1.21"
kotlin("kapt") version "2.1.21"
kotlin("android") version "2.2.0"
kotlin("kapt") version "2.2.0"
}

android {
Expand All @@ -16,6 +16,6 @@ android {
}

dependencies {
implementation("com.google.dagger:dagger:2.53")
kapt("com.google.dagger:dagger-compiler:2.53")
implementation("com.google.dagger:dagger:2.56")
kapt("com.google.dagger:dagger-compiler:2.56")
}
8 changes: 4 additions & 4 deletions gradle-plugin/src/functionalTest/resources/testProjects/androidKsp1/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id("com.android.application") version "8.11.1"
id("io.github.schwarzit.lightsaber")
kotlin("android") version "2.1.21"
id("com.google.devtools.ksp") version "2.1.21-2.0.2"
kotlin("android") version "2.2.0"
id("com.google.devtools.ksp") version "2.2.0-2.0.2"
}

@OptIn(com.google.devtools.ksp.KspExperimental::class)
Expand All @@ -21,6 +21,6 @@ android {
}

dependencies {
implementation("com.google.dagger:dagger:2.53")
ksp("com.google.dagger:dagger-compiler:2.53")
implementation("com.google.dagger:dagger:2.56")
ksp("com.google.dagger:dagger-compiler:2.56")
}
8 changes: 4 additions & 4 deletions gradle-plugin/src/functionalTest/resources/testProjects/androidKsp2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id("com.android.application") version "8.11.1"
id("io.github.schwarzit.lightsaber")
kotlin("android") version "2.1.21"
id("com.google.devtools.ksp") version "2.1.21-2.0.2"
kotlin("android") version "2.2.0"
id("com.google.devtools.ksp") version "2.2.0-2.0.2"
}

@OptIn(com.google.devtools.ksp.KspExperimental::class)
Expand All @@ -21,6 +21,6 @@ android {
}

dependencies {
implementation("com.google.dagger:dagger:2.53")
ksp("com.google.dagger:dagger-compiler:2.53")
implementation("com.google.dagger:dagger:2.56")
ksp("com.google.dagger:dagger-compiler:2.56")
}
4 changes: 2 additions & 2 deletions gradle-plugin/src/functionalTest/resources/testProjects/annotationProcessor/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ plugins {
}

dependencies {
implementation("com.google.dagger:dagger:2.53")
annotationProcessor("com.google.dagger:dagger-compiler:2.53")
implementation("com.google.dagger:dagger:2.56")
annotationProcessor("com.google.dagger:dagger-compiler:2.56")
}
8 changes: 4 additions & 4 deletions gradle-plugin/src/functionalTest/resources/testProjects/kapt/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
kotlin("jvm") version "2.1.21"
kotlin("kapt") version "2.1.21"
kotlin("jvm") version "2.2.0"
kotlin("kapt") version "2.2.0"
id("io.github.schwarzit.lightsaber")
}

dependencies {
implementation("com.google.dagger:dagger:2.53")
kapt("com.google.dagger:dagger-compiler:2.53")
implementation("com.google.dagger:dagger:2.56")
kapt("com.google.dagger:dagger-compiler:2.56")
}
8 changes: 4 additions & 4 deletions gradle-plugin/src/functionalTest/resources/testProjects/ksp1/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
kotlin("jvm") version "2.1.21"
id("com.google.devtools.ksp") version "2.1.21-2.0.2"
kotlin("jvm") version "2.2.0"
id("com.google.devtools.ksp") version "2.2.0-2.0.2"
id("io.github.schwarzit.lightsaber")
}

Expand All @@ -10,6 +10,6 @@ ksp {
}

dependencies {
implementation("com.google.dagger:dagger:2.53")
ksp("com.google.dagger:dagger-compiler:2.53")
implementation("com.google.dagger:dagger:2.56")
ksp("com.google.dagger:dagger-compiler:2.56")
}
8 changes: 4 additions & 4 deletions gradle-plugin/src/functionalTest/resources/testProjects/ksp2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
kotlin("jvm") version "2.1.21"
id("com.google.devtools.ksp") version "2.1.21-2.0.2"
kotlin("jvm") version "2.2.0"
id("com.google.devtools.ksp") version "2.2.0-2.0.2"
id("io.github.schwarzit.lightsaber")
}

Expand All @@ -10,6 +10,6 @@ ksp {
}

dependencies {
implementation("com.google.dagger:dagger:2.53")
ksp("com.google.dagger:dagger-compiler:2.53")
implementation("com.google.dagger:dagger:2.56")
ksp("com.google.dagger:dagger-compiler:2.56")
}
2 changes: 1 addition & 1 deletion gradle-plugin/src/main/kotlin/schwarz/it/lightsaber/gradle/processors/Processor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ private fun Dependency.isAtLeastVersion(major: Int, minor: Int): Boolean {
}

private const val MAJOR = 2
private const val MINOR = 53
private const val MINOR = 56

internal fun Project.lightsaberOutputDir(tech: String) = layout.buildDirectory.dir("generated/lightsaber/$tech")

Expand Down
12 changes: 6 additions & 6 deletions gradle-plugin/src/test/kotlin/schwarz/it/lightsaber/gradle/LightsaberPluginTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,28 +631,28 @@ class LightsaberPluginTest {
@EnumSource(Processor::class)
fun noAndroid(processor: Processor) {
try {
createProject(processor, version = "2.52")
createProject(processor, version = "2.53.1")
fail("wtf?")
} catch (e: GradleException) {
assertThat(e)
.hasCauseThat()
.hasMessageThat()
.isEqualTo("This version of lightsaber only supports dagger 2.53 or greater")
.isEqualTo("This version of lightsaber only supports dagger 2.56 or greater")
}
}

@ParameterizedTest
@EnumSource(Processor::class)
fun android(processor: Processor) {
try {
createAndroidProject(AndroidProject.Application, processor, version = "2.52")
createAndroidProject(AndroidProject.Application, processor, version = "2.53.1")
fail("wtf?")
} catch (e: GradleException) {
assertThat(e)
.hasCauseThat()
.hasCauseThat()
.hasMessageThat()
.isEqualTo("This version of lightsaber only supports dagger 2.53 or greater")
.isEqualTo("This version of lightsaber only supports dagger 2.56 or greater")
}
}
}
Expand All @@ -666,7 +666,7 @@ private fun Project.androidComponents(block: (AndroidComponentsExtension<*, *, *

private fun createProject(
processor: Processor?,
version: String = "2.53",
version: String = "2.56",
block: Project.() -> Unit = { /* no-op */ },
): Project {
val project = ProjectBuilder.builder()
Expand Down Expand Up @@ -719,7 +719,7 @@ private fun createProject(
private fun createAndroidProject(
type: AndroidProject,
processor: Processor?,
version: String = "2.53",
version: String = "2.56",
block: Project.() -> Unit = { /* no-op */ },
): Project {
val project = ProjectBuilder.builder()
Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[versions]
kotlin = "2.1.21"
dagger = "2.53"
kotlin = "2.2.0"
dagger = "2.56"
junit_jupiter = "5.13.3"
kctfork = "0.6.0"
ksp = "2.1.21-2.0.2"
kctfork = "0.8.0"
ksp = "2.2.0-2.0.2"

[libraries]
android_gradle_plugin = { module = "com.android.tools.build:gradle", version = "8.0.0" }
Expand Down