diff --git a/.idea/artifacts/kotlinx_cli_jvm_1_5_255_SNAPSHOT.xml b/.idea/artifacts/kotlinx_cli_jvm_1_5_255_SNAPSHOT.xml index 5598008f8e9..2dd8777a819 100644 --- a/.idea/artifacts/kotlinx_cli_jvm_1_5_255_SNAPSHOT.xml +++ b/.idea/artifacts/kotlinx_cli_jvm_1_5_255_SNAPSHOT.xml @@ -1,8 +1,6 @@ $PROJECT_DIR$/kotlin-native/endorsedLibraries/kotlinx.cli/build/libs - - - + \ No newline at end of file diff --git a/kotlin-native/tools/performance-server/build.gradle b/kotlin-native/tools/performance-server/build.gradle index b55e017e788..d2d8df16944 100644 --- a/kotlin-native/tools/performance-server/build.gradle +++ b/kotlin-native/tools/performance-server/build.gradle @@ -1,6 +1,23 @@ buildscript { ext.rootBuildDirectory = file('../..') + ext { + def properties = new java.util.Properties() + properties.load(new java.io.FileReader(project.file("$rootBuildDirectory/../gradle.properties"))) + properties.each { k, v-> + def key = k as String + def value = project.findProperty(key) ?: v + project.logger.info("${project.name} $key: $value") + set(key, value) + } + } + + ext["withoutEmbedabble"] = true + MiscKt.kotlinInit(project, findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() ?: false) + ext["bootstrapKotlinRepo"] = BootstrapKt.getBootstrapKotlinRepo(project) + ext["bootstrapKotlinVersion"] = BootstrapKt.getBootstrapKotlinVersion(project) + ext["kotlinVersion"] = project.bootstrapKotlinVersion + apply from: "$rootBuildDirectory/gradle/loadRootProperties.gradle" apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle" @@ -25,6 +42,9 @@ repositories { maven { url 'https://cache-redirector.jetbrains.com/jcenter' } + maven { + url project.bootstrapKotlinRepo + } jcenter() maven { url kotlinCompilerRepo diff --git a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts new file mode 100644 index 00000000000..cad2fb48e99 --- /dev/null +++ b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts @@ -0,0 +1,104 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +import java.util.Properties +import java.io.FileReader + +extra["versions.native-platform"] = "0.14" + +buildscript { + java.util.Properties().also { + it.load(java.io.FileReader(project.file("../../../../gradle.properties"))) + }.forEach { k, v-> + val key = k as String + val value = project.findProperty(key) ?: v + 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") + jcenter() + project.bootstrapKotlinRepo?.let { + maven(url = it) + } + } + + dependencies { + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.25") + 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}" +} + +val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true +repositories { + maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") + jcenter() + gradlePluginPortal() + extra["bootstrapKotlinRepo"]?.let { + maven(url = it) + } +} + +tasks.validatePlugins.configure { + enabled = false +} + + +sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) { + kotlin.srcDir("../../../build-tools/src/main/kotlin") + kotlin.srcDir("../../../performance/buildSrc/src/main/kotlin") + kotlin.srcDir("../../../shared/src/library/kotlin") + kotlin.srcDir("../../../shared/src/main/kotlin") + kotlin.srcDir("../../benchmarks/shared/src/main/kotlin/report") + kotlin.srcDir("../../../../native/utils/src") +} + +tasks.withType().configureEach { + kotlinOptions.freeCompilerArgs += + listOf("-Xopt-in=kotlin.RequiresOptIn", + "-Xskip-runtime-version-check", + "-Xopt-in=kotlin.ExperimentalStdlibApi") +} + +dependencies { + implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.25") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}") + api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}") + api("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}") + compileOnly(gradleApi()) + val kotlinVersion = project.bootstrapKotlinVersion + val ktorVersion = "1.2.1" + val slackApiVersion = "1.2.0" + val shadowVersion = "5.1.0" + val metadataVersion = "0.0.1-dev-10" + + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion") + implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion") + implementation("com.ullink.slack:simpleslackapi:$slackApiVersion") + + implementation("io.ktor:ktor-client-auth:$ktorVersion") + implementation("io.ktor:ktor-client-core:$ktorVersion") + implementation("io.ktor:ktor-client-cio:$ktorVersion") + + api("org.jetbrains.kotlin:kotlin-native-utils:$kotlinVersion") + + // Located in /shared and always provided by the composite build. + //api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion") + implementation("com.github.jengelman.gradle.plugins:shadow:$shadowVersion") + implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion") +} diff --git a/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts new file mode 100644 index 00000000000..03532ad3d90 --- /dev/null +++ b/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts @@ -0,0 +1,17 @@ +pluginManagement { + repositories { + maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") + jcenter() + mavenCentral() + gradlePluginPortal() + } +} + +buildscript { + repositories { + maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") + } + dependencies { + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.25") + } +} \ No newline at end of file diff --git a/kotlin-native/tools/performance-server/ui/build.gradle b/kotlin-native/tools/performance-server/ui/build.gradle index f70a4f96224..1066091ebf3 100644 --- a/kotlin-native/tools/performance-server/ui/build.gradle +++ b/kotlin-native/tools/performance-server/ui/build.gradle @@ -3,6 +3,23 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig buildscript { ext.rootBuildDirectory = file('../../..') + ext { + def properties = new java.util.Properties() + properties.load(new java.io.FileReader(project.file("$rootBuildDirectory/../gradle.properties"))) + properties.each { k, v-> + def key = k as String + def value = project.findProperty(key) ?: v + project.logger.info("${project.name} $key: $value") + set(key, value) + } + } + + ext["withoutEmbedabble"] = true + MiscKt.kotlinInit(project, findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() ?: false) + ext["bootstrapKotlinRepo"] = BootstrapKt.getBootstrapKotlinRepo(project) + ext["bootstrapKotlinVersion"] = BootstrapKt.getBootstrapKotlinVersion(project) + ext["kotlinVersion"] = project.bootstrapKotlinVersion + apply from: "$rootBuildDirectory/gradle/loadRootProperties.gradle" apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle" @@ -14,12 +31,6 @@ buildscript { maven { url kotlinCompilerRepo } - maven { - url "http://dl.bintray.com/kotlin/kotlin-eap" - } - maven { - url "http://dl.bintray.com/kotlin/kotlin-dev" - } } dependencies { @@ -39,10 +50,7 @@ repositories { url buildKotlinCompilerRepo } maven { - url "http://dl.bintray.com/kotlin/kotlin-eap" - } - maven { - url "http://dl.bintray.com/kotlin/kotlin-dev" + url project.bootstrapKotlinRepo } } diff --git a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts new file mode 100644 index 00000000000..e90bea95e68 --- /dev/null +++ b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts @@ -0,0 +1,104 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +import java.util.Properties +import java.io.FileReader + +extra["versions.native-platform"] = "0.14" + +buildscript { + java.util.Properties().also { + it.load(java.io.FileReader(project.file("../../../../../gradle.properties"))) + }.forEach { k, v-> + val key = k as String + val value = project.findProperty(key) ?: v + 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") + jcenter() + project.bootstrapKotlinRepo?.let { + maven(url = it) + } + } + + dependencies { + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.25") + 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}" +} + +val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true +repositories { + maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") + jcenter() + gradlePluginPortal() + extra["bootstrapKotlinRepo"]?.let { + maven(url = it) + } +} + +tasks.validatePlugins.configure { + enabled = false +} + + +sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) { + kotlin.srcDir("../../../../build-tools/src/main/kotlin") + kotlin.srcDir("../../../../performance/buildSrc/src/main/kotlin") + kotlin.srcDir("../../../../shared/src/library/kotlin") + kotlin.srcDir("../../../../shared/src/main/kotlin") + kotlin.srcDir("../../../benchmarks/shared/src/main/kotlin/report") + kotlin.srcDir("../../../../../native/utils/src") +} + +tasks.withType().configureEach { + kotlinOptions.freeCompilerArgs += + listOf("-Xopt-in=kotlin.RequiresOptIn", + "-Xskip-runtime-version-check", + "-Xopt-in=kotlin.ExperimentalStdlibApi") +} + +dependencies { + implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.25") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}") + api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}") + api("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}") + compileOnly(gradleApi()) + val kotlinVersion = project.bootstrapKotlinVersion + val ktorVersion = "1.2.1" + val slackApiVersion = "1.2.0" + val shadowVersion = "5.1.0" + val metadataVersion = "0.0.1-dev-10" + + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion") + implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion") + implementation("com.ullink.slack:simpleslackapi:$slackApiVersion") + + implementation("io.ktor:ktor-client-auth:$ktorVersion") + implementation("io.ktor:ktor-client-core:$ktorVersion") + implementation("io.ktor:ktor-client-cio:$ktorVersion") + + api("org.jetbrains.kotlin:kotlin-native-utils:$kotlinVersion") + + // Located in /shared and always provided by the composite build. + //api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion") + implementation("com.github.jengelman.gradle.plugins:shadow:$shadowVersion") + implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion") +} diff --git a/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts b/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts new file mode 100644 index 00000000000..03532ad3d90 --- /dev/null +++ b/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts @@ -0,0 +1,17 @@ +pluginManagement { + repositories { + maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") + jcenter() + mavenCentral() + gradlePluginPortal() + } +} + +buildscript { + repositories { + maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") + } + dependencies { + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.25") + } +} \ No newline at end of file