Skip to content

Commit f4cf901

Browse files
authored
Cleanup some Kotlin warnings in build.gradle.kts files (#8137)
--- - [x] I’ve reviewed the contributor guide and applied the relevant portions to this PR.
1 parent d63c6ce commit f4cf901

File tree

3 files changed

+62
-38
lines changed

3 files changed

+62
-38
lines changed

build.gradle.kts

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,16 @@ println("javaVersion: $javaVersion")
6060
println("group: $group")
6161

6262
var jvmVersion: JvmTarget
63-
if (javaVersion == "17") {
64-
jvmVersion = JvmTarget.JVM_17
65-
} else if (javaVersion == "21") {
66-
jvmVersion = JvmTarget.JVM_21
67-
} else {
68-
throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
63+
jvmVersion = when (javaVersion) {
64+
"17" -> {
65+
JvmTarget.JVM_17
66+
}
67+
"21" -> {
68+
JvmTarget.JVM_21
69+
}
70+
else -> {
71+
throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
72+
}
6973
}
7074
kotlin {
7175
compilerOptions {
@@ -75,12 +79,18 @@ kotlin {
7579
}
7680

7781
var javaCompatibilityVersion: JavaVersion
78-
if (javaVersion == "17") {
79-
javaCompatibilityVersion = JavaVersion.VERSION_17
80-
} else if (javaVersion == "21") {
81-
javaCompatibilityVersion = JavaVersion.VERSION_21
82-
} else {
83-
throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
82+
javaCompatibilityVersion = when (javaVersion) {
83+
"17" -> {
84+
JavaVersion.VERSION_17
85+
}
86+
87+
"21" -> {
88+
JavaVersion.VERSION_21
89+
}
90+
91+
else -> {
92+
throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
93+
}
8494
}
8595
java {
8696
sourceCompatibility = javaCompatibilityVersion

flutter-idea/build.gradle.kts

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
88
import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
99
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
10-
import org.jetbrains.intellij.platform.gradle.models.ProductRelease
1110
import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask
1211
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
1312
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
@@ -40,12 +39,16 @@ val javaVersion = providers.gradleProperty("javaVersion").get()
4039
group = "io.flutter"
4140

4241
var jvmVersion: JvmTarget
43-
if (javaVersion == "17") {
44-
jvmVersion = JvmTarget.JVM_17
45-
} else if (javaVersion == "21") {
46-
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")
42+
jvmVersion = when (javaVersion) {
43+
"17" -> {
44+
JvmTarget.JVM_17
45+
}
46+
"21" -> {
47+
JvmTarget.JVM_21
48+
}
49+
else -> {
50+
throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
51+
}
4952
}
5053
kotlin {
5154
compilerOptions {
@@ -55,12 +58,16 @@ kotlin {
5558
}
5659

5760
var javaCompatibilityVersion: JavaVersion
58-
if (javaVersion == "17") {
59-
javaCompatibilityVersion = JavaVersion.VERSION_17
60-
} else if (javaVersion == "21") {
61-
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")
61+
javaCompatibilityVersion = when (javaVersion) {
62+
"17" -> {
63+
JavaVersion.VERSION_17
64+
}
65+
"21" -> {
66+
JavaVersion.VERSION_21
67+
}
68+
else -> {
69+
throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
70+
}
6471
}
6572
java {
6673
sourceCompatibility = javaCompatibilityVersion

flutter-studio/build.gradle.kts

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* found in the LICENSE file.
55
*/
66

7-
import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
87
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
98
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
109
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
@@ -40,12 +39,16 @@ val javaVersion = providers.gradleProperty("javaVersion").get()
4039
group = "io.flutter"
4140

4241
var jvmVersion: JvmTarget
43-
if (javaVersion == "17") {
44-
jvmVersion = JvmTarget.JVM_17
45-
} else if (javaVersion == "21") {
46-
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")
42+
jvmVersion = when (javaVersion) {
43+
"17" -> {
44+
JvmTarget.JVM_17
45+
}
46+
"21" -> {
47+
JvmTarget.JVM_21
48+
}
49+
else -> {
50+
throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
51+
}
4952
}
5053
kotlin {
5154
compilerOptions {
@@ -55,12 +58,16 @@ kotlin {
5558
}
5659

5760
var javaCompatibilityVersion: JavaVersion
58-
if (javaVersion == "17") {
59-
javaCompatibilityVersion = JavaVersion.VERSION_17
60-
} else if (javaVersion == "21") {
61-
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")
61+
javaCompatibilityVersion = when (javaVersion) {
62+
"17" -> {
63+
JavaVersion.VERSION_17
64+
}
65+
"21" -> {
66+
JavaVersion.VERSION_21
67+
}
68+
else -> {
69+
throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
70+
}
6471
}
6572
java {
6673
sourceCompatibility = javaCompatibilityVersion

0 commit comments

Comments
 (0)