[Build] Remove BasePluginConvention usages
The entire concept of conventions is deprecated in Gradle. The proposed alternative for `BasePluginConvention` is `BasePluginExtension` ^KTI-1473 In Progress
This commit is contained in:
committed by
Space Team
parent
0fbd2e960d
commit
0926ebac23
@@ -2,7 +2,9 @@ description = 'Kotlin Test'
|
|||||||
|
|
||||||
apply plugin: 'kotlin-platform-jvm'
|
apply plugin: 'kotlin-platform-jvm'
|
||||||
|
|
||||||
archivesBaseName = 'kotlin-test'
|
base {
|
||||||
|
archivesName = 'kotlin-test'
|
||||||
|
}
|
||||||
|
|
||||||
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
|
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
|
||||||
|
|
||||||
@@ -32,12 +34,14 @@ RepoArtifacts.sourcesJar(project)
|
|||||||
RepoArtifacts.javadocJar(project)
|
RepoArtifacts.javadocJar(project)
|
||||||
|
|
||||||
compileKotlin {
|
compileKotlin {
|
||||||
kotlinOptions.freeCompilerArgs = [
|
compilerOptions {
|
||||||
"-Xallow-kotlin-package",
|
freeCompilerArgs = [
|
||||||
"-opt-in=kotlin.contracts.ExperimentalContracts",
|
"-Xallow-kotlin-package",
|
||||||
"-opt-in=kotlin.RequiresOptIn",
|
"-opt-in=kotlin.contracts.ExperimentalContracts",
|
||||||
]
|
"-opt-in=kotlin.RequiresOptIn",
|
||||||
kotlinOptions.moduleName = project.archivesBaseName
|
]
|
||||||
|
moduleName = base.archivesName
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
compileTestKotlin {
|
compileTestKotlin {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import org.gradle.kotlin.dsl.support.serviceOf
|
|||||||
|
|
||||||
description = "Shaded Maven dependencies resolver"
|
description = "Shaded Maven dependencies resolver"
|
||||||
|
|
||||||
val jarBaseName = property("archivesBaseName") as String
|
val jarBaseName = the<BasePluginExtension>().archivesName
|
||||||
|
|
||||||
val embedded by configurations
|
val embedded by configurations
|
||||||
|
|
||||||
@@ -123,7 +123,7 @@ val proguard by task<CacheableProguardTask> {
|
|||||||
|
|
||||||
injars(mapOf("filter" to "!META-INF/versions/**,!kotlinx/coroutines/debug/**"), normalizedJar.get().outputs.files)
|
injars(mapOf("filter" to "!META-INF/versions/**,!kotlinx/coroutines/debug/**"), normalizedJar.get().outputs.files)
|
||||||
|
|
||||||
outjars(layout.buildDirectory.file("libs/$jarBaseName-$version-after-proguard.jar"))
|
outjars(layout.buildDirectory.file(jarBaseName.map { "libs/$it-$version-after-proguard.jar" }))
|
||||||
|
|
||||||
javaLauncher.set(project.getToolchainLauncherFor(JdkMajorVersion.JDK_1_8))
|
javaLauncher.set(project.getToolchainLauncherFor(JdkMajorVersion.JDK_1_8))
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ plugins {
|
|||||||
id("jps-compatible")
|
id("jps-compatible")
|
||||||
}
|
}
|
||||||
|
|
||||||
val jarBaseName = property("archivesBaseName") as String
|
val jarBaseName = the<BasePluginExtension>().archivesName
|
||||||
|
|
||||||
val localPackagesToRelocate =
|
val localPackagesToRelocate =
|
||||||
listOf(
|
listOf(
|
||||||
@@ -87,7 +87,7 @@ val proguard by task<CacheableProguardTask> {
|
|||||||
|
|
||||||
injars(mapOf("filter" to "!META-INF/versions/**,!kotlinx/coroutines/debug/**"), relocatedJar.get().outputs.files)
|
injars(mapOf("filter" to "!META-INF/versions/**,!kotlinx/coroutines/debug/**"), relocatedJar.get().outputs.files)
|
||||||
|
|
||||||
outjars(layout.buildDirectory.file("libs/$jarBaseName-$version-after-proguard.jar"))
|
outjars(layout.buildDirectory.file(jarBaseName.map { "libs/$it-$version-after-proguard.jar" }))
|
||||||
|
|
||||||
javaLauncher.set(project.getToolchainLauncherFor(JdkMajorVersion.JDK_1_8))
|
javaLauncher.set(project.getToolchainLauncherFor(JdkMajorVersion.JDK_1_8))
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user