Skip to content

Commit 9586844

Browse files
mikehardyBrayanDSO
authored andcommitted
refactor: JVM verification extracted to 2 vars and a range
makes it easier to change the JVM range we support via "DRY" principle
1 parent 482bcfd commit 9586844

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

build.gradle.kts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,17 @@ subprojects {
118118
}
119119
}
120120

121-
val jvmVersion = Jvm.current().javaVersion?.majorVersion
122-
val minSdk = libs.versions.compileSdk.get()
123-
if (jvmVersion != "17" && jvmVersion != "21" && jvmVersion != "24") {
121+
val jvmVersion = Jvm.current().javaVersion?.majorVersion.parseIntOrDefault(defaultValue = 0)
122+
val minSdk = libs.versions.minSdk.get()
123+
val jvmVersionLowerBound = 17
124+
val jvmVersionUpperBound = 24
125+
if (jvmVersion !in jvmVersionLowerBound..jvmVersionUpperBound) {
124126
println("\n\n\n")
125127
println("**************************************************************************************************************")
126128
println("\n\n\n")
127-
println("ERROR: AnkiDroid builds with JVM version 17, 21 and 24.")
129+
println("ERROR: AnkiDroid builds with JVM versions between $jvmVersionLowerBound and $jvmVersionUpperBound.")
128130
println(" Incompatible major version detected: '$jvmVersion'")
129-
if (jvmVersion.parseIntOrDefault(defaultValue = 0) > 24) {
131+
if (jvmVersion > jvmVersionUpperBound) {
130132
println("\n\n\n")
131133
println(" If you receive this error because you want to use a newer JDK, we may accept PRs to support new versions.")
132134
println(" Edit the main build.gradle file, find this message in the file, and add support for the new version.")

0 commit comments

Comments
 (0)