Bump Gradle version to 7.6
As well remove usages of forUseAtConfigurationTime - see also https://github.com/JetBrains/kotlin/pull/5003
This commit is contained in:
committed by
Space Team
parent
2f1147f224
commit
a199fa7624
@@ -145,6 +145,8 @@ dependencies {
|
||||
val slackApiVersion = "1.2.0"
|
||||
val metadataVersion = "0.0.1-dev-10"
|
||||
|
||||
// See https://github.com/gradle/gradle/issues/22510
|
||||
implementation("org.gradle.kotlin:gradle-kotlin-dsl-plugins:2.4.1")
|
||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
|
||||
implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
|
||||
|
||||
@@ -88,7 +88,7 @@ val Project.isConfigurationCacheDisabled
|
||||
get() = (gradle.startParameter as? org.gradle.api.internal.StartParameterInternal)?.configurationCache?.get() != true
|
||||
|
||||
val Project.isIdeaActive
|
||||
get() = providers.systemProperty("idea.active").forUseAtConfigurationTime().isPresent
|
||||
get() = providers.systemProperty("idea.active").isPresent
|
||||
|
||||
val Project.intellijCommunityDir: File
|
||||
get() = rootDir.resolve("intellij/community").takeIf { it.isDirectory } ?: rootDir.resolve("intellij")
|
||||
@@ -66,7 +66,7 @@ private fun tasksGraphString(taskGraph: TaskExecutionGraph, ident: String = "",
|
||||
val Project.checkYarnAndNPMSuppressed: Action<TaskExecutionGraph> get() {
|
||||
return Action<TaskExecutionGraph> {
|
||||
val disableNpmYarnCheck = providers.gradleProperty("kotlin.build.disable.npmyarn.suppress.check")
|
||||
.forUseAtConfigurationTime().orNull?.toBoolean() ?: false
|
||||
.orNull?.toBoolean() ?: false
|
||||
|
||||
if (disableNpmYarnCheck) return@Action
|
||||
|
||||
|
||||
@@ -130,8 +130,8 @@ fun MavenPublication.configureKotlinPomAttributes(project: Project, explicitDesc
|
||||
}
|
||||
|
||||
val Project.signLibraryPublication: Boolean
|
||||
get() = project.providers.gradleProperty("signingRequired").forUseAtConfigurationTime().orNull?.toBoolean()
|
||||
?: project.providers.gradleProperty("isSonatypeRelease").forUseAtConfigurationTime().orNull?.toBoolean()
|
||||
get() = project.providers.gradleProperty("signingRequired").orNull?.toBoolean()
|
||||
?: project.providers.gradleProperty("isSonatypeRelease").orNull?.toBoolean()
|
||||
?: false
|
||||
|
||||
fun Project.configureDefaultPublishing(
|
||||
|
||||
@@ -113,7 +113,7 @@ fun Project.projectTest(
|
||||
body: Test.() -> Unit = {}
|
||||
): TaskProvider<Test> {
|
||||
val shouldInstrument = project.providers.gradleProperty("kotlin.test.instrumentation.disable")
|
||||
.forUseAtConfigurationTime().orNull?.toBoolean() != true
|
||||
.orNull?.toBoolean() != true
|
||||
if (shouldInstrument) {
|
||||
evaluationDependsOn(":test-instrumenter")
|
||||
}
|
||||
@@ -248,7 +248,7 @@ fun Project.projectTest(
|
||||
if (parallel && jUnitMode != JUnitMode.JUnit5) {
|
||||
val forks = (totalMaxMemoryForTestsMb / memoryPerTestProcessMb).coerceAtMost(16)
|
||||
maxParallelForks =
|
||||
project.providers.gradleProperty("kotlin.test.maxParallelForks").forUseAtConfigurationTime().orNull?.toInt()
|
||||
project.providers.gradleProperty("kotlin.test.maxParallelForks").orNull?.toInt()
|
||||
?: forks.coerceIn(1, Runtime.getRuntime().availableProcessors())
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user