Build: fix some warnings in buildSrc and build.gradle.kts
This commit is contained in:
committed by
Space Team
parent
89507c1b82
commit
c66bc36382
@@ -129,7 +129,7 @@ fun prepareDeps(
|
|||||||
) {
|
) {
|
||||||
val makeIntellijCore = buildIvyRepositoryTask(intellijCore, customDepsOrg, customDepsRepoDir)
|
val makeIntellijCore = buildIvyRepositoryTask(intellijCore, customDepsOrg, customDepsRepoDir)
|
||||||
|
|
||||||
val makeIntellijAnnotations = tasks.register("makeIntellijAnnotations${intellij.name.capitalize()}", Copy::class) {
|
val makeIntellijAnnotations = tasks.register("makeIntellijAnnotations${intellij.name.replaceFirstChar(Char::uppercase)}", Copy::class) {
|
||||||
dependsOn(makeIntellijCore)
|
dependsOn(makeIntellijCore)
|
||||||
|
|
||||||
val intellijCoreRepo = CleanableStore[repoDir.resolve("intellij-core").absolutePath][intellijVersion].use()
|
val intellijCoreRepo = CleanableStore[repoDir.resolve("intellij-core").absolutePath][intellijVersion].use()
|
||||||
@@ -160,7 +160,7 @@ fun prepareDeps(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val mergeSources = tasks.create("mergeSources${intellij.name.capitalize()}", Jar::class.java) {
|
val mergeSources = tasks.create("mergeSources${intellij.name.replaceFirstChar(Char::uppercase)}", Jar::class.java) {
|
||||||
dependsOn(sources)
|
dependsOn(sources)
|
||||||
isPreserveFileTimestamps = false
|
isPreserveFileTimestamps = false
|
||||||
isReproducibleFileOrder = true
|
isReproducibleFileOrder = true
|
||||||
@@ -236,7 +236,7 @@ fun buildIvyRepositoryTask(
|
|||||||
fun ResolvedArtifact.moduleDirectory(): File =
|
fun ResolvedArtifact.moduleDirectory(): File =
|
||||||
storeDirectory()[moduleVersion.id.version].use()
|
storeDirectory()[moduleVersion.id.version].use()
|
||||||
|
|
||||||
return tasks.register("buildIvyRepositoryFor${configuration.name.capitalize()}") {
|
return tasks.register("buildIvyRepositoryFor${configuration.name.replaceFirstChar(Char::uppercase)}") {
|
||||||
dependsOn(configuration)
|
dependsOn(configuration)
|
||||||
inputs.files(configuration)
|
inputs.files(configuration)
|
||||||
|
|
||||||
@@ -366,7 +366,7 @@ fun writeIvyXml(
|
|||||||
element("publications") {
|
element("publications") {
|
||||||
artifactDir.listFiles()
|
artifactDir.listFiles()
|
||||||
?.filter(::shouldIncludeIntellijJar)
|
?.filter(::shouldIncludeIntellijJar)
|
||||||
?.sortedBy { it.name.toLowerCase() }
|
?.sortedBy { it.name.lowercase() }
|
||||||
?.forEach { jarFile ->
|
?.forEach { jarFile ->
|
||||||
val relativeName = jarFile.toRelativeString(baseDir).removeSuffix(".jar")
|
val relativeName = jarFile.toRelativeString(baseDir).removeSuffix(".jar")
|
||||||
emptyElement("artifact") {
|
emptyElement("artifact") {
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import kotlin.io.path.createTempDirectory
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm")
|
kotlin("jvm")
|
||||||
id("jps-compatible")
|
id("jps-compatible")
|
||||||
@@ -26,7 +28,7 @@ val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateJa
|
|||||||
val generateKotlinUseSiteFromJavaOnesForJspecifyTests by generator("org.jetbrains.kotlin.generators.tests.GenerateKotlinUseSitesFromJavaOnesForJspecifyTestsKt")
|
val generateKotlinUseSiteFromJavaOnesForJspecifyTests by generator("org.jetbrains.kotlin.generators.tests.GenerateKotlinUseSitesFromJavaOnesForJspecifyTestsKt")
|
||||||
|
|
||||||
task<Exec>("downloadJspecifyTests") {
|
task<Exec>("downloadJspecifyTests") {
|
||||||
val tmpDirPath = createTempDir().absolutePath
|
val tmpDirPath = createTempDirectory().toAbsolutePath().toString()
|
||||||
doFirst {
|
doFirst {
|
||||||
executable("git")
|
executable("git")
|
||||||
args("clone", "https://github.com/jspecify/jspecify/", tmpDirPath)
|
args("clone", "https://github.com/jspecify/jspecify/", tmpDirPath)
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ val checkCacheability = findProperty("kotlin.build.cache.check.enabled") as Stri
|
|||||||
val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
|
val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
|
||||||
|
|
||||||
if (checkCacheability && buildCacheEnabled()) {
|
if (checkCacheability && buildCacheEnabled()) {
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
gradle.taskGraph.afterTask {
|
gradle.taskGraph.afterTask {
|
||||||
if (isCacheable()) {
|
if (isCacheable()) {
|
||||||
if (isTeamcityBuild)
|
if (isTeamcityBuild)
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import org.gradle.api.Task
|
import org.gradle.api.Task
|
||||||
import org.gradle.api.execution.TaskExecutionListener
|
|
||||||
import org.gradle.api.invocation.Gradle
|
import org.gradle.api.invocation.Gradle
|
||||||
import org.gradle.api.logging.Logger
|
import org.gradle.api.logging.Logger
|
||||||
import org.gradle.api.tasks.TaskState
|
import org.gradle.api.tasks.TaskState
|
||||||
@@ -19,7 +18,7 @@ private class BuildTimeReporter(
|
|||||||
private val javaCompileClass: Class<*>,
|
private val javaCompileClass: Class<*>,
|
||||||
private val jarClass: Class<*>,
|
private val jarClass: Class<*>,
|
||||||
private val proguardClass: Class<*>
|
private val proguardClass: Class<*>
|
||||||
) : TaskExecutionListener {
|
) : @Suppress("DEPRECATION") org.gradle.api.execution.TaskExecutionListener {
|
||||||
companion object {
|
companion object {
|
||||||
fun configure(gradle: Gradle) {
|
fun configure(gradle: Gradle) {
|
||||||
val rootProject = gradle.rootProject
|
val rootProject = gradle.rootProject
|
||||||
@@ -40,7 +39,9 @@ private class BuildTimeReporter(
|
|||||||
jarClass = findClass("org.gradle.jvm.tasks.Jar") ?: return,
|
jarClass = findClass("org.gradle.jvm.tasks.Jar") ?: return,
|
||||||
proguardClass = findClass("proguard.gradle.ProGuardTask") ?: return
|
proguardClass = findClass("proguard.gradle.ProGuardTask") ?: return
|
||||||
)
|
)
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
gradle.taskGraph.addTaskExecutionListener(reporter)
|
gradle.taskGraph.addTaskExecutionListener(reporter)
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
gradle.buildFinished {
|
gradle.buildFinished {
|
||||||
reporter.report(logger)
|
reporter.report(logger)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ val jsStdlibSources = "${projectDir}/../stdlib/js/src"
|
|||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
js(IR) {
|
js(IR) {
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
sourceSets {
|
sourceSets {
|
||||||
val main by getting {
|
val main by getting {
|
||||||
if (!kotlinBuildProperties.isInIdeaSync) {
|
if (!kotlinBuildProperties.isInIdeaSync) {
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ val nodeModules by configurations.registering {
|
|||||||
}
|
}
|
||||||
|
|
||||||
val compileTestDevelopmentExecutableKotlinJs = tasks.named<KotlinJsIrLink>("compileTestDevelopmentExecutableKotlinJs") {
|
val compileTestDevelopmentExecutableKotlinJs = tasks.named<KotlinJsIrLink>("compileTestDevelopmentExecutableKotlinJs") {
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
kotlinOptions.outputFile = buildDir.resolve("compileSync/js/test/testDevelopmentExecutable/kotlin/kotlin-kotlin-test-js-ir-it-test.js").normalize().absolutePath
|
kotlinOptions.outputFile = buildDir.resolve("compileSync/js/test/testDevelopmentExecutable/kotlin/kotlin-kotlin-test-js-ir-it-test.js").normalize().absolutePath
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -176,7 +176,7 @@ val proguard by task<CacheableProguardTask> {
|
|||||||
"jre/lib/rt.jar",
|
"jre/lib/rt.jar",
|
||||||
"../Classes/classes.jar",
|
"../Classes/classes.jar",
|
||||||
jdkHome = it.metadata.installationPath.asFile
|
jdkHome = it.metadata.installationPath.asFile
|
||||||
)
|
)!!
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -121,17 +121,17 @@ val proguard by task<CacheableProguardTask> {
|
|||||||
"jre/lib/rt.jar",
|
"jre/lib/rt.jar",
|
||||||
"../Classes/classes.jar",
|
"../Classes/classes.jar",
|
||||||
jdkHome = it.metadata.installationPath.asFile
|
jdkHome = it.metadata.installationPath.asFile
|
||||||
)
|
)!!
|
||||||
},
|
},
|
||||||
javaLauncher.map {
|
javaLauncher.map {
|
||||||
firstFromJavaHomeThatExists(
|
firstFromJavaHomeThatExists(
|
||||||
"jre/lib/jsse.jar",
|
"jre/lib/jsse.jar",
|
||||||
"../Classes/jsse.jar",
|
"../Classes/jsse.jar",
|
||||||
jdkHome = it.metadata.installationPath.asFile
|
jdkHome = it.metadata.installationPath.asFile
|
||||||
)
|
)!!
|
||||||
},
|
},
|
||||||
javaLauncher.map {
|
javaLauncher.map {
|
||||||
Jvm.forHome(it.metadata.installationPath.asFile).toolsJar
|
Jvm.forHome(it.metadata.installationPath.asFile).toolsJar!!
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -98,17 +98,17 @@ val proguard by task<CacheableProguardTask> {
|
|||||||
"jre/lib/rt.jar",
|
"jre/lib/rt.jar",
|
||||||
"../Classes/classes.jar",
|
"../Classes/classes.jar",
|
||||||
jdkHome = it.metadata.installationPath.asFile
|
jdkHome = it.metadata.installationPath.asFile
|
||||||
)
|
)!!
|
||||||
},
|
},
|
||||||
javaLauncher.map {
|
javaLauncher.map {
|
||||||
firstFromJavaHomeThatExists(
|
firstFromJavaHomeThatExists(
|
||||||
"jre/lib/jsse.jar",
|
"jre/lib/jsse.jar",
|
||||||
"../Classes/jsse.jar",
|
"../Classes/jsse.jar",
|
||||||
jdkHome = it.metadata.installationPath.asFile
|
jdkHome = it.metadata.installationPath.asFile
|
||||||
)
|
)!!
|
||||||
},
|
},
|
||||||
javaLauncher.map {
|
javaLauncher.map {
|
||||||
Jvm.forHome(it.metadata.installationPath.asFile).toolsJar
|
Jvm.forHome(it.metadata.installationPath.asFile).toolsJar!!
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ kotlin {
|
|||||||
binaries.executable()
|
binaries.executable()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
sourceSets {
|
sourceSets {
|
||||||
val commonMain by getting {
|
val commonMain by getting {
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -15,7 +16,7 @@ kotlin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
val jvmMain by getting {
|
val jvmMain by getting {
|
||||||
dependencies {1
|
dependencies {
|
||||||
implementation(kotlin("stdlib-jdk8"))
|
implementation(kotlin("stdlib-jdk8"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -324,17 +324,17 @@ val proguard by task<CacheableProguardTask> {
|
|||||||
"jre/lib/rt.jar",
|
"jre/lib/rt.jar",
|
||||||
"../Classes/classes.jar",
|
"../Classes/classes.jar",
|
||||||
jdkHome = it.metadata.installationPath.asFile
|
jdkHome = it.metadata.installationPath.asFile
|
||||||
)
|
)!!
|
||||||
},
|
},
|
||||||
javaLauncher.map {
|
javaLauncher.map {
|
||||||
firstFromJavaHomeThatExists(
|
firstFromJavaHomeThatExists(
|
||||||
"jre/lib/jsse.jar",
|
"jre/lib/jsse.jar",
|
||||||
"../Classes/jsse.jar",
|
"../Classes/jsse.jar",
|
||||||
jdkHome = it.metadata.installationPath.asFile
|
jdkHome = it.metadata.installationPath.asFile
|
||||||
)
|
)!!
|
||||||
},
|
},
|
||||||
javaLauncher.map {
|
javaLauncher.map {
|
||||||
Jvm.forHome(it.metadata.installationPath.asFile).toolsJar
|
Jvm.forHome(it.metadata.installationPath.asFile).toolsJar!!
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -63,17 +63,17 @@ idePluginDependency {
|
|||||||
"jre/lib/rt.jar",
|
"jre/lib/rt.jar",
|
||||||
"../Classes/classes.jar",
|
"../Classes/classes.jar",
|
||||||
jdkHome = it.metadata.installationPath.asFile
|
jdkHome = it.metadata.installationPath.asFile
|
||||||
)
|
)!!
|
||||||
},
|
},
|
||||||
javaLauncher.map {
|
javaLauncher.map {
|
||||||
firstFromJavaHomeThatExists(
|
firstFromJavaHomeThatExists(
|
||||||
"jre/lib/jsse.jar",
|
"jre/lib/jsse.jar",
|
||||||
"../Classes/jsse.jar",
|
"../Classes/jsse.jar",
|
||||||
jdkHome = it.metadata.installationPath.asFile
|
jdkHome = it.metadata.installationPath.asFile
|
||||||
)
|
)!!
|
||||||
},
|
},
|
||||||
javaLauncher.map {
|
javaLauncher.map {
|
||||||
org.gradle.internal.jvm.Jvm.forHome(it.metadata.installationPath.asFile).toolsJar
|
org.gradle.internal.jvm.Jvm.forHome(it.metadata.installationPath.asFile).toolsJar!!
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import org.gradle.util.GradleVersion
|
|||||||
// This script is also being used in the Gradle integration tests which runs older Gradle versions
|
// This script is also being used in the Gradle integration tests which runs older Gradle versions
|
||||||
fun <T : Any> Provider<T>.forUseAtConfigurationTimeCompat(): Provider<T> =
|
fun <T : Any> Provider<T>.forUseAtConfigurationTimeCompat(): Provider<T> =
|
||||||
if (GradleVersion.current() < GradleVersion.version("7.4")) {
|
if (GradleVersion.current() < GradleVersion.version("7.4")) {
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
forUseAtConfigurationTime()
|
forUseAtConfigurationTime()
|
||||||
} else {
|
} else {
|
||||||
this
|
this
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ fun getRootSettings(
|
|||||||
}
|
}
|
||||||
else -> {
|
else -> {
|
||||||
val gradleParent = gradle.parent ?: error("Could not get includedBuild parent build for ${settings.rootDir}!")
|
val gradleParent = gradle.parent ?: error("Could not get includedBuild parent build for ${settings.rootDir}!")
|
||||||
getRootSettings(gradle.parent!!.settings, gradle.parent!!)
|
getRootSettings(gradleParent.settings, gradleParent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -138,7 +138,7 @@ fun String?.propValueToBoolean(default: Boolean = false): Boolean {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun Provider<String>.mapToBoolean(): Provider<Boolean> = map { it?.propValueToBoolean() }
|
fun Provider<String>.mapToBoolean(): Provider<Boolean> = map { it.propValueToBoolean() }
|
||||||
|
|
||||||
fun RepositoryHandler.addBootstrapRepo(
|
fun RepositoryHandler.addBootstrapRepo(
|
||||||
bootstrapRepo: String,
|
bootstrapRepo: String,
|
||||||
|
|||||||
Reference in New Issue
Block a user