Skip to content

Commit a524b7d

Browse files
authored
Merge pull request #2 from GradleUp/kotlin-2.3
Update to Kotlin 2.3
2 parents bc2c9e6 + 9e8de9f commit a524b7d

7 files changed

Lines changed: 54 additions & 7 deletions

File tree

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
kotlin-compiler="2.2.20-RC"
2+
kotlin-compiler="2.3.10"
33

44
[libraries]
55
gradle-api = { group = "dev.gradleplugins", name = "gradle-api", version = "8.0" }
@@ -13,8 +13,8 @@ kotlin-script-runtime = { module = "org.jetbrains.kotlin:kotlin-script-runtime",
1313
kotlin-annotations-jvm = { module = "org.jetbrains.kotlin:kotlin-annotations-jvm", version.ref = "kotlin-compiler" }
1414

1515
[plugins]
16-
kgp = { id = "org.jetbrains.kotlin.jvm", version = "2.2.20-RC" }
16+
kgp = { id = "org.jetbrains.kotlin.jvm", version = "2.3.10" }
1717
nmcp = { id = "com.gradleup.nmcp", version = "1.1.1-SNAPSHOT-001d5d74ed9af247096b58a59c99bba475fecead" }
18-
librarian = { id = "com.gradleup.librarian", version = "0.1.1-SNAPSHOT-a596fab8122088023d823b38401a018acb5ece43" }
18+
librarian = { id = "com.gradleup.librarian", version = "0.2.2-SNAPSHOT-e8574739fa730c6118181ba7b8cf7f559a568fd0" }
1919
gratatouille = { id = "com.gradleup.gratatouille", version = "0.1.0" }
20-
ksp = { id = "com.google.devtools.ksp", version = "2.2.20-RC-2.0.2" }
20+
ksp = { id = "com.google.devtools.ksp", version = "2.3.6" }
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
public abstract class kctf/internal/KctfExtension {
2+
public fun <init> (Lorg/gradle/api/Project;)V
3+
}
4+
5+
public abstract class kctf/internal/KctfExtensionPlugin : org/gradle/api/Plugin {
6+
public fun <init> ()V
7+
public synthetic fun apply (Ljava/lang/Object;)V
8+
public fun apply (Lorg/gradle/api/Project;)V
9+
}
10+
11+
public final class kctf/internal/VersionKt {
12+
public static final field VERSION Ljava/lang/String;
13+
}
14+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
public final class kctf/GenerateTestSourcesKt {
2+
public static final fun kctfGenerateSources (Ljava/util/List;Ljava/util/List;Ljava/lang/String;)V
3+
}
4+
5+
public final class kctf/MainKt {
6+
public static final fun main ([Ljava/lang/String;)V
7+
}
8+

kctf-gradle-tasks/src/main/kotlin/kctf/generateTestSources.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package kctf
22

33
import gratatouille.tasks.GInternal
4-
import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5
4+
import org.jetbrains.kotlin.generators.dsl.junit5.generateTestGroupSuiteWithJUnit5
55
import java.io.File
66
import java.net.URLClassLoader
77

@@ -52,7 +52,7 @@ fun kctfGenerateSources(
5252
testDataRoot = root,
5353
testsRoot = outputDirectoryRelativeToRoot
5454
) {
55-
testClass(testKClass = clazz, useJunit4 = false) {
55+
testClass(testKClass = clazz) {
5656
model(modelPath)
5757
}
5858
}

kctf-runtime/api/kctf-runtime.api

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
public final class kctf/ClasspathBasedStandardLibrariesPathProvider : org/jetbrains/kotlin/test/services/KotlinStandardLibrariesPathProvider {
2+
public static final field INSTANCE Lkctf/ClasspathBasedStandardLibrariesPathProvider;
3+
public fun commonStdlibForTests ()Ljava/io/File;
4+
public fun defaultJsStdlib ()Ljava/io/File;
5+
public fun fullJsStdlib ()Ljava/io/File;
6+
public fun getAnnotationsJar ()Ljava/io/File;
7+
public fun jvmAnnotationsForTests ()Ljava/io/File;
8+
public fun kotlinTestJarForTests ()Ljava/io/File;
9+
public fun kotlinTestJsKLib ()Ljava/io/File;
10+
public fun minimalRuntimeJarForTests ()Ljava/io/File;
11+
public fun reflectJarForTests ()Ljava/io/File;
12+
public fun runtimeJarForTests ()Ljava/io/File;
13+
public fun runtimeJarForTestsWithJdk8 ()Ljava/io/File;
14+
public fun scriptRuntimeJarForTests ()Ljava/io/File;
15+
public fun scriptingPluginFilesForTests ()Ljava/util/Collection;
16+
}
17+

librarian.root.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ kotlin.compatibility=2.0.0
44
kdoc.olderVersions=
55

66
pom.groupId=com.gradleup.kctf
7-
pom.version=2.2.20-RC-0.0.2-SNAPSHOT
7+
pom.version=2.3.10-0.0.2-SNAPSHOT
88
pom.description=Kotlin Compiler Test Framework Gradle Plugin
99
pom.vcsUrl=https://github.com/GradleUp/kctf
1010
pom.developer=kctf authors
1111
pom.license=MIT
1212

1313
gcs.bucket=gradleup
1414
gcs.prefix=m2
15+
16+
# tasks/runtime use kotlin-stdlib 2.3
17+
checkDependenciesCompatibility=false

0 commit comments

Comments
 (0)