Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Kotlin K2 and Gradle 8.7 test case #702

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add Kotlin K2 and Gradle 8.7 test case #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 34 additions & 3 deletions tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,11 +360,40 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle)
gradleVersions = List(Gradle8, Gradle7, Gradle6),
tools = List(Scala2_12_12)
)

checkGradleBuild(
"kotlin",
"""|/build.gradle
s"""|/build.gradle
|plugins {
| id 'org.jetbrains.kotlin.jvm' version '1.8.0'
| id 'org.jetbrains.kotlin.jvm' version '${Kotlin18.version}'
|}
|repositories {
| mavenCentral()
|}
|/src/main/java/foo/JExample.java
|package foo;
||public class JExample {}
|/src/main/kotlin/foo/Example.kt
|package foo
|object Example {}
|/src/test/java/foo/JExampleSuite.java
|package foo;
|public class JExampleSuite {}
|/src/test/kotlin/foo/ExampleSuite.kt
|package foo
|class ExampleSuite {}
|""".stripMargin,
expectedSemanticdbFiles = 4,
gradleVersions = List(Gradle6, Gradle7, Gradle8),
tools = List(Kotlin18)
)

checkGradleBuild(
"kotlin-k2",
s"""|/build.gradle.kts
|plugins {
| `kotlin-dsl`
| kotlin("jvm") version "${Kotlin192.version}"
|}
|repositories {
| mavenCentral()
Expand All @@ -383,9 +412,11 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle)
|class ExampleSuite {}
|""".stripMargin,
expectedSemanticdbFiles = 4,
gradleVersions = List(Gradle6, Gradle7)
gradleVersions = List(Gradle8),
tools = List(Kotlin192)
)


checkGradleBuild(
"implementation-deps",
"""|/settings.gradle
Expand Down
5 changes: 4 additions & 1 deletion tests/buildTools/src/test/scala/tests/GradleBuildToolSuiteBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ abstract class GradleBuildToolSuiteBase(gradle: Tool.Gradle)
}

def createEmptyBuildScript(): Unit = {
val script = workingDirectory.resolve("build.gradle")
// We're using settings.gradle instead of build.gradle because it's enough for
// gradle to create a wrapper, and doesn't conflict if the test case uses build.gradle.kts.
// Turns out gradle produces a very confusing error message if you have both build.gradle and build.gradle.kts
val script = workingDirectory.resolve("settings.gradle")
Files.createDirectories(script.getParent)
Files.write(
script,
Expand Down
6 changes: 6 additions & 0 deletions tests/buildTools/src/test/scala/tests/Tool.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ object Tool {
case object Scala211 extends Scala("2.11.9", atMostJava(11))
case object Scala3 extends Scala("3.3.3", noRestrictions)

sealed abstract class Kotlin(version: String, support: JVMSupport)
extends Tool("kotlin", version, support)
// See https://stackoverflow.com/a/77179226
case object Kotlin18 extends Kotlin("1.8.0", atMostJava(19))
case object Kotlin192 extends Kotlin("1.9.20", atMostJava(21))

sealed abstract class Mill(version: String, support: JVMSupport)
extends Tool("mill", version, support)
// See https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html#build-tool-compatibility-table
Expand Down
Loading