build: upgrade to JDK 21

Lennoard · Lennoard · commit 7409ebec955a · 2026-03-03T21:41:51.000-03:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -91,12 +91,14 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
+}
 
-    kotlinOptions {
-        jvmTarget = "17"
+kotlin {
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
     }
 }
 
diff --git a/common/design/build.gradle.kts b/common/design/build.gradle.kts
@@ -31,12 +31,14 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
+}
 
-    kotlinOptions {
-        jvmTarget = "17"
+kotlin {
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
     }
 }
 
diff --git a/common/utils/build.gradle.kts b/common/utils/build.gradle.kts
@@ -25,12 +25,14 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
+}
 
-    kotlinOptions {
-        jvmTarget = "17"
+kotlin {
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
     }
 }
 
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -30,19 +30,21 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = "17"
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     sourceSets {
         maybeCreate("main").java.srcDir("src/main/kotlin")
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
+    }
+}
+
 dependencies {
     implementation(project(":common:utils"))
     implementation(project(":domain"))
diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
@@ -15,12 +15,14 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
+}
 
-    kotlinOptions {
-        jvmTarget = "17"
+kotlin {
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
     }
 }
 
diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1,13 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/4945f00643ec68e7c7a6b66f90124f89/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/4945f00643ec68e7c7a6b66f90124f89/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3426ffcaa54c3f62406beb1f1ab8b179/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/f636c800fdb3f9ae33f019dfa048ba72/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/4945f00643ec68e7c7a6b66f90124f89/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1e91f45234d88a64dafb961c93ddc75a/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/552c7bffe0370c66410a51c55985b511/redirect
+toolchainVendor=ADOPTIUM
+toolchainVersion=21
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -13,6 +13,11 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
+
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {

Original file line number	Diff line number	Diff line change
`@@ -91,12 +91,14 @@ android {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`compileOptions {`
`94`		`- sourceCompatibility = JavaVersion.VERSION_17`
`95`		`- targetCompatibility = JavaVersion.VERSION_17`
	`94`	`+ sourceCompatibility = JavaVersion.VERSION_21`
	`95`	`+ targetCompatibility = JavaVersion.VERSION_21`
`96`	`96`	`}`
	`97`	`+}`
`97`	`98`
`98`		`- kotlinOptions {`
`99`		`- jvmTarget = "17"`
	`99`	`+kotlin {`
	`100`	`+ compilerOptions {`
	`101`	`+ jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)`
`100`	`102`	`}`
`101`	`103`	`}`
`102`	`104`
Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,14 @@ android {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`compileOptions {`
`34`		`- sourceCompatibility = JavaVersion.VERSION_17`
`35`		`- targetCompatibility = JavaVersion.VERSION_17`
	`34`	`+ sourceCompatibility = JavaVersion.VERSION_21`
	`35`	`+ targetCompatibility = JavaVersion.VERSION_21`
`36`	`36`	`}`
	`37`	`+}`
`37`	`38`
`38`		`- kotlinOptions {`
`39`		`- jvmTarget = "17"`
	`39`	`+kotlin {`
	`40`	`+ compilerOptions {`
	`41`	`+ jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)`
`40`	`42`	`}`
`41`	`43`	`}`
`42`	`44`
Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,14 @@ android {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`compileOptions {`
`28`		`- sourceCompatibility = JavaVersion.VERSION_17`
`29`		`- targetCompatibility = JavaVersion.VERSION_17`
	`28`	`+ sourceCompatibility = JavaVersion.VERSION_21`
	`29`	`+ targetCompatibility = JavaVersion.VERSION_21`
`30`	`30`	`}`
	`31`	`+}`
`31`	`32`
`32`		`- kotlinOptions {`
`33`		`- jvmTarget = "17"`
	`33`	`+kotlin {`
	`34`	`+ compilerOptions {`
	`35`	`+ jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)`
`34`	`36`	`}`
`35`	`37`	`}`
`36`	`38`
Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,14 @@ android {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`compileOptions {`
`18`		`- sourceCompatibility = JavaVersion.VERSION_17`
`19`		`- targetCompatibility = JavaVersion.VERSION_17`
	`18`	`+ sourceCompatibility = JavaVersion.VERSION_21`
	`19`	`+ targetCompatibility = JavaVersion.VERSION_21`
`20`	`20`	`}`
	`21`	`+}`
`21`	`22`
`22`		`- kotlinOptions {`
`23`		`- jvmTarget = "17"`
	`23`	`+kotlin {`
	`24`	`+ compilerOptions {`
	`25`	`+ jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)`
`24`	`26`	`}`
`25`	`27`	`}`
`26`	`28`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,11 @@ pluginManagement {`
`13`	`13`	`gradlePluginPortal()`
`14`	`14`	`}`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+plugins {`
	`18`	`+ id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"`
	`19`	`+}`
	`20`	`+`
`16`	`21`	`dependencyResolutionManagement {`
`17`	`22`	`repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)`
`18`	`23`	`repositories {`