Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions compiler-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ idea {
module.generatedSourceDirs.add(testGenDirectory.get().asFile)
}

val testArtifacts: Configuration by configurations.creating
val testArtifacts: Configuration = configurations.create("testArtifact")

val annotationsRuntimeClasspath by configurations.dependencyScope("annotationsRuntimeClasspath") {
val annotationsRuntimeClasspath = configurations.dependencyScope("annotationsRuntimeClasspath") {
isTransitive = false
}
val annotationsJvmRuntimeClasspath by configurations.resolvable("annotationsJvmRuntimeClasspath") {
val annotationsJvmRuntimeClasspath = configurations.resolvable("annotationsJvmRuntimeClasspath") {
extendsFrom(annotationsRuntimeClasspath)
}
val annotationsJsRuntimeClasspath by configurations.resolvable("annotationsJsRuntimeClasspath") {
val annotationsJsRuntimeClasspath = configurations.resolvable("annotationsJsRuntimeClasspath") {
extendsFrom(annotationsRuntimeClasspath)
attributes {
attribute(Usage.USAGE_ATTRIBUTE, objects.named(KotlinUsages.KOTLIN_RUNTIME))
Expand Down Expand Up @@ -93,8 +93,8 @@ tasks.test {
useJUnitPlatform()
workingDir = rootDir

systemProperty("annotationsRuntime.jvm.classpath", annotationsJvmRuntimeClasspath.asPath)
systemProperty("annotationsRuntime.js.classpath", annotationsJsRuntimeClasspath.asPath)
systemProperty("annotationsRuntime.jvm.classpath", annotationsJvmRuntimeClasspath.get().asPath)
systemProperty("annotationsRuntime.js.classpath", annotationsJsRuntimeClasspath.get().asPath)

// Properties required to run the internal test framework.
setLibraryProperty("org.jetbrains.kotlin.test.kotlin-stdlib", "kotlin-stdlib")
Expand Down Expand Up @@ -126,7 +126,7 @@ kotlin {
}
}

val generateTests by tasks.registering(JavaExec::class) {
val generateTests = tasks.register<JavaExec>("generateTests") {
inputs.dir(testDataDir)
.withPropertyName("testData")
.withPathSensitivity(PathSensitivity.RELATIVE)
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
Loading