diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fb99dcd..619b1de 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin-compiler="2.2.20-RC" +kotlin-compiler="2.3.10" [libraries] 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", kotlin-annotations-jvm = { module = "org.jetbrains.kotlin:kotlin-annotations-jvm", version.ref = "kotlin-compiler" } [plugins] -kgp = { id = "org.jetbrains.kotlin.jvm", version = "2.2.20-RC" } +kgp = { id = "org.jetbrains.kotlin.jvm", version = "2.3.10" } nmcp = { id = "com.gradleup.nmcp", version = "1.1.1-SNAPSHOT-001d5d74ed9af247096b58a59c99bba475fecead" } -librarian = { id = "com.gradleup.librarian", version = "0.1.1-SNAPSHOT-a596fab8122088023d823b38401a018acb5ece43" } +librarian = { id = "com.gradleup.librarian", version = "0.2.2-SNAPSHOT-e8574739fa730c6118181ba7b8cf7f559a568fd0" } gratatouille = { id = "com.gradleup.gratatouille", version = "0.1.0" } -ksp = { id = "com.google.devtools.ksp", version = "2.2.20-RC-2.0.2" } +ksp = { id = "com.google.devtools.ksp", version = "2.3.6" } diff --git a/kctf-gradle-plugin/api/kctf-gradle-plugin.api b/kctf-gradle-plugin/api/kctf-gradle-plugin.api new file mode 100644 index 0000000..eb985a9 --- /dev/null +++ b/kctf-gradle-plugin/api/kctf-gradle-plugin.api @@ -0,0 +1,14 @@ +public abstract class kctf/internal/KctfExtension { + public fun (Lorg/gradle/api/Project;)V +} + +public abstract class kctf/internal/KctfExtensionPlugin : org/gradle/api/Plugin { + public fun ()V + public synthetic fun apply (Ljava/lang/Object;)V + public fun apply (Lorg/gradle/api/Project;)V +} + +public final class kctf/internal/VersionKt { + public static final field VERSION Ljava/lang/String; +} + diff --git a/kctf-gradle-tasks/api/kctf-gradle-tasks.api b/kctf-gradle-tasks/api/kctf-gradle-tasks.api new file mode 100644 index 0000000..18fb8b0 --- /dev/null +++ b/kctf-gradle-tasks/api/kctf-gradle-tasks.api @@ -0,0 +1,8 @@ +public final class kctf/GenerateTestSourcesKt { + public static final fun kctfGenerateSources (Ljava/util/List;Ljava/util/List;Ljava/lang/String;)V +} + +public final class kctf/MainKt { + public static final fun main ([Ljava/lang/String;)V +} + diff --git a/kctf-gradle-tasks/src/main/kotlin/kctf/generateTestSources.kt b/kctf-gradle-tasks/src/main/kotlin/kctf/generateTestSources.kt index 368bfa5..f0af18b 100644 --- a/kctf-gradle-tasks/src/main/kotlin/kctf/generateTestSources.kt +++ b/kctf-gradle-tasks/src/main/kotlin/kctf/generateTestSources.kt @@ -1,7 +1,7 @@ package kctf import gratatouille.tasks.GInternal -import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5 +import org.jetbrains.kotlin.generators.dsl.junit5.generateTestGroupSuiteWithJUnit5 import java.io.File import java.net.URLClassLoader @@ -52,7 +52,7 @@ fun kctfGenerateSources( testDataRoot = root, testsRoot = outputDirectoryRelativeToRoot ) { - testClass(testKClass = clazz, useJunit4 = false) { + testClass(testKClass = clazz) { model(modelPath) } } diff --git a/kctf-runtime/api/kctf-runtime.api b/kctf-runtime/api/kctf-runtime.api new file mode 100644 index 0000000..49cde96 --- /dev/null +++ b/kctf-runtime/api/kctf-runtime.api @@ -0,0 +1,17 @@ +public final class kctf/ClasspathBasedStandardLibrariesPathProvider : org/jetbrains/kotlin/test/services/KotlinStandardLibrariesPathProvider { + public static final field INSTANCE Lkctf/ClasspathBasedStandardLibrariesPathProvider; + public fun commonStdlibForTests ()Ljava/io/File; + public fun defaultJsStdlib ()Ljava/io/File; + public fun fullJsStdlib ()Ljava/io/File; + public fun getAnnotationsJar ()Ljava/io/File; + public fun jvmAnnotationsForTests ()Ljava/io/File; + public fun kotlinTestJarForTests ()Ljava/io/File; + public fun kotlinTestJsKLib ()Ljava/io/File; + public fun minimalRuntimeJarForTests ()Ljava/io/File; + public fun reflectJarForTests ()Ljava/io/File; + public fun runtimeJarForTests ()Ljava/io/File; + public fun runtimeJarForTestsWithJdk8 ()Ljava/io/File; + public fun scriptRuntimeJarForTests ()Ljava/io/File; + public fun scriptingPluginFilesForTests ()Ljava/util/Collection; +} + diff --git a/librarian.root.properties b/librarian.root.properties index b9d5859..e7de8a3 100644 --- a/librarian.root.properties +++ b/librarian.root.properties @@ -4,7 +4,7 @@ kotlin.compatibility=2.0.0 kdoc.olderVersions= pom.groupId=com.gradleup.kctf -pom.version=2.2.20-RC-0.0.2-SNAPSHOT +pom.version=2.3.10-0.0.2-SNAPSHOT pom.description=Kotlin Compiler Test Framework Gradle Plugin pom.vcsUrl=https://github.com/GradleUp/kctf pom.developer=kctf authors @@ -12,3 +12,6 @@ pom.license=MIT gcs.bucket=gradleup gcs.prefix=m2 + +# tasks/runtime use kotlin-stdlib 2.3 +checkDependenciesCompatibility=false \ No newline at end of file