From 3f02da45b8544016a6543c4f704a8e7031e4aeba Mon Sep 17 00:00:00 2001 From: Victor Turansky Date: Sat, 2 May 2020 04:48:12 +0300 Subject: [PATCH 1/2] `stub-convention` plugin --- buildSrc/build.gradle.kts | 13 +++++++++++++ buildSrc/src/main/kotlin/stub-convention.gradle.kts | 7 +++++++ js/js-stub/build.gradle.kts | 8 ++------ stdlib-stubs/build.gradle.kts | 8 ++------ 4 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 buildSrc/src/main/kotlin/stub-convention.gradle.kts diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 91b8bda92b..4dc25ea55f 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,3 +1,5 @@ +import java.util.* + plugins { `kotlin-dsl` } @@ -9,3 +11,14 @@ repositories { kotlinDslPluginOptions { experimentalWarning.set(false) } + +val props = Properties().apply { + file("../gradle.properties").inputStream().use { load(it) } +} + +fun version(target: String): String = + props.getProperty("${target}_version") + +dependencies { + implementation(kotlin("gradle-plugin", version("kotlin"))) +} diff --git a/buildSrc/src/main/kotlin/stub-convention.gradle.kts b/buildSrc/src/main/kotlin/stub-convention.gradle.kts new file mode 100644 index 0000000000..0dcaec55b5 --- /dev/null +++ b/buildSrc/src/main/kotlin/stub-convention.gradle.kts @@ -0,0 +1,7 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +tasks.named("compileKotlin") { + kotlinOptions { + freeCompilerArgs += "-Xallow-kotlin-package" + } +} diff --git a/js/js-stub/build.gradle.kts b/js/js-stub/build.gradle.kts index 6b9d65555a..19b11fcadb 100644 --- a/js/js-stub/build.gradle.kts +++ b/js/js-stub/build.gradle.kts @@ -2,10 +2,6 @@ * Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. */ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -tasks.named("compileKotlin") { - kotlinOptions { - freeCompilerArgs += "-Xallow-kotlin-package" - } +plugins { + `stub-convention` } diff --git a/stdlib-stubs/build.gradle.kts b/stdlib-stubs/build.gradle.kts index 6b9d65555a..19b11fcadb 100644 --- a/stdlib-stubs/build.gradle.kts +++ b/stdlib-stubs/build.gradle.kts @@ -2,10 +2,6 @@ * Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. */ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -tasks.named("compileKotlin") { - kotlinOptions { - freeCompilerArgs += "-Xallow-kotlin-package" - } +plugins { + `stub-convention` } From a5eaf2ab79fb53a1cab573f8121c5c5c1c4b12b5 Mon Sep 17 00:00:00 2001 From: Victor Turansky Date: Tue, 12 May 2020 19:04:08 +0300 Subject: [PATCH 2/2] Rename plugin. `stub-convention` -> `stdlib-stub-convention` --- ...-convention.gradle.kts => stdlib-stub-convention.gradle.kts} | 0 js/js-stub/build.gradle.kts | 2 +- stdlib-stubs/build.gradle.kts | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename buildSrc/src/main/kotlin/{stub-convention.gradle.kts => stdlib-stub-convention.gradle.kts} (100%) diff --git a/buildSrc/src/main/kotlin/stub-convention.gradle.kts b/buildSrc/src/main/kotlin/stdlib-stub-convention.gradle.kts similarity index 100% rename from buildSrc/src/main/kotlin/stub-convention.gradle.kts rename to buildSrc/src/main/kotlin/stdlib-stub-convention.gradle.kts diff --git a/js/js-stub/build.gradle.kts b/js/js-stub/build.gradle.kts index 19b11fcadb..2823eddedc 100644 --- a/js/js-stub/build.gradle.kts +++ b/js/js-stub/build.gradle.kts @@ -3,5 +3,5 @@ */ plugins { - `stub-convention` + `stdlib-stub-convention` } diff --git a/stdlib-stubs/build.gradle.kts b/stdlib-stubs/build.gradle.kts index 19b11fcadb..2823eddedc 100644 --- a/stdlib-stubs/build.gradle.kts +++ b/stdlib-stubs/build.gradle.kts @@ -3,5 +3,5 @@ */ plugins { - `stub-convention` + `stdlib-stub-convention` }