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

Simplify Kotlin bootstrap application in the project

Browse Source 
Move all the code to apply Kotlin bootstrap into settings script plugin
which does following:
- configures based either on the repo root 'local.properties' or on the
root project gradle properties or on the repo root 'gradle.properties'
current type of bootstrap
- automatically adds Kotlin bootstrap repository with
exclusive content, so bootstrap dependencies will not be by mistake
downloaded from other repository
- automatically forces all Kotlin plugins applied in the build to use
bootstrap version

This script should be applied only in project settings.gradle and then
it does all the configuration by itself.
This commit is contained in:
Yahor Berdnikau
2022-10-24 16:42:51 +02:00
committed by Space Team
parent 97b68d111c
commit a14d0d148b
29 changed files with 392 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/tools/benchmarksAnalyzer/build.gradle
+3 -12
View File
@@ -21,22 +21,13 @@ buildscript {
apply from: "$rootBuildDirectory/gradle/loadRootProperties.gradle"
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
repositories {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
}
apply plugin: 'kotlin-multiplatform'
plugins {
id("org.jetbrains.kotlin.multiplatform")
}
repositories {
maven {
url project.bootstrapKotlinRepo
}
mavenCentral()
}
kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts
+3 -21
View File
@@ -11,44 +11,26 @@ buildscript {
extra[key] = value
}
val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() ?: false
extra["defaultSnapshotVersion"] = kotlinBuildProperties.defaultSnapshotVersion
kotlinBootstrapFrom(BootstrapOption.SpaceBootstrap(kotlinBuildProperties.kotlinBootstrapVersion!!, cacheRedirectorEnabled))
extra["bootstrapKotlinRepo"] = project.bootstrapKotlinRepo
extra["bootstrapKotlinVersion"] = project.bootstrapKotlinVersion
repositories {
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
mavenCentral()
project.bootstrapKotlinRepo?.let {
maven(url = it)
}
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
}
}
apply{
plugin("kotlin")
plugin("kotlin-sam-with-receiver")
}
plugins {
`kotlin-dsl`
//kotlin("multiplatform") version "${project.bootstrapKotlinVersion}"
id("org.jetbrains.kotlin.jvm")
id("org.jetbrains.kotlin.plugin.sam.with.receiver")
//kotlin("multiplatform")
}
val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
repositories {
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
mavenCentral()
gradlePluginPortal()
extra["bootstrapKotlinRepo"]?.let {
maven(url = it)
}
}
tasks.validatePlugins.configure {
kotlin-native/tools/benchmarksAnalyzer/buildSrc/settings.gradle.kts
+3
View File
@@ -1,4 +1,7 @@
pluginManagement {
apply(from = "../../../../repo/scripts/cache-redirector.settings.gradle.kts")
apply(from = "../../../../repo/scripts/kotlin-bootstrap.settings.gradle.kts")
repositories {
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
mavenCentral()
kotlin-native/tools/benchmarksAnalyzer/settings.gradle
View File
kotlin-native/tools/benchmarksAnalyzer/settings.gradle.kts
+10
View File
@@ -0,0 +1,10 @@
pluginManagement {
apply(from = "../../../repo/scripts/cache-redirector.settings.gradle.kts")
apply(from = "../../../repo/scripts/kotlin-bootstrap.settings.gradle.kts")
repositories {
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
mavenCentral()
gradlePluginPortal()
}
}
kotlin-native/tools/performance-server/build.gradle
+3 -15
View File
@@ -20,26 +20,14 @@ buildscript {
apply from: "$rootBuildDirectory/gradle/loadRootProperties.gradle"
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
repositories {
mavenCentral()
maven {
url project.bootstrapKotlinRepo
}
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
}
apply plugin: 'kotlin-multiplatform'
plugins {
id("org.jetbrains.kotlin.multiplatform")
}
repositories {
mavenCentral()
maven {
url project.bootstrapKotlinRepo
}
}
kotlin {
kotlin-native/tools/performance-server/buildSrc/build.gradle.kts
+3 -21
View File
@@ -11,43 +11,26 @@ buildscript {
extra[key] = value
}
val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() ?: false
extra["defaultSnapshotVersion"] = kotlinBuildProperties.defaultSnapshotVersion
kotlinBootstrapFrom(BootstrapOption.SpaceBootstrap(kotlinBuildProperties.kotlinBootstrapVersion!!, cacheRedirectorEnabled))
extra["bootstrapKotlinRepo"] = project.bootstrapKotlinRepo
extra["bootstrapKotlinVersion"] = project.bootstrapKotlinVersion
repositories {
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
project.bootstrapKotlinRepo?.let {
maven(url = it)
}
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
}
}
apply{
plugin("kotlin")
plugin("kotlin-sam-with-receiver")
}
plugins {
`kotlin-dsl`
//kotlin("multiplatform") version "${project.bootstrapKotlinVersion}"
id("org.jetbrains.kotlin.jvm")
id("org.jetbrains.kotlin.plugin.sam.with.receiver")
//kotlin("multiplatform")
}
val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
repositories {
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
gradlePluginPortal()
extra["bootstrapKotlinRepo"]?.let {
maven(url = it)
}
mavenCentral()
}
@@ -55,7 +38,6 @@ tasks.validatePlugins.configure {
enabled = false
}
sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) {
kotlin.filter.exclude("**/FileCheckTest.kt")
kotlin.filter.exclude("**/bitcode/**")
kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts
+3
View File
@@ -1,4 +1,7 @@
pluginManagement {
apply(from = "../../../../repo/scripts/cache-redirector.settings.gradle.kts")
apply(from = "../../../../repo/scripts/kotlin-bootstrap.settings.gradle.kts")
repositories {
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
mavenCentral()
kotlin-native/tools/performance-server/settings.gradle
+10
View File
@@ -0,0 +1,10 @@
pluginManagement {
apply from: '../../../repo/scripts/cache-redirector.settings.gradle.kts'
apply from: '../../../repo/scripts/kotlin-bootstrap.settings.gradle.kts'
repositories {
maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies" }
mavenCentral()
gradlePluginPortal()
}
}
kotlin-native/tools/performance-server/ui/build.gradle
+3 -14
View File
@@ -22,27 +22,16 @@ buildscript {
apply from: "$rootBuildDirectory/gradle/loadRootProperties.gradle"
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
}
repositories {
mavenCentral()
maven {
url project.bootstrapKotlinRepo
}
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
plugins {
id("org.jetbrains.kotlin.multiplatform")
}
repositories {
mavenCentral()
maven {
url project.bootstrapKotlinRepo
}
}
apply plugin: 'kotlin-multiplatform'
kotlin {
js(IR) {
kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts
+3 -21
View File
@@ -11,49 +11,31 @@ buildscript {
extra[key] = value
}
val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() ?: false
extra["defaultSnapshotVersion"] = kotlinBuildProperties.defaultSnapshotVersion
kotlinBootstrapFrom(BootstrapOption.SpaceBootstrap(kotlinBuildProperties.kotlinBootstrapVersion!!, cacheRedirectorEnabled))
extra["bootstrapKotlinRepo"] = project.bootstrapKotlinRepo
extra["bootstrapKotlinVersion"] = project.bootstrapKotlinVersion
repositories {
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
project.bootstrapKotlinRepo?.let {
maven(url = it)
}
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
}
}
apply{
plugin("kotlin")
plugin("kotlin-sam-with-receiver")
}
plugins {
`kotlin-dsl`
//kotlin("multiplatform") version "${project.bootstrapKotlinVersion}"
id("org.jetbrains.kotlin.jvm")
id("org.jetbrains.kotlin.plugin.sam.with.receiver")
//kotlin("multiplatform")
}
val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
repositories {
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
gradlePluginPortal()
extra["bootstrapKotlinRepo"]?.let {
maven(url = it)
}
}
tasks.validatePlugins.configure {
enabled = false
}
sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) {
kotlin.filter.exclude("**/FileCheckTest.kt")
kotlin.filter.exclude("**/bitcode/**")
kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts
+3
View File
@@ -1,4 +1,7 @@
pluginManagement {
apply(from = "../../../../../repo/scripts/cache-redirector.settings.gradle.kts")
apply(from = "../../../../../repo/scripts/kotlin-bootstrap.settings.gradle.kts")
repositories {
maven {
url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
kotlin-native/tools/performance-server/ui/settings.gradle
+10
View File
@@ -0,0 +1,10 @@
pluginManagement {
apply from: '../../../../repo/scripts/cache-redirector.settings.gradle.kts'
apply from: '../../../../repo/scripts/kotlin-bootstrap.settings.gradle.kts'
repositories {
maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies" }
mavenCentral()
gradlePluginPortal()
}
}