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

[Native] Removed old gradle properties for kotlin repo and versions

Browse Source
This commit is contained in:
Elena Lepilkina
2021-04-01 18:14:34 +03:00
committed by Space
parent 19fb7ebfd5
commit 393aaac2b9
13 changed files with 19 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/build-tools/build.gradle.kts
-5
View File
@@ -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()
}
kotlin-native/build-tools/settings.gradle.kts
+1 -7
View File
@@ -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}")
}
}
}
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/CopySamples.kt
+4 -4
View File
@@ -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 {
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt
-6
View File
@@ -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
kotlin-native/gradle.properties
-8
View File
@@ -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.
kotlin-native/klib/build.gradle
+1 -1
View File
@@ -36,7 +36,7 @@ compileKotlin {
repositories {
maven {
url buildKotlinCompilerRepo
url project.bootstrapKotlinRepo
}
}
kotlin-native/runtime/generator/build.gradle
+6 -4
View File
@@ -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) {
kotlin-native/samples/gradle.properties
-3
View File
@@ -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
kotlin-native/shared/build.gradle.kts
+1 -7
View File
@@ -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")
kotlin-native/shared/settings.gradle.kts
+1 -2
View File
@@ -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()
}
kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle
+3 -9
View File
@@ -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"))
kotlin-native/tools/performance-server/build.gradle
+1 -7
View File
@@ -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 {
kotlin-native/tools/performance-server/ui/build.gradle
+1 -7
View File
@@ -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
}