azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Build] Fix buildscripts deprecation warnings

Browse Source 
#KTI-1221 In Progress
This commit is contained in:
Alexander.Likhachev
2023-06-07 17:58:38 +02:00
committed by Space Team
parent 1588b07472
commit 01276bbe49
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts
+6 -4
View File
@@ -22,10 +22,12 @@ addBomCheckTask()
extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false" extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false"
// common plugin bundle configuration // common plugin bundle configuration
configure<PluginBundleExtension> { gradlePlugin {
website = "https://kotlinlang.org/" website.set("https://kotlinlang.org/")
vcsUrl = "https://github.com/jetbrains/kotlin" vcsUrl.set("https://github.com/jetbrains/kotlin")
tags = listOf("kotlin") plugins.configureEach {
tags.add("kotlin")
}
} }
publishing { publishing {
kotlin-native/backend.native/tests/build.gradle
+1 -1
View File
@@ -5816,7 +5816,7 @@ Task pluginTest(String name, String pluginName, Closure configureClosure) {
from { from {
sourceSets[pluginName].output sourceSets[pluginName].output
} }
baseName = pluginName archiveBaseName = pluginName
destinationDirectory = buildDir destinationDirectory = buildDir
} }
def taskName = "$name-with-$pluginName" def taskName = "$name-with-$pluginName"
libraries/commonConfiguration.gradle
+1 -1
View File
@@ -38,7 +38,7 @@ task preparePublication {
project.ext.isDeployStagingRepoGenerationRequired = project.ext.isSonatypeRelease && deployUrlFromParameters == null project.ext.isDeployStagingRepoGenerationRequired = project.ext.isSonatypeRelease && deployUrlFromParameters == null
ext.repoUrl = deployUrlFromParameters ?: "file://${rootProject.buildDir}/repo".toString() ext.repoUrl = (deployUrlFromParameters ?: "file://${rootProject.buildDir}/repo").toString()
logger.info("Deployment repository preliminary url: ${ext.repoUrl} ($repoProvider)") logger.info("Deployment repository preliminary url: ${ext.repoUrl} ($repoProvider)")
ext.username = properties["deployRepoUsername"] ?: properties["kotlin.${repoProvider}.user"] ext.username = properties["deployRepoUsername"] ?: properties["kotlin.${repoProvider}.user"]
plugins/pill/pill-importer/build.gradle.kts
+1 -1
View File
@@ -25,7 +25,7 @@ sourceSets {
} }
fun runPillTask(taskName: String) { fun runPillTask(taskName: String) {
val jarFile = configurations.archives.artifacts.single { it.type == "jar" }.file val jarFile = configurations.archives.get().artifacts.single { it.type == "jar" }.file
val cl = URLClassLoader(arrayOf(jarFile.toURI().toURL()), (object {}).javaClass.classLoader) val cl = URLClassLoader(arrayOf(jarFile.toURI().toURL()), (object {}).javaClass.classLoader)
val pillImporterClass = Class.forName("org.jetbrains.kotlin.pill.PillImporter", true, cl) val pillImporterClass = Class.forName("org.jetbrains.kotlin.pill.PillImporter", true, cl)