From 393aaac2b9a8c2d07632ad30e6220e0ea21e8391 Mon Sep 17 00:00:00 2001 From: Elena Lepilkina Date: Thu, 1 Apr 2021 18:14:34 +0300 Subject: [PATCH] [Native] Removed old gradle properties for kotlin repo and versions --- kotlin-native/build-tools/build.gradle.kts | 5 ----- kotlin-native/build-tools/settings.gradle.kts | 8 +------- .../main/kotlin/org/jetbrains/kotlin/CopySamples.kt | 8 ++++---- .../jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt | 6 ------ kotlin-native/gradle.properties | 8 -------- kotlin-native/klib/build.gradle | 2 +- kotlin-native/runtime/generator/build.gradle | 10 ++++++---- kotlin-native/samples/gradle.properties | 3 --- kotlin-native/shared/build.gradle.kts | 8 +------- kotlin-native/shared/settings.gradle.kts | 3 +-- .../tools/kotlin-native-gradle-plugin/build.gradle | 12 +++--------- kotlin-native/tools/performance-server/build.gradle | 8 +------- .../tools/performance-server/ui/build.gradle | 8 +------- 13 files changed, 19 insertions(+), 70 deletions(-) diff --git a/kotlin-native/build-tools/build.gradle.kts b/kotlin-native/build-tools/build.gradle.kts index 40125d243b1..d43e6eeba8c 100644 --- a/kotlin-native/build-tools/build.gradle.kts +++ b/kotlin-native/build-tools/build.gradle.kts @@ -26,9 +26,6 @@ val rootProperties = Properties().apply { } val kotlinVersion: String by rootProperties -val kotlinCompilerRepo: String by rootProperties -val buildKotlinVersion: String by rootProperties -val buildKotlinCompilerRepo: String by rootProperties val konanVersion: String by rootProperties val slackApiVersion: String by rootProperties val ktorVersion: String by rootProperties @@ -39,8 +36,6 @@ group = "org.jetbrains.kotlin" version = konanVersion repositories { - maven(kotlinCompilerRepo) - maven(buildKotlinCompilerRepo) maven("https://cache-redirector.jetbrains.com/maven-central") mavenCentral() } diff --git a/kotlin-native/build-tools/settings.gradle.kts b/kotlin-native/build-tools/settings.gradle.kts index 66d6e1eedca..0f14aff9f2f 100644 --- a/kotlin-native/build-tools/settings.gradle.kts +++ b/kotlin-native/build-tools/settings.gradle.kts @@ -3,13 +3,7 @@ pluginManagement { rootDir.resolve("../gradle.properties").reader().use(::load) } - val buildKotlinCompilerRepo: String by rootProperties - val kotlinCompilerRepo: String by rootProperties - val buildKotlinVersion by rootProperties - repositories { - maven(kotlinCompilerRepo) - maven(buildKotlinCompilerRepo) maven("https://cache-redirector.jetbrains.com/maven-central") mavenCentral() } @@ -17,7 +11,7 @@ pluginManagement { resolutionStrategy { eachPlugin { if (requested.id.id == "kotlin") { - useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:$buildKotlinVersion") + useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}") } } } diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/CopySamples.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/CopySamples.kt index 4507d46cac5..0391bcf4df8 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/CopySamples.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/CopySamples.kt @@ -35,10 +35,10 @@ open class CopySamples : Copy() { from(samplesDir) { include("**/gradle.properties") - val kotlinVersion = project.property("kotlinVersion") as? String - ?: throw IllegalArgumentException("Property kotlinVersion should be specified in the root project") - val kotlinCompilerRepo = project.property("kotlinCompilerRepo") as? String - ?: throw IllegalArgumentException("Property kotlinCompilerRepo should be specified in the root project") + val kotlinVersion = project.property("bootstrapKotlinVersion") as? String + ?: throw IllegalArgumentException("Property bootstrapKotlinVersion should be specified in the root project") + val kotlinCompilerRepo = project.property("bootstrapKotlinRepo") as? String + ?: throw IllegalArgumentException("Property bootstrapKotlinRepo should be specified in the root project") filter { line -> when { diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt index f70009a5f85..e5b4cb379d1 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt @@ -41,12 +41,6 @@ internal val Project.kotlinVersion: String internal val Project.konanVersion: String get() = property("konanVersion") as String -internal val Project.kotlinStdlibVersion: String - get() = property("kotlinStdlibVersion") as String - -internal val Project.kotlinStdlibRepo: String - get() = property("kotlinStdlibRepo") as String - internal val Project.nativeJson: String get() = project.property("nativeJson") as String diff --git a/kotlin-native/gradle.properties b/kotlin-native/gradle.properties index e3b14d9942b..93843a59a66 100644 --- a/kotlin-native/gradle.properties +++ b/kotlin-native/gradle.properties @@ -15,15 +15,7 @@ # # A version of the Kotlin compiler that is used to build Kotlin/Native. -buildKotlinVersion=1.5.20-dev-372 -buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.5.20-dev-372,branch:default:any,pinned:true/artifacts/content/maven remoteRoot=konan_tests -kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.5.20-dev-1166,branch:default:any,pinned:true/artifacts/content/maven -kotlinVersion=1.5.20-dev-1166 -kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.5.20-dev-1166,branch:default:any,pinned:true/artifacts/content/maven -kotlinStdlibVersion=1.5.20-dev-1166 -kotlinStdlibTestsVersion=1.5.20-dev-1166 -testKotlinCompilerVersion=1.5.20-dev-1166 konanVersion=1.5.20 # A version of Xcode required to build the Kotlin/Native compiler. diff --git a/kotlin-native/klib/build.gradle b/kotlin-native/klib/build.gradle index a3685afb85c..336a0cf4133 100644 --- a/kotlin-native/klib/build.gradle +++ b/kotlin-native/klib/build.gradle @@ -36,7 +36,7 @@ compileKotlin { repositories { maven { - url buildKotlinCompilerRepo + url project.bootstrapKotlinRepo } } diff --git a/kotlin-native/runtime/generator/build.gradle b/kotlin-native/runtime/generator/build.gradle index 877dfbde25f..34e81a89858 100644 --- a/kotlin-native/runtime/generator/build.gradle +++ b/kotlin-native/runtime/generator/build.gradle @@ -3,13 +3,15 @@ configurations { } repositories { - maven { url buildKotlinCompilerRepo } + maven { + url project.bootstrapKotlinRepo + } } dependencies { - generatorRuntime "org.jetbrains.kotlin:kotlin-stdlib:${kotlinStdlibVersion}" - generatorRuntime "org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}" - generatorRuntime "org.jetbrains.kotlin:kotlin-stdlib-gen:${kotlinStdlibVersion}" + generatorRuntime "org.jetbrains.kotlin:kotlin-stdlib:${project.bootstrapKotlinVersion}" + generatorRuntime "org.jetbrains.kotlin:kotlin-reflect:${project.bootstrapKotlinVersion}" + generatorRuntime "org.jetbrains.kotlin:kotlin-stdlib-gen:${project.bootstrapKotlinVersion}" } task run(type: JavaExec) { diff --git a/kotlin-native/samples/gradle.properties b/kotlin-native/samples/gradle.properties index ffbe4704e45..57636ad49ba 100644 --- a/kotlin-native/samples/gradle.properties +++ b/kotlin-native/samples/gradle.properties @@ -8,9 +8,6 @@ org.gradle.workers.max=4 # CHANGE_VERSION_WITH_RELEASE kotlin_version=1.4.30 -# Sets maven path for the kotlin version other than release -#kotlinCompilerRepo= - # Use custom Kotlin/Native home: kotlin.native.home=../../dist diff --git a/kotlin-native/shared/build.gradle.kts b/kotlin-native/shared/build.gradle.kts index 742198563b4..de15561cedf 100644 --- a/kotlin-native/shared/build.gradle.kts +++ b/kotlin-native/shared/build.gradle.kts @@ -26,11 +26,7 @@ plugins { val rootBuildDirectory by extra(file("..")) apply(from="../gradle/loadRootProperties.gradle") -val kotlinVersion: String by extra -val buildKotlinVersion: String by extra val konanVersion: String by extra -val kotlinCompilerRepo: String by extra -val buildKotlinCompilerRepo: String by extra group = "org.jetbrains.kotlin" version = konanVersion @@ -38,8 +34,6 @@ version = konanVersion repositories { maven("https://cache-redirector.jetbrains.com/maven-central") mavenCentral() - maven(kotlinCompilerRepo) - maven(buildKotlinCompilerRepo) } // FIXME(ddol): KLIB-REFACTORING-CLEANUP: drop generation of KonanVersion! @@ -71,7 +65,7 @@ tasks.jar { } dependencies { - kotlinCompilerClasspath("org.jetbrains.kotlin:kotlin-compiler-embeddable:$buildKotlinVersion") + kotlinCompilerClasspath("org.jetbrains.kotlin:kotlin-compiler-embeddable:${project.bootstrapKotlinVersion}") implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion") implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion") diff --git a/kotlin-native/shared/settings.gradle.kts b/kotlin-native/shared/settings.gradle.kts index 95a629a2045..2d0d0815c95 100644 --- a/kotlin-native/shared/settings.gradle.kts +++ b/kotlin-native/shared/settings.gradle.kts @@ -3,11 +3,10 @@ pluginManagement { rootDir.resolve("../gradle.properties").reader().use(::load) } - val kotlinCompilerRepo: String by rootProperties val kotlinVersion: String by rootProperties repositories { - maven(kotlinCompilerRepo) + maven(project.bootstrapKotlinRepo) maven("https://cache-redirector.jetbrains.com/maven-central") mavenCentral() } diff --git a/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle b/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle index 9dc3962f52d..475d4c25dd1 100644 --- a/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle +++ b/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle @@ -49,12 +49,6 @@ version = CompilerVersionGeneratedKt.getCurrentCompilerVersion() repositories { mavenCentral() - maven { - url buildKotlinCompilerRepo - } - maven { - url kotlinCompilerRepo - } } configurations { @@ -85,8 +79,8 @@ dependencies { bundleDependencies "org.jetbrains.kotlin:kotlin-util-klib:$kotlinVersion" testImplementation 'junit:junit:4.12' - testImplementation "org.jetbrains.kotlin:kotlin-test:$buildKotlinVersion" - testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$buildKotlinVersion" + testImplementation "org.jetbrains.kotlin:kotlin-test:${project.bootstrapKotlinVersion}" + testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${project.bootstrapKotlinVersion}" testImplementation "org.tools4j:tools4j-spockito:1.6" testImplementation('org.spockframework:spock-core:1.1-groovy-2.4') { exclude module: 'groovy-all' @@ -146,7 +140,7 @@ pluginUnderTestMetadata { test { dependsOn shadowJar systemProperty("kotlin.version", kotlinVersion) - systemProperty("kotlin.repo", kotlinCompilerRepo) + systemProperty("kotlin.repo", project.bootstrapKotlinRepo) if (project.hasProperty("konan.home")) { systemProperty("konan.home", project.property("konan.home")) systemProperty("org.jetbrains.kotlin.native.home", project.property("konan.home")) diff --git a/kotlin-native/tools/performance-server/build.gradle b/kotlin-native/tools/performance-server/build.gradle index d2d8df16944..3a40ae4c0c7 100644 --- a/kotlin-native/tools/performance-server/build.gradle +++ b/kotlin-native/tools/performance-server/build.gradle @@ -27,7 +27,7 @@ buildscript { } jcenter() maven { - url kotlinCompilerRepo + url project.bootstrapKotlinRepo } } @@ -46,12 +46,6 @@ repositories { url project.bootstrapKotlinRepo } jcenter() - maven { - url kotlinCompilerRepo - } - maven { - url buildKotlinCompilerRepo - } } kotlin { diff --git a/kotlin-native/tools/performance-server/ui/build.gradle b/kotlin-native/tools/performance-server/ui/build.gradle index 1066091ebf3..f6fbdc586a4 100644 --- a/kotlin-native/tools/performance-server/ui/build.gradle +++ b/kotlin-native/tools/performance-server/ui/build.gradle @@ -29,7 +29,7 @@ buildscript { } jcenter() maven { - url kotlinCompilerRepo + url project.bootstrapKotlinRepo } } @@ -43,12 +43,6 @@ repositories { url 'https://cache-redirector.jetbrains.com/jcenter' } jcenter() - maven { - url kotlinCompilerRepo - } - maven { - url buildKotlinCompilerRepo - } maven { url project.bootstrapKotlinRepo }