Rename JavaCompileInputs to CompilationInputs
Separating out this renaming from the rest of the changes.
Test: presubmit
Change-Id: Ibd60508474310add12f8dab04577f299d3ea247a
diff --git a/buildSrc-tests/lint-baseline.xml b/buildSrc-tests/lint-baseline.xml
index f24bb50..b7dd377 100644
--- a/buildSrc-tests/lint-baseline.xml
+++ b/buildSrc-tests/lint-baseline.xml
@@ -66,15 +66,6 @@
<issue
id="EagerGradleConfiguration"
- message="Avoid using method get"
- errorLine1=" val verifyOutputsTask = verifyOutputs.get()"
- errorLine2=" ~~~">
- <location
- file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/Release.kt"/>
- </issue>
-
- <issue
- id="EagerGradleConfiguration"
message="Use configureEach instead of whenObjectAdded"
errorLine1=" configurations.whenObjectAdded {"
errorLine2=" ~~~~~~~~~~~~~~~">
@@ -256,7 +247,7 @@
<issue
id="GradleProjectIsolation"
message="Use isolated.rootProject instead of getRootProject"
- errorLine1=" rootProject.layout.buildDirectory.dir("privacysandbox-files")"
+ errorLine1=" rootProject.layout.buildDirectory.dir("app-apks-files")"
errorLine2=" ~~~~~~~~~~~">
<location
file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*3}/androidx/build/BuildServerConfiguration.kt"/>
@@ -273,6 +264,15 @@
<issue
id="GradleProjectIsolation"
+ message="Avoid using method getParent"
+ errorLine1=" ${project.parent}."
+ errorLine2=" ~~~~~~">
+ <location
+ file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/checkapi/CompilationInputs.kt"/>
+ </issue>
+
+ <issue
+ id="GradleProjectIsolation"
message="Use isolated.rootProject instead of getRootProject"
errorLine1=" rootProject.tasks.named(CREATE_AGGREGATE_BUILD_INFO_FILES_TASK).configure {"
errorLine2=" ~~~~~~~~~~~">
@@ -345,15 +345,6 @@
<issue
id="GradleProjectIsolation"
- message="Avoid using method getParent"
- errorLine1=" ${project.parent}."
- errorLine2=" ~~~~~~">
- <location
- file="${:buildSrc-tests*main*MAIN*sourceProvider*0*javaDir*4}/androidx/build/java/JavaCompileInputs.kt"/>
- </issue>
-
- <issue
- id="GradleProjectIsolation"
message="Use isolated.rootProject instead of getRootProject"
errorLine1=" val rootBaseDir = if (compilerDaemonDisabled) projectDir else rootProject.projectDir"
errorLine2=" ~~~~~~~~~~~">
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/ErrorProneConfiguration.kt b/buildSrc/private/src/main/kotlin/androidx/build/ErrorProneConfiguration.kt
index 005f95f..044bcbb 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/ErrorProneConfiguration.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/ErrorProneConfiguration.kt
@@ -16,7 +16,7 @@
package androidx.build
-import androidx.build.java.JavaCompileInputs
+import androidx.build.checkapi.CompilationInputs
import com.android.build.api.variant.AndroidComponentsExtension
import org.gradle.api.Project
import org.gradle.api.artifacts.Configuration
@@ -58,7 +58,7 @@
makeKmpErrorProneTask(
COMPILE_JAVA_TASK_NAME,
jvmJarProvider,
- JavaCompileInputs.fromKmpJvmTarget(project)
+ CompilationInputs.fromKmpJvmTarget(project)
)
} else {
makeErrorProneTask(COMPILE_JAVA_TASK_NAME)
@@ -275,12 +275,12 @@
* Note: Since ErrorProne only understands Java files which may be dependent on Kotlin source, using
* this method to register ErrorProne task causes it to be dependent on jvmJar task.
*
- * @param jvmCompileInputs [JavaCompileInputs] that specifies jvm source including Kotlin sources.
+ * @param jvmCompileInputs [CompilationInputs] that specifies jvm source including Kotlin sources.
*/
private fun Project.makeKmpErrorProneTask(
compileTaskName: String,
jvmJarTaskProvider: TaskProvider<Jar>,
- jvmCompileInputs: JavaCompileInputs
+ jvmCompileInputs: CompilationInputs
) {
makeErrorProneTask(compileTaskName) { errorProneTask ->
// ErrorProne doesn't understand Kotlin source, so first let kotlinCompile finish, then
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/checkapi/ApiTasks.kt b/buildSrc/private/src/main/kotlin/androidx/build/checkapi/ApiTasks.kt
index 17d960d..e173a7e 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/checkapi/ApiTasks.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/checkapi/ApiTasks.kt
@@ -23,7 +23,6 @@
import androidx.build.binarycompatibilityvalidator.BinaryCompatibilityValidation
import androidx.build.getSupportRootFolder
import androidx.build.isWriteVersionedApiFilesEnabled
-import androidx.build.java.JavaCompileInputs
import androidx.build.metalava.MetalavaTasks
import androidx.build.multiplatformExtension
import androidx.build.resources.ResourceTasks
@@ -162,14 +161,14 @@
listOf(currentApiLocation)
}
- val (javaInputs, androidManifest) =
- configureJavaInputsAndManifest(config) ?: return@afterEvaluate
+ val (compilationInputs, androidManifest) =
+ configureCompilationInputsAndManifest(config) ?: return@afterEvaluate
val baselinesApiLocation = ApiBaselinesLocation.fromApiLocation(currentApiLocation)
val generateApiDependencies = createReleaseApiConfiguration()
MetalavaTasks.setupProject(
project,
- javaInputs,
+ compilationInputs,
generateApiDependencies,
extension,
androidManifest,
@@ -204,27 +203,27 @@
}
}
-internal fun Project.configureJavaInputsAndManifest(
+internal fun Project.configureCompilationInputsAndManifest(
config: ApiTaskConfig
-): Pair<JavaCompileInputs, Provider<RegularFile>?>? {
+): Pair<CompilationInputs, Provider<RegularFile>?>? {
return when (config) {
is LibraryApiTaskConfig -> {
if (config.variant.name != Release.DEFAULT_PUBLISH_CONFIG) {
return null
}
- JavaCompileInputs.fromLibraryVariant(config.variant, project) to
+ CompilationInputs.fromLibraryVariant(config.variant, project) to
config.variant.artifacts.get(SingleArtifact.MERGED_MANIFEST)
}
is AndroidMultiplatformApiTaskConfig -> {
- JavaCompileInputs.fromKmpAndroidTarget(project) to null
+ CompilationInputs.fromKmpAndroidTarget(project) to null
}
is KmpApiTaskConfig -> {
- JavaCompileInputs.fromKmpJvmTarget(project) to null
+ CompilationInputs.fromKmpJvmTarget(project) to null
}
is JavaApiTaskConfig -> {
val javaExtension = extensions.getByType<JavaPluginExtension>()
val mainSourceSet = javaExtension.sourceSets.getByName("main")
- JavaCompileInputs.fromSourceSet(mainSourceSet, this) to null
+ CompilationInputs.fromSourceSet(mainSourceSet, this) to null
}
}
}
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/java/JavaCompileInputs.kt b/buildSrc/private/src/main/kotlin/androidx/build/checkapi/CompilationInputs.kt
similarity index 92%
rename from buildSrc/private/src/main/kotlin/androidx/build/java/JavaCompileInputs.kt
rename to buildSrc/private/src/main/kotlin/androidx/build/checkapi/CompilationInputs.kt
index cb3d5ae..08ac98d 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/java/JavaCompileInputs.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/checkapi/CompilationInputs.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2018 The Android Open Source Project
+ * Copyright 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.build.java
+package androidx.build.checkapi
import androidx.build.getAndroidJar
import androidx.build.multiplatformExtension
@@ -31,9 +31,9 @@
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
-// JavaCompileInputs contains the information required to compile Java/Kotlin code
+// CompilationInputs contains the information required to compile Java/Kotlin code
// This can be helpful for creating Metalava and Dokka tasks with the same settings
-data class JavaCompileInputs(
+data class CompilationInputs(
// Source files to process
val sourcePaths: FileCollection,
@@ -47,8 +47,8 @@
val bootClasspath: FileCollection
) {
companion object {
- // Constructs a JavaCompileInputs from a library and its variant
- fun fromLibraryVariant(variant: LibraryVariant, project: Project): JavaCompileInputs {
+ // Constructs a CompilationInputs from a library and its variant
+ fun fromLibraryVariant(variant: LibraryVariant, project: Project): CompilationInputs {
val kotlinCollection = project.files(variant.sources.kotlin?.all)
val javaCollection = project.files(variant.sources.java?.all)
@@ -77,7 +77,7 @@
.sdkComponents
.bootClasspath
- return JavaCompileInputs(
+ return CompilationInputs(
sourcePaths = sourceCollection,
commonModuleSourcePaths = commonModuleSourceCollection,
dependencyClasspath = variant.compileClasspath,
@@ -86,11 +86,11 @@
}
/**
- * Returns the JavaCompileInputs for the `jvm` target of a KMP project.
+ * Returns the CompilationInputs for the `jvm` target of a KMP project.
*
* @param project The project whose main jvm target inputs will be returned.
*/
- fun fromKmpJvmTarget(project: Project): JavaCompileInputs {
+ fun fromKmpJvmTarget(project: Project): CompilationInputs {
val kmpExtension =
checkNotNull(project.multiplatformExtension) {
"""
@@ -107,7 +107,7 @@
val commonModuleSourcePaths = project.commonModuleSourcePaths(jvmCompilation)
- return JavaCompileInputs(
+ return CompilationInputs(
sourcePaths = sourceCollection,
commonModuleSourcePaths = commonModuleSourcePaths,
dependencyClasspath =
@@ -118,11 +118,11 @@
}
/**
- * Returns the JavaCompileInputs for the `android` target of a KMP project.
+ * Returns the CompilationInputs for the `android` target of a KMP project.
*
* @param project The project whose main android target inputs will be returned.
*/
- fun fromKmpAndroidTarget(project: Project): JavaCompileInputs {
+ fun fromKmpAndroidTarget(project: Project): CompilationInputs {
val kmpExtension =
checkNotNull(project.multiplatformExtension) {
"""
@@ -140,7 +140,7 @@
val commonModuleSourcePaths = project.commonModuleSourcePaths(compilation)
- return JavaCompileInputs(
+ return CompilationInputs(
sourcePaths = sourceCollection,
commonModuleSourcePaths = commonModuleSourcePaths,
dependencyClasspath =
@@ -150,12 +150,12 @@
)
}
- // Constructs a JavaCompileInputs from a sourceset
- fun fromSourceSet(sourceSet: SourceSet, project: Project): JavaCompileInputs {
+ // Constructs a CompilationInputs from a sourceset
+ fun fromSourceSet(sourceSet: SourceSet, project: Project): CompilationInputs {
val sourcePaths: FileCollection =
project.files(project.provider { sourceSet.allSource.srcDirs })
val dependencyClasspath = sourceSet.compileClasspath
- return JavaCompileInputs(
+ return CompilationInputs(
sourcePaths = sourcePaths,
commonModuleSourcePaths = project.files(),
dependencyClasspath = dependencyClasspath,
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/kythe/GenerateJavaKzipTask.kt b/buildSrc/private/src/main/kotlin/androidx/build/kythe/GenerateJavaKzipTask.kt
index 656e1b4..2177809 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/kythe/GenerateJavaKzipTask.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/kythe/GenerateJavaKzipTask.kt
@@ -16,9 +16,9 @@
package androidx.build.kythe
import androidx.build.addToBuildOnServer
+import androidx.build.checkapi.CompilationInputs
import androidx.build.getCheckoutRoot
import androidx.build.getPrebuiltsRoot
-import androidx.build.java.JavaCompileInputs
import java.io.File
import javax.inject.Inject
import org.gradle.api.DefaultTask
@@ -136,7 +136,7 @@
internal companion object {
fun setupProject(
project: Project,
- javaInputs: JavaCompileInputs,
+ compilationInputs: CompilationInputs,
compiledSources: Configuration,
) {
val annotationProcessorPaths =
@@ -162,10 +162,10 @@
"build-tools/common/javac_extractor.jar"
)
)
- sourcePaths.setFrom(javaInputs.sourcePaths)
+ sourcePaths.setFrom(compilationInputs.sourcePaths)
vnamesJson.set(project.getVnamesJson())
dependencyClasspath.setFrom(
- javaInputs.dependencyClasspath + javaInputs.bootClasspath
+ compilationInputs.dependencyClasspath + compilationInputs.bootClasspath
)
this.compiledSources.setFrom(compiledSources)
kzipOutputFile.set(
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/kythe/GenerateKotlinKzipTask.kt b/buildSrc/private/src/main/kotlin/androidx/build/kythe/GenerateKotlinKzipTask.kt
index 536f9cc..6a9d62a 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/kythe/GenerateKotlinKzipTask.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/kythe/GenerateKotlinKzipTask.kt
@@ -19,10 +19,10 @@
import androidx.build.KotlinTarget
import androidx.build.OperatingSystem
import androidx.build.addToBuildOnServer
+import androidx.build.checkapi.CompilationInputs
import androidx.build.getCheckoutRoot
import androidx.build.getOperatingSystem
import androidx.build.getPrebuiltsRoot
-import androidx.build.java.JavaCompileInputs
import androidx.build.multiplatformExtension
import java.io.File
import java.util.jar.JarOutputStream
@@ -188,7 +188,7 @@
internal companion object {
fun setupProject(
project: Project,
- javaInputs: JavaCompileInputs,
+ compilationInputs: CompilationInputs,
compiledSources: Configuration,
kotlinTarget: Property<KotlinTarget>,
javaVersion: JavaVersion,
@@ -208,11 +208,11 @@
"build-tools/${osName()}/bin/kotlinc_extractor"
)
)
- sourcePaths.setFrom(javaInputs.sourcePaths)
- commonModuleSourcePaths.from(javaInputs.commonModuleSourcePaths)
+ sourcePaths.setFrom(compilationInputs.sourcePaths)
+ commonModuleSourcePaths.from(compilationInputs.commonModuleSourcePaths)
vnamesJson.set(project.getVnamesJson())
dependencyClasspath.setFrom(
- javaInputs.dependencyClasspath + javaInputs.bootClasspath
+ compilationInputs.dependencyClasspath + compilationInputs.bootClasspath
)
this.compiledSources.setFrom(compiledSources)
this.kotlinTarget.set(kotlinTarget)
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/kythe/KzipTasks.kt b/buildSrc/private/src/main/kotlin/androidx/build/kythe/KzipTasks.kt
index 481acc4..56d327b 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/kythe/KzipTasks.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/kythe/KzipTasks.kt
@@ -19,7 +19,7 @@
import androidx.build.AndroidXExtension
import androidx.build.ProjectLayoutType
import androidx.build.checkapi.ApiTaskConfig
-import androidx.build.checkapi.configureJavaInputsAndManifest
+import androidx.build.checkapi.configureCompilationInputsAndManifest
import androidx.build.checkapi.createReleaseApiConfiguration
import androidx.build.getDefaultTargetJavaVersion
import androidx.build.getSupportRootFolder
@@ -58,18 +58,19 @@
// afterEvaluate required to read extension properties
afterEvaluate {
- val (javaInputs, _) = configureJavaInputsAndManifest(config) ?: return@afterEvaluate
+ val (compilationInputs, _) =
+ configureCompilationInputsAndManifest(config) ?: return@afterEvaluate
val compiledSources = createReleaseApiConfiguration()
GenerateKotlinKzipTask.setupProject(
project,
- javaInputs,
+ compilationInputs,
compiledSources,
extension.kotlinTarget,
getDefaultTargetJavaVersion(extension.type, project.name)
)
- GenerateJavaKzipTask.setupProject(project, javaInputs, compiledSources)
+ GenerateJavaKzipTask.setupProject(project, compilationInputs, compiledSources)
}
}
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt b/buildSrc/private/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt
index 806aa75..1de0f1e 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt
@@ -19,7 +19,7 @@
import androidx.build.Version
import androidx.build.checkapi.ApiBaselinesLocation
import androidx.build.checkapi.ApiLocation
-import androidx.build.java.JavaCompileInputs
+import androidx.build.checkapi.CompilationInputs
import java.io.File
import javax.inject.Inject
import org.gradle.api.file.Directory
@@ -95,7 +95,7 @@
}
val inputs =
- JavaCompileInputs(
+ CompilationInputs(
sourcePaths = sourcePaths,
commonModuleSourcePaths = commonModuleSourcePaths,
dependencyClasspath = dependencyClasspath,
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt b/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt
index 82770b8..7824b2b 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt
@@ -18,8 +18,8 @@
import androidx.build.Version
import androidx.build.checkapi.ApiLocation
+import androidx.build.checkapi.CompilationInputs
import androidx.build.getLibraryByName
-import androidx.build.java.JavaCompileInputs
import androidx.build.logging.TERMINAL_RED
import androidx.build.logging.TERMINAL_RESET
import java.io.ByteArrayOutputStream
@@ -242,7 +242,7 @@
*/
fun generateApi(
metalavaClasspath: FileCollection,
- files: JavaCompileInputs,
+ files: CompilationInputs,
apiLocation: ApiLocation,
apiLintMode: ApiLintMode,
includeRestrictToLibraryGroupApis: Boolean,
@@ -284,7 +284,7 @@
*/
private fun generateApi(
metalavaClasspath: FileCollection,
- files: JavaCompileInputs,
+ files: CompilationInputs,
outputLocation: ApiLocation,
generateApiMode: GenerateApiMode,
apiLintMode: ApiLintMode,
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaTasks.kt b/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaTasks.kt
index f385c0f..f981816 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaTasks.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/metalava/MetalavaTasks.kt
@@ -22,8 +22,8 @@
import androidx.build.addToCheckTask
import androidx.build.checkapi.ApiBaselinesLocation
import androidx.build.checkapi.ApiLocation
+import androidx.build.checkapi.CompilationInputs
import androidx.build.checkapi.getRequiredCompatibilityApiLocation
-import androidx.build.java.JavaCompileInputs
import androidx.build.uptodatedness.cacheEvenIfNoOutputs
import androidx.build.version
import org.gradle.api.Project
@@ -37,7 +37,7 @@
fun setupProject(
project: Project,
- javaCompileInputs: JavaCompileInputs,
+ compilationInputs: CompilationInputs,
generateApiDependencies: Configuration,
extension: AndroidXExtension,
androidManifest: Provider<RegularFile>?,
@@ -71,7 +71,7 @@
task.currentVersion.set(version)
androidManifest?.let { task.manifestPath.set(it) }
- applyInputs(javaCompileInputs, task, generateApiDependencies)
+ applyInputs(compilationInputs, task, generateApiDependencies)
// If we will be updating the api lint baselines, then we should do that before
// using it to validate the generated api
task.mustRunAfter("updateApiLintBaseline")
@@ -92,8 +92,8 @@
task.baselines.set(baselinesApiLocation)
task.api.set(builtApiLocation)
task.version.set(version)
- task.dependencyClasspath = javaCompileInputs.dependencyClasspath
- task.bootClasspath = javaCompileInputs.bootClasspath
+ task.dependencyClasspath = compilationInputs.dependencyClasspath
+ task.bootClasspath = compilationInputs.bootClasspath
task.k2UastEnabled.set(extension.metalavaK2UastEnabled)
task.kotlinSourceLevel.set(kotlinSourceLevel)
task.cacheEvenIfNoOutputs()
@@ -108,8 +108,8 @@
task.baselines.set(checkApiRelease!!.flatMap { it.baselines })
task.api.set(builtApiLocation)
task.version.set(version)
- task.dependencyClasspath = javaCompileInputs.dependencyClasspath
- task.bootClasspath = javaCompileInputs.bootClasspath
+ task.dependencyClasspath = compilationInputs.dependencyClasspath
+ task.bootClasspath = compilationInputs.bootClasspath
task.k2UastEnabled.set(extension.metalavaK2UastEnabled)
task.kotlinSourceLevel.set(kotlinSourceLevel)
task.dependsOn(generateApi)
@@ -127,7 +127,7 @@
task.k2UastEnabled.set(extension.metalavaK2UastEnabled)
task.kotlinSourceLevel.set(kotlinSourceLevel)
androidManifest?.let { task.manifestPath.set(it) }
- applyInputs(javaCompileInputs, task, generateApiDependencies)
+ applyInputs(compilationInputs, task, generateApiDependencies)
}
// Policy: All changes to API surfaces for which compatibility is enforced must be
@@ -208,7 +208,7 @@
}
private fun applyInputs(
- inputs: JavaCompileInputs,
+ inputs: CompilationInputs,
task: MetalavaTask,
generateApiDependencies: Configuration
) {
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/metalava/RegenerateOldApisTask.kt b/buildSrc/private/src/main/kotlin/androidx/build/metalava/RegenerateOldApisTask.kt
index 70390ec..a21903f 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/metalava/RegenerateOldApisTask.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/metalava/RegenerateOldApisTask.kt
@@ -18,13 +18,13 @@
import androidx.build.Version
import androidx.build.checkapi.ApiLocation
+import androidx.build.checkapi.CompilationInputs
import androidx.build.checkapi.getApiFileVersion
import androidx.build.checkapi.getRequiredCompatibilityApiLocation
import androidx.build.checkapi.getVersionedApiLocation
import androidx.build.checkapi.isValidArtifactVersion
import androidx.build.getAndroidJar
import androidx.build.getCheckoutRoot
-import androidx.build.java.JavaCompileInputs
import java.io.File
import javax.inject.Inject
import org.gradle.api.DefaultTask
@@ -159,7 +159,7 @@
outputApiLocation: ApiLocation,
) {
val mavenId = "$groupId:$artifactId:$version"
- val inputs: JavaCompileInputs?
+ val inputs: CompilationInputs?
try {
inputs = getFiles(runnerProject, mavenId)
} catch (e: TypedResolveException) {
@@ -185,11 +185,11 @@
}
}
- private fun getFiles(runnerProject: Project, mavenId: String): JavaCompileInputs {
+ private fun getFiles(runnerProject: Project, mavenId: String): CompilationInputs {
val jars = getJars(runnerProject, mavenId)
val sources = getSources(runnerProject, "$mavenId:sources")
- return JavaCompileInputs(
+ return CompilationInputs(
sourcePaths = sources,
// TODO(b/330721660) parse META-INF/kotlin-project-structure-metadata.json for
// common sources
