[performance] resolve issue with movement of kotlinx-metadata-klib and some bintray clean up
This commit is contained in:
@@ -26,7 +26,6 @@ buildscript {
|
|||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
jcenter()
|
jcenter()
|
||||||
maven { url "https://kotlin.bintray.com/kotlinx" }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
|||||||
@@ -47,11 +47,7 @@ val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?
|
|||||||
repositories {
|
repositories {
|
||||||
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
|
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
|
||||||
jcenter()
|
jcenter()
|
||||||
maven("https://jetbrains.bintray.com/intellij-third-party-dependencies/")
|
|
||||||
maven("https://kotlin.bintray.com/kotlin-dependencies")
|
|
||||||
maven("https://cache-redirector.jetbrains.com/dl.kotlin.bintray.com/kotlinx")
|
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
maven("https://kotlin.bintray.com/kotlin-dev")
|
|
||||||
extra["bootstrapKotlinRepo"]?.let {
|
extra["bootstrapKotlinRepo"]?.let {
|
||||||
maven(url = it)
|
maven(url = it)
|
||||||
}
|
}
|
||||||
@@ -85,6 +81,7 @@ dependencies {
|
|||||||
implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.25")
|
implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.25")
|
||||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
|
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
|
||||||
api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
|
api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
|
||||||
|
api("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}")
|
||||||
compileOnly(gradleApi())
|
compileOnly(gradleApi())
|
||||||
val kotlinVersion = project.bootstrapKotlinVersion
|
val kotlinVersion = project.bootstrapKotlinVersion
|
||||||
val ktorVersion = "1.2.1"
|
val ktorVersion = "1.2.1"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
kotlin.native.home=../../dist
|
kotlin.native.home=../dist
|
||||||
org.jetbrains.kotlin.native.jvmArgs=-Xmx6G
|
org.jetbrains.kotlin.native.jvmArgs=-Xmx6G
|
||||||
org.gradle.jvmargs=-Xmx2048m
|
org.gradle.jvmargs=-Xmx2048m
|
||||||
jvmWarmup = 1000
|
jvmWarmup = 1000
|
||||||
|
|||||||
@@ -49,10 +49,7 @@ val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?
|
|||||||
repositories {
|
repositories {
|
||||||
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
|
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
|
||||||
jcenter()
|
jcenter()
|
||||||
maven("https://jetbrains.bintray.com/intellij-third-party-dependencies/")
|
|
||||||
maven("https://cache-redirector.jetbrains.com/dl.kotlin.bintray.com/kotlinx")
|
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
maven("https://kotlin.bintray.com/kotlin-dev")
|
|
||||||
extra["bootstrapKotlinRepo"]?.let {
|
extra["bootstrapKotlinRepo"]?.let {
|
||||||
maven(url = it)
|
maven(url = it)
|
||||||
}
|
}
|
||||||
@@ -64,10 +61,8 @@ tasks.validatePlugins.configure {
|
|||||||
|
|
||||||
|
|
||||||
sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) {
|
sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) {
|
||||||
//kotlin.srcDir("tools/benchmarks/shared/src/main/kotlin")
|
|
||||||
kotlin.srcDir("../../../build-tools/src/main/kotlin")
|
kotlin.srcDir("../../../build-tools/src/main/kotlin")
|
||||||
kotlin.srcDir("../../../performance/buildSrc/src/main/kotlin")
|
kotlin.srcDir("../../../performance/buildSrc/src/main/kotlin")
|
||||||
//kotlin.srcDir("../../build-tools/src/main/kotlin")
|
|
||||||
kotlin.srcDir("../../../shared/src/library/kotlin")
|
kotlin.srcDir("../../../shared/src/library/kotlin")
|
||||||
kotlin.srcDir("../../../shared/src/main/kotlin")
|
kotlin.srcDir("../../../shared/src/main/kotlin")
|
||||||
kotlin.srcDir("../../benchmarks/shared/src/main/kotlin/report")
|
kotlin.srcDir("../../benchmarks/shared/src/main/kotlin/report")
|
||||||
@@ -85,6 +80,7 @@ dependencies {
|
|||||||
implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.25")
|
implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.25")
|
||||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
|
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
|
||||||
api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
|
api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
|
||||||
|
api("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}")
|
||||||
compileOnly(gradleApi())
|
compileOnly(gradleApi())
|
||||||
val kotlinVersion = project.bootstrapKotlinVersion
|
val kotlinVersion = project.bootstrapKotlinVersion
|
||||||
val ktorVersion = "1.2.1"
|
val ktorVersion = "1.2.1"
|
||||||
@@ -106,6 +102,5 @@ dependencies {
|
|||||||
// Located in <repo root>/shared and always provided by the composite build.
|
// Located in <repo root>/shared and always provided by the composite build.
|
||||||
//api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion")
|
//api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion")
|
||||||
implementation("com.github.jengelman.gradle.plugins:shadow:$shadowVersion")
|
implementation("com.github.jengelman.gradle.plugins:shadow:$shadowVersion")
|
||||||
|
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
|
implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user