In need of cleanup
diff --git a/.bazelproject b/.bazelproject
index dff4b30..787d80e 100644
--- a/.bazelproject
+++ b/.bazelproject
@@ -23,15 +23,9 @@
//src/test/...
//third_party/...
//kotlin/...
- @legacy//...
- @rkt_1_6//...
- @rkt_1_7//...
test_sources:
src/test/*
additional_languages:
kotlin
-
-import_run_configurations:
- src/test/Bazel_all_local_tests.xml
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel b/src/main/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel
index 89512fa..95396de 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel
@@ -3,7 +3,7 @@
kt_bootstrap_library(
name = "build_lib",
srcs = ["Build.kt"],
- visibility = ["//:rules_kotlin_development"],
+ visibility = ["//visibility:public"],
deps = [
"//src/main/kotlin/io/bazel/kotlin/builder",
"//src/main/kotlin/io/bazel/kotlin/builder/tasks",
@@ -38,13 +38,13 @@
main_class = "io.bazel.kotlin.builder.cmd.Build",
runtime_library = ":build_lib",
shade_rules = "//src/main/kotlin:shade.jarjar",
- visibility = ["//:rules_kotlin_development"],
+ visibility = ["//src:__subpackages__"],
)
kt_bootstrap_library(
name = "merge_jdeps_lib",
srcs = ["MergeJdeps.kt"],
- visibility = ["//:rules_kotlin_development"],
+ visibility = ["//src:__subpackages__"],
deps = [
"//src/main/kotlin/io/bazel/kotlin/builder",
"//src/main/kotlin/io/bazel/kotlin/builder/tasks",
diff --git a/src/rkt_1_6/kotlin/io/bazel/kotlin/builder/cmd/Build.kt b/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/Build.kt
similarity index 61%
rename from src/rkt_1_6/kotlin/io/bazel/kotlin/builder/cmd/Build.kt
rename to src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/Build.kt
index 03942ba..7275205 100644
--- a/src/rkt_1_6/kotlin/io/bazel/kotlin/builder/cmd/Build.kt
+++ b/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/Build.kt
@@ -1,12 +1,14 @@
package io.bazel.kotlin.builder.cmd
+import io.bazel.kotlin.builder.jobs.kotlinc.KotlinToJvm
import io.bazel.worker.Worker
import kotlin.system.exitProcess
object Build {
@JvmStatic
fun main(args: Array<String>) {
- Worker.from(args.toList()) {
+ val compile = KotlinToJvm();
+ Worker.from(args.toList()) { flags ->
return@from 1
}.run(::exitProcess)
}
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/CompileJvm.kt b/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/CompileJvm.kt
new file mode 100644
index 0000000..999ad78
--- /dev/null
+++ b/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/CompileJvm.kt
@@ -0,0 +1,26 @@
+package io.bazel.kotlin.builder.jobs.kotlinc
+
+import io.bazel.kotlin.builder.utils.Arguments
+import io.bazel.worker.Status
+import io.bazel.worker.Work
+import io.bazel.worker.WorkerContext
+
+class CompileJvm : Work {
+ val compile = KotlinToJvm()
+ override fun invoke(ctx: WorkerContext.TaskContext, args: Iterable<String>): Status {
+ return ctx.resultOf { task ->
+ val flags = JvmFlags(Arguments(args.toList()), task.directory)
+ compile.run(
+ JobContext.of(task, flags, flags),
+ listOf(
+// CompileKotlinForJvm(),
+// CompileWithAssociates(),
+// GenerateJDeps(),
+// GenerateAbi(),
+// GenerateStubs(),
+// CompileWithPlugins(),
+ ),
+ )
+ }.status
+ }
+}
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/JvmCoreFlags.kt b/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/JvmCoreFlags.kt
index 426c8db..1d1fb64 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/JvmCoreFlags.kt
+++ b/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/JvmCoreFlags.kt
@@ -173,8 +173,8 @@
override val jdeps: Path = RepositoryLocations.JDEPS_GEN_PLUGIN
- override val abi: Path = RepositoryLocations.DEFAULT_JVM_ABI_PATH
- override val kapt: Path = RepositoryLocations.KAPT
+ override val abi: Path = RepositoryLocations.JVM_ABI_PLUGIN
+ override val kapt: Path = RepositoryLocations.KAPT_PLUGIN
override val outputSrcJar by argument.path("kotlin_output_srcjar", "", required = true)
override val output by argument.path("output", "", required = true)
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/JvmFlags.kt b/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/JvmFlags.kt
new file mode 100644
index 0000000..e728268
--- /dev/null
+++ b/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/JvmFlags.kt
@@ -0,0 +1,12 @@
+package io.bazel.kotlin.builder.jobs.kotlinc
+
+import io.bazel.kotlin.builder.utils.Arguments
+import java.nio.file.Path
+
+class JvmFlags(
+ argument: Arguments,
+ workingDirectory: Path,
+) : JvmCoreFlags(
+ argument,
+ workingDirectory,
+)
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/KotlinCompile.kt b/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/KotlinToJvm.kt
similarity index 93%
rename from src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/KotlinCompile.kt
rename to src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/KotlinToJvm.kt
index c2b5d69..9a7acdc 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/KotlinCompile.kt
+++ b/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/KotlinToJvm.kt
@@ -1,8 +1,6 @@
package io.bazel.kotlin.builder.jobs.kotlinc
import io.bazel.kotlin.builder.jobs.kotlinc.configurations.CompilerConfiguration
-import io.bazel.kotlin.builder.jobs.kotlinc.JobContext
-import io.bazel.kotlin.builder.jobs.kotlinc.Report
import io.bazel.worker.Status
import org.jetbrains.kotlin.cli.common.ExitCode.COMPILATION_ERROR
import org.jetbrains.kotlin.cli.common.ExitCode.INTERNAL_ERROR
@@ -15,7 +13,7 @@
import org.jetbrains.kotlin.config.Services
import org.jetbrains.kotlin.konan.file.File.Companion.separator
-class KotlinCompile {
+class KotlinToJvm {
private val compiler = K2JVMCompiler()
fun <IN, OUT> run(
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/RepositoryLocations.kt b/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/RepositoryLocations.kt
index d0d34ab..9e81e91 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/RepositoryLocations.kt
+++ b/src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/RepositoryLocations.kt
@@ -8,31 +8,51 @@
*/
// TODO(): Replace with command line arguments.
object RepositoryLocations {
- val RULES_REPOSITORY_NAME =
- System.getenv("TEST_WORKSPACE")?.takeIf { it.isNotBlank() }
- ?: System.getenv("REPOSITORY_NAME")?.takeIf { it.isNotBlank() }
- ?: error("Unable to determine rules_kotlin repository name.\nenv:${System.getenv()}\nproperties:${System.getProperties()}")
+ val JVM_ABI_PLUGIN by lazy {
+ BazelRunFiles.resolveVerifiedFromProperty(
+ "@com_github_jetbrains_kotlin...jvm-abi-gen",
+ ).toPath()
+ }
- val DEFAULT_JVM_ABI_PATH = BazelRunFiles.resolveVerified(
- "external", "com_github_jetbrains_kotlin", "lib", "jvm-abi-gen.jar"
- ).toPath()
+ val KAPT_PLUGIN by lazy {
+ BazelRunFiles.resolveVerifiedFromProperty(
+ "@com_github_jetbrains_kotlin...kapt",
+ ).toPath()
+ }
- val COMPILER = BazelRunFiles.resolveVerified(
- RULES_REPOSITORY_NAME,
- "src", "main", "kotlin", "io", "bazel", "kotlin", "compiler",
- "compiler.jar").toPath()
+ val COMPILER by lazy {
+ BazelRunFiles.resolveVerifiedFromProperty(
+ "@rules_kotlin...compiler",
+ ).toPath()
+ }
- val SKIP_CODE_GEN_PLUGIN = BazelRunFiles.resolveVerified(
- RULES_REPOSITORY_NAME,
- "src", "main", "kotlin",
- "skip-code-gen.jar").toPath()
+ val SKIP_CODE_GEN_PLUGIN by lazy {
+ BazelRunFiles.resolveVerifiedFromProperty(
+ "@rules_kotlin...skip-code-gen",
+ ).toPath()
+ }
- val JDEPS_GEN_PLUGIN = BazelRunFiles.resolveVerified(
- RULES_REPOSITORY_NAME,
- "src", "main", "kotlin",
- "jdeps-gen.jar").toPath()
+ val JDEPS_GEN_PLUGIN by lazy {
+ BazelRunFiles.resolveVerifiedFromProperty(
+ "@rules_kotlin...jdeps-gen",
+ ).toPath()
+ }
- val KAPT = BazelRunFiles.resolveVerified(
- RULES_REPOSITORY_NAME,
- "external", "com_github_jetbrains_kotlin", "lib", "kotlin-annotation-processing.jar").toPath()
+ val KOTLINC by lazy {
+ BazelRunFiles.resolveVerifiedFromProperty(
+ "@com_github_jetbrains_kotlin...kotlin-compiler",
+ ).toPath()
+ }
+
+ val KSP_SYMBOL_PROCESSING_API by lazy {
+ BazelRunFiles.resolveVerifiedFromProperty(
+ "@com_github_google_ksp...symbol-processing-api",
+ ).toPath()
+ }
+
+ val KSP_SYMBOL_PROCESSING_CMDLINE by lazy {
+ BazelRunFiles.resolveVerifiedFromProperty(
+ "@com_github_google_ksp...symbol-processing-cmdline",
+ ).toPath()
+ }
}
diff --git a/src/main/kotlin/io/bazel/worker/BUILD.bazel b/src/main/kotlin/io/bazel/worker/BUILD.bazel
index 248f745..72df33d 100644
--- a/src/main/kotlin/io/bazel/worker/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/worker/BUILD.bazel
@@ -16,7 +16,7 @@
name = "worker",
srcs = glob(["*.kt"]),
visibility = [
- "//:rules_kotlin_development",
+ "//src:__subpackages__",
],
deps = [
":worker_proto",
diff --git a/src/rkt_1_6/WORKSPACE b/src/rkt_1_6/WORKSPACE
deleted file mode 100644
index e69de29..0000000
--- a/src/rkt_1_6/WORKSPACE
+++ /dev/null
diff --git a/src/rkt_1_6/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel b/src/rkt_1_6/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel
deleted file mode 100644
index d30069d..0000000
--- a/src/rkt_1_6/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel
+++ /dev/null
@@ -1,28 +0,0 @@
-load("@dev_io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_binary", "kt_jvm_library")
-
-kt_jvm_library(
- name = "build_lib",
- srcs = ["Build.kt"],
- visibility = [
- "//:__subpackages__",
- ],
- deps = [
- "//kotlin/io/bazel/kotlin/builder/jobs/kotlinc:jvm",
- "@dev_io_bazel_rules_kotlin//src/main/kotlin:jdeps-gen",
- "@dev_io_bazel_rules_kotlin//src/main/kotlin:skip-code-gen",
- "@dev_io_bazel_rules_kotlin//src/main/kotlin/io/bazel/worker",
- ],
-)
-
-kt_jvm_binary(
- name = "build",
- data = [
- "@com_github_jetbrains_kotlin//:lib/jvm-abi-gen.jar",
- "@com_github_jetbrains_kotlin//:lib/kotlin-compiler.jar",
- ],
- main_class = "io.bazel.kotlin.builder.cmd.Build",
- visibility = [
- "//visibility:public",
- ],
- runtime_deps = [":build_lib"],
-)
diff --git a/src/rkt_1_6/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/BUILD.bazel b/src/rkt_1_6/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/BUILD.bazel
deleted file mode 100644
index 0277c61..0000000
--- a/src/rkt_1_6/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@dev_io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
-
-kt_jvm_library(
- name = "jvm",
- srcs = [
- "JvmFlags.kt",
- ],
- visibility = [
- "//visibility:public",
- ],
- exports = [
- "@dev_io_bazel_rules_kotlin//src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc:jvm",
- ],
- deps = [
- "@dev_io_bazel_rules_kotlin//src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc:jvm",
- ],
-)
diff --git a/src/rkt_1_6/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/JvmFlags.kt b/src/rkt_1_6/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/JvmFlags.kt
deleted file mode 100644
index 0d2334d..0000000
--- a/src/rkt_1_6/kotlin/io/bazel/kotlin/builder/jobs/kotlinc/JvmFlags.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.bazel.kotlin.builder.jobs.kotlinc
-
-import io.bazel.kotlin.builder.utils.Arguments
-import java.nio.file.FileSystem
-import java.nio.file.FileSystems
-import java.nio.file.Path
-import io.bazel.kotlin.builder.jobs.kotlinc.JvmCoreFlags
-
-class JvmFlags(
- argument: Arguments,
- workingDirectory: Path,
-) : CoreJvmFlags(
- argument: Arguments,
- workingDirectory: Path,
-)
diff --git a/src/test/kotlin/io/bazel/rkt_1_6/builder/jobs/kotlinc/BUILD.bazel b/src/test/kotlin/io/bazel/rkt_1_6/builder/jobs/kotlinc/BUILD.bazel
index 75ff3bd..f8a207e 100644
--- a/src/test/kotlin/io/bazel/rkt_1_6/builder/jobs/kotlinc/BUILD.bazel
+++ b/src/test/kotlin/io/bazel/rkt_1_6/builder/jobs/kotlinc/BUILD.bazel
@@ -7,11 +7,11 @@
"TestScope.kt",
],
deps = [
+ "//src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc:jvm",
"//src/main/kotlin/io/bazel/worker",
"@kotlin_rules_maven//:com_google_truth_truth",
"@kotlin_rules_maven//:org_ow2_asm_asm",
"@kotlin_rules_maven//:org_ow2_asm_asm_util",
- "@rkt_1_6//kotlin/io/bazel/kotlin/builder/jobs/kotlinc:jvm",
],
)
@@ -22,13 +22,13 @@
],
test_class = "io.bazel.rkt_1_6.builder.jobs.jvm.CompileForJvmTest",
runtime_deps = [
- "@com_github_jetbrains_kotlin//:kotlin-runtime-compiler",
+ "@com_github_jetbrains_kotlin//:kotlin-compiler",
],
deps = [
":lib",
+ "//src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc:jvm",
"//src/test/kotlin/io/bazel/kotlin/integration",
"@kotlin_rules_maven//:com_google_truth_truth",
- "@rkt_1_6//kotlin/io/bazel/kotlin/builder/jobs/kotlinc:jvm",
],
)
@@ -47,16 +47,16 @@
],
test_class = "io.bazel.rkt_1_6.builder.jobs.jvm.GenerateAbiTest",
runtime_deps = [
- "@com_github_jetbrains_kotlin//:kotlin-runtime-compiler",
+ "@com_github_jetbrains_kotlin//:kotlin-compiler",
],
deps = [
":lib",
+ "//src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc:jvm",
"//src/test/kotlin/io/bazel/kotlin/integration",
"@com_github_jetbrains_kotlin//:kotlin-stdlib",
"@com_github_jetbrains_kotlin//:kotlin-stdlib-jdk7",
"@com_github_jetbrains_kotlin//:kotlin-stdlib-jdk8",
"@kotlin_rules_maven//:com_google_truth_truth",
- "@rkt_1_6//kotlin/io/bazel/kotlin/builder/jobs/kotlinc:jvm",
],
)
@@ -83,16 +83,16 @@
],
test_class = "io.bazel.rkt_1_6.builder.jobs.jvm.GenerateStubsTest",
runtime_deps = [
- "@com_github_jetbrains_kotlin//:kotlin-runtime-compiler",
+ "@com_github_jetbrains_kotlin//:kotlin-compiler",
],
deps = [
":lib",
+ "//src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc:jvm",
"//src/test/kotlin/io/bazel/kotlin/integration",
"@com_github_jetbrains_kotlin//:kotlin-stdlib",
"@com_github_jetbrains_kotlin//:kotlin-stdlib-jdk7",
"@com_github_jetbrains_kotlin//:kotlin-stdlib-jdk8",
"@kotlin_rules_maven//:com_google_truth_truth",
- "@rkt_1_6//kotlin/io/bazel/kotlin/builder/jobs/kotlinc:jvm",
],
)
@@ -109,12 +109,12 @@
],
test_class = "io.bazel.rkt_1_6.builder.jobs.jvm.CompileWithAssociatesTest",
runtime_deps = [
- "@com_github_jetbrains_kotlin//:kotlin-runtime-compiler",
+ "@com_github_jetbrains_kotlin//:kotlin-compiler",
],
deps = [
":lib",
+ "//src/main/kotlin/io/bazel/kotlin/builder/jobs/kotlinc:jvm",
"//src/test/kotlin/io/bazel/kotlin/integration",
"@kotlin_rules_maven//:com_google_truth_truth",
- "@rkt_1_6//kotlin/io/bazel/kotlin/builder/jobs/kotlinc:jvm",
],
)
diff --git a/src/test/kotlin/io/bazel/rkt_1_6/builder/jobs/kotlinc/CompileConfigurationSubject.kt b/src/test/kotlin/io/bazel/rkt_1_6/builder/jobs/kotlinc/CompileConfigurationSubject.kt
index 265c9c9..e4793dd 100644
--- a/src/test/kotlin/io/bazel/rkt_1_6/builder/jobs/kotlinc/CompileConfigurationSubject.kt
+++ b/src/test/kotlin/io/bazel/rkt_1_6/builder/jobs/kotlinc/CompileConfigurationSubject.kt
@@ -7,7 +7,7 @@
import com.google.common.truth.Subject
import io.bazel.kotlin.builder.jobs.kotlinc.configurations.CompilerConfiguration
import io.bazel.kotlin.builder.jobs.kotlinc.JobContext
-import io.bazel.kotlin.builder.jobs.kotlinc.KotlinCompile
+import io.bazel.kotlin.builder.jobs.kotlinc.KotlinToJvm
import io.bazel.worker.Status
import org.objectweb.asm.ClassReader
import org.objectweb.asm.ClassReader.EXPAND_FRAMES
@@ -136,7 +136,7 @@
metadata,
outputs,
scope,
- KotlinCompile().run(
+ KotlinToJvm().run(
JobContext.of(
scope,
inputs,
diff --git a/src/test/kotlin/io/bazel/rkt_1_6/builder/jobs/kotlinc/GenerateStubsTest.kt b/src/test/kotlin/io/bazel/rkt_1_6/builder/jobs/kotlinc/GenerateStubsTest.kt
index 6607209..1ad1ce2 100644
--- a/src/test/kotlin/io/bazel/rkt_1_6/builder/jobs/kotlinc/GenerateStubsTest.kt
+++ b/src/test/kotlin/io/bazel/rkt_1_6/builder/jobs/kotlinc/GenerateStubsTest.kt
@@ -2,7 +2,7 @@
import com.google.common.truth.Truth.assertAbout
import com.google.common.truth.Truth.assertThat
-import io.bazel.kotlin.builder.utils.BazelRunFiles.resolveFromProperty
+import io.bazel.kotlin.builder.utils.BazelRunFiles.resolveVerifiedFromProperty
import io.bazel.kotlin.integration.WriteWorkspace
import io.bazel.rkt_1_6.builder.jobs.kotlinc.CompileConfigurationSubject.Companion.configurations
import io.bazel.kotlin.builder.jobs.kotlinc.configurations.CompileKotlinForJvm
@@ -26,28 +26,28 @@
override val reducedClasspathMode: Boolean = false,
override val depsArtifacts: List<Path> = emptyList(),
override val classpath: List<Path> = listOf(
- resolveFromProperty("auto_value_annotations"),
- resolveFromProperty("auto_value"),
- resolveFromProperty("kotlin_annotations"),
+ resolveVerifiedFromProperty("auto_value_annotations").toPath(),
+ resolveVerifiedFromProperty("auto_value").toPath(),
+ resolveVerifiedFromProperty("kotlin_annotations").toPath(),
),
override val fileSystem: FileSystem = FileSystems.getDefault(),
override val sources: List<Path> = emptyList(),
override val useIr: Boolean = false,
override val debug: List<String> = listOf("trace", "debug"),
override val sourcesFromJars: List<Path> = emptyList(),
- override val jdkHome: Path = resolveFromProperty("java.home"),
+ override val jdkHome: Path = resolveVerifiedFromProperty("java.home").toPath(),
override val passthroughFlags: List<String> = emptyList(),
override val stubsPluginClassPath: List<Path> = emptyList(),
override val stubsPluginOptions: List<String> = emptyList(),
override val processorPath: List<Path> = listOf(
- resolveFromProperty("auto_value_annotations"),
- resolveFromProperty("auto_value"),
- resolveFromProperty("kotlin_annotations"),
+ resolveVerifiedFromProperty("auto_value_annotations").toPath(),
+ resolveVerifiedFromProperty("auto_value").toPath(),
+ resolveVerifiedFromProperty("kotlin_annotations").toPath(),
),
override val processors: List<String> = listOf(
"com.google.auto.value.processor.AutoValueProcessor"
),
- override val kapt: Path = resolveFromProperty("kapt"),
+ override val kapt: Path = resolveVerifiedFromProperty("kapt").toPath(),
override val verbose: Boolean = true,
override val processorOptions: Map<String, String> = emptyMap(),
) : CompileKotlinForJvm.In, GenerateStubs.In
@@ -111,7 +111,8 @@
.canCompile(
In(
sources = listOf(source)
- ), Out(
+ ),
+ Out(
generatedJavaSrcJar = temp.resolve("generatedJava.srcjar"),
generatedJavaStubJar = temp.resolve("stubs.jar"),
generatedClassJar = temp.resolve("generated.jar")
@@ -187,8 +188,8 @@
.canCompile(
In(
sources = listOf(sourceAutovalue, sourceData),
- classpath = listOf(resolveFromProperty("serialization_core")),
- stubsPluginClassPath = listOf(resolveFromProperty("serialization_plugin")),
+ classpath = listOf(resolveVerifiedFromProperty("serialization_core").toPath()),
+ stubsPluginClassPath = listOf(resolveVerifiedFromProperty("serialization_plugin").toPath()),
stubsPluginOptions = listOf()
),
Out(
