Skip to content

Commit dba7473

Browse files
authoredApr 9, 2025
Update the build.gradle.kts to be more strict with the javaVersion requirement (#8032)
1 parent 6e81fc8 commit dba7473

File tree

3 files changed

+36
-12
lines changed

3 files changed

+36
-12
lines changed
 

‎build.gradle.kts

+12-4
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,13 @@ println("untilBuild: $untilBuildInput")
6060
println("javaVersion: $javaVersion")
6161
println("group: $group")
6262

63-
var jvmVersion = JvmTarget.JVM_17
64-
if (javaVersion == "21") {
63+
var jvmVersion: JvmTarget
64+
if (javaVersion == "17") {
65+
jvmVersion = JvmTarget.JVM_17
66+
} else if (javaVersion == "21") {
6567
jvmVersion = JvmTarget.JVM_21
68+
} else {
69+
throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
6670
}
6771
kotlin {
6872
compilerOptions {
@@ -71,9 +75,13 @@ kotlin {
7175
}
7276
}
7377

74-
var javaCompatibilityVersion = JavaVersion.VERSION_17
75-
if (javaVersion == "21") {
78+
var javaCompatibilityVersion: JavaVersion
79+
if (javaVersion == "17") {
80+
javaCompatibilityVersion = JavaVersion.VERSION_17
81+
} else if (javaVersion == "21") {
7682
javaCompatibilityVersion = JavaVersion.VERSION_21
83+
} else {
84+
throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
7785
}
7886
java {
7987
sourceCompatibility = javaCompatibilityVersion

‎flutter-idea/build.gradle.kts

+12-4
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,13 @@ val untilBuildInput = providers.gradleProperty("untilBuild").get()
3838
val javaVersion = providers.gradleProperty("javaVersion").get()
3939
group = "io.flutter"
4040

41-
var jvmVersion = JvmTarget.JVM_17
42-
if (javaVersion == "21") {
41+
var jvmVersion: JvmTarget
42+
if (javaVersion == "17") {
43+
jvmVersion = JvmTarget.JVM_17
44+
} else if (javaVersion == "21") {
4345
jvmVersion = JvmTarget.JVM_21
46+
} else {
47+
throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
4448
}
4549
kotlin {
4650
compilerOptions {
@@ -49,9 +53,13 @@ kotlin {
4953
}
5054
}
5155

52-
var javaCompatibilityVersion = JavaVersion.VERSION_17
53-
if (javaVersion == "21") {
56+
var javaCompatibilityVersion: JavaVersion
57+
if (javaVersion == "17") {
58+
javaCompatibilityVersion = JavaVersion.VERSION_17
59+
} else if (javaVersion == "21") {
5460
javaCompatibilityVersion = JavaVersion.VERSION_21
61+
} else {
62+
throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
5563
}
5664
java {
5765
sourceCompatibility = javaCompatibilityVersion

‎flutter-studio/build.gradle.kts

+12-4
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,13 @@ val untilBuildInput = providers.gradleProperty("untilBuild").get()
3939
val javaVersion = providers.gradleProperty("javaVersion").get()
4040
group = "io.flutter"
4141

42-
var jvmVersion = JvmTarget.JVM_17
43-
if (javaVersion == "21") {
42+
var jvmVersion: JvmTarget
43+
if (javaVersion == "17") {
44+
jvmVersion = JvmTarget.JVM_17
45+
} else if (javaVersion == "21") {
4446
jvmVersion = JvmTarget.JVM_21
47+
} else {
48+
throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
4549
}
4650
kotlin {
4751
compilerOptions {
@@ -50,9 +54,13 @@ kotlin {
5054
}
5155
}
5256

53-
var javaCompatibilityVersion = JavaVersion.VERSION_17
54-
if (javaVersion == "21") {
57+
var javaCompatibilityVersion: JavaVersion
58+
if (javaVersion == "17") {
59+
javaCompatibilityVersion = JavaVersion.VERSION_17
60+
} else if (javaVersion == "21") {
5561
javaCompatibilityVersion = JavaVersion.VERSION_21
62+
} else {
63+
throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
5664
}
5765
java {
5866
sourceCompatibility = javaCompatibilityVersion

0 commit comments

Comments
 (0)