Skip to content

Commit 90d01c0

Browse files
author
Arthur McGibbon
committed
Fix version comparison, update version matrix, test latest Gradle
1 parent 9ab8feb commit 90d01c0

File tree

1 file changed

+34
-30
lines changed

1 file changed

+34
-30
lines changed

src/test/scala/bloop/integrations/gradle/ConfigGenerationSuite.scala

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import io.github.classgraph.ClassGraph
1717
import org.gradle.testkit.runner.BuildResult
1818
import org.gradle.testkit.runner.GradleRunner
1919
import org.gradle.testkit.runner.TaskOutcome._
20+
import org.gradle.util.GradleVersion
2021
import org.hamcrest.CoreMatchers
2122
import org.hamcrest.MatcherAssert.assertThat
2223
import org.junit.Assert.assertEquals
@@ -42,8 +43,8 @@ class ConfigGenerationSuite_7_5 extends ConfigGenerationSuite {
4243
}
4344

4445
// maximum supported version
45-
class ConfigGenerationSuite_8_0 extends ConfigGenerationSuite {
46-
protected def gradleVersion: String = "8.0.1"
46+
class ConfigGenerationSuite_8_13 extends ConfigGenerationSuite {
47+
protected def gradleVersion: String = "8.13"
4748
}
4849
/*
4950
// needed for scala android plugin testing - Disabled - see #worksWithAndroidScalaPlugin
@@ -54,40 +55,43 @@ class ConfigGenerationSuite_Android_Scala_plugin extends ConfigGenerationSuite {
5455

5556
object ConfigGenerationSuite {
5657
// gradle version -> maximum supported Java version
57-
val versionList = List(
58-
"2.0" -> "8",
59-
"4.3" -> "9",
60-
"4.7" -> "10",
61-
"5.0" -> "11",
62-
"5.4" -> "12",
63-
"6.0" -> "13",
64-
"6.3" -> "14",
65-
"6.7" -> "15",
66-
"7.0" -> "16",
67-
"7.3" -> "17",
68-
"7.5" -> "18",
69-
"7.6" -> "19",
70-
"999" -> "20"
58+
val versionList: List[(GradleVersion, String)] = List(
59+
GradleVersion.version("2.0") -> "8",
60+
GradleVersion.version("4.3") -> "9",
61+
GradleVersion.version("4.7") -> "10",
62+
GradleVersion.version("5.0") -> "11",
63+
GradleVersion.version("5.4") -> "12",
64+
GradleVersion.version("6.0") -> "13",
65+
GradleVersion.version("6.3") -> "14",
66+
GradleVersion.version("6.7") -> "15",
67+
GradleVersion.version("7.0") -> "16",
68+
GradleVersion.version("7.3") -> "17",
69+
GradleVersion.version("7.5") -> "18",
70+
GradleVersion.version("7.6") -> "19",
71+
GradleVersion.version("8.3") -> "20",
72+
GradleVersion.version("8.5") -> "21",
73+
GradleVersion.version("8.8") -> "22",
74+
GradleVersion.version("8.10") -> "23",
75+
GradleVersion.version("99.0") -> "24"
7176
)
7277
}
7378
abstract class ConfigGenerationSuite extends BaseConfigSuite {
7479
protected def gradleVersion: String
80+
private def gradleSemVer: GradleVersion = GradleVersion.version(gradleVersion)
7581
protected def supportsCurrentJavaVersion: Boolean =
7682
ConfigGenerationSuite.versionList
77-
.filter(f => f._1 > gradleVersion)
78-
.headOption
79-
.map(f => !Properties.isJavaAtLeast(f._2))
80-
.getOrElse(true)
81-
82-
private def supportsAndroid: Boolean = gradleVersion >= "6.1.1"
83-
// private def supportsAndroidScalaPlugin: Boolean = gradleVersion == "6.6"
84-
private def supportsScala3: Boolean = gradleVersion >= "7.3"
85-
private def canConsumeTestRuntime: Boolean = gradleVersion < "7.0"
86-
private def supportsReleaseFlag: Boolean = gradleVersion >= "6.6"
87-
private def supportsLazyArchives: Boolean = gradleVersion >= "4.9"
88-
private def supportsTestFixtures: Boolean = gradleVersion >= "5.6"
89-
private def supportsMainClass: Boolean = gradleVersion >= "6.4"
90-
private def supportsScalaCompilerPlugins: Boolean = gradleVersion >= "6.4"
83+
.find(f => f._1.compareTo(gradleSemVer) > 0)
84+
.forall(f => !Properties.isJavaAtLeast(f._2))
85+
86+
private def supportsAndroid: Boolean = gradleSemVer.compareTo(GradleVersion.version("6.1.1")) >= 0
87+
// private def supportsAndroidScalaPlugin: Boolean = gradleVersion == GradleVersion.version("6.6")
88+
private def supportsScala3: Boolean = gradleSemVer.compareTo(GradleVersion.version("7.3")) >= 0
89+
private def canConsumeTestRuntime: Boolean = gradleSemVer.compareTo(GradleVersion.version("7.0")) < 0
90+
private def supportsReleaseFlag: Boolean = gradleSemVer.compareTo(GradleVersion.version("6.6")) >= 0
91+
private def supportsLazyArchives: Boolean = gradleSemVer.compareTo(GradleVersion.version("4.9")) >= 0
92+
private def supportsTestFixtures: Boolean = gradleSemVer.compareTo(GradleVersion.version("5.6")) >= 0
93+
private def supportsMainClass: Boolean = gradleSemVer.compareTo(GradleVersion.version("6.4")) >= 0
94+
private def supportsScalaCompilerPlugins: Boolean = gradleSemVer.compareTo(GradleVersion.version("6.4")) >= 0
9195

9296
// folder to put test build scripts and java/scala source files
9397
private val testProjectDir_ = new TemporaryFolder()

0 commit comments

Comments
 (0)