From 72ca603d715bcc68d174865e8e48d7742f915461 Mon Sep 17 00:00:00 2001 From: Robert Hencke Date: Sun, 6 Aug 2017 13:21:54 -0400 Subject: [PATCH] Reduce boilerplate for applying kotlin-gradle-plugin. --- Interop/Indexer/build.gradle | 8 +------- Interop/Runtime/build.gradle | 8 +------- Interop/StubGenerator/build.gradle | 8 +------- backend.native/bc.frontend/build.gradle | 8 ++------ backend.native/build.gradle | 4 ++-- buildSrc/shared/build.gradle | 8 +------- dependencies/build.gradle | 4 ++-- gradle/kotlinGradlePlugin.gradle | 11 +++++++++++ klib/build.gradle | 8 +------- performance/build.gradle | 6 ++++-- shared/build.gradle | 8 +------- tools/helpers/build.gradle | 8 +------- tools/kotlin-native-gradle-plugin/build.gradle | 4 ++-- utilities/build.gradle | 8 +------- 14 files changed, 31 insertions(+), 70 deletions(-) create mode 100644 gradle/kotlinGradlePlugin.gradle diff --git a/Interop/Indexer/build.gradle b/Interop/Indexer/build.gradle index dd7ea400997..a0217d8a497 100644 --- a/Interop/Indexer/build.gradle +++ b/Interop/Indexer/build.gradle @@ -15,13 +15,7 @@ */ buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } + apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle" } apply plugin: 'kotlin' diff --git a/Interop/Runtime/build.gradle b/Interop/Runtime/build.gradle index d21435bddb3..7ce6763ca9f 100644 --- a/Interop/Runtime/build.gradle +++ b/Interop/Runtime/build.gradle @@ -15,13 +15,7 @@ */ buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } + apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle" } apply plugin: 'kotlin' diff --git a/Interop/StubGenerator/build.gradle b/Interop/StubGenerator/build.gradle index a4b210c3ed6..8373b69c7d2 100644 --- a/Interop/StubGenerator/build.gradle +++ b/Interop/StubGenerator/build.gradle @@ -15,13 +15,7 @@ */ buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } + apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle" } apply plugin: 'kotlin' diff --git a/backend.native/bc.frontend/build.gradle b/backend.native/bc.frontend/build.gradle index 71769196787..c07a62ed0b9 100644 --- a/backend.native/bc.frontend/build.gradle +++ b/backend.native/bc.frontend/build.gradle @@ -16,12 +16,8 @@ buildscript { ext.kotlin_version = '1.0.3' - repositories { - mavenCentral() - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.3" - } + + apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle" } apply plugin: 'java' apply plugin: 'kotlin' \ No newline at end of file diff --git a/backend.native/build.gradle b/backend.native/build.gradle index d8250282425..a1cff7f9435 100644 --- a/backend.native/build.gradle +++ b/backend.native/build.gradle @@ -15,15 +15,15 @@ */ buildscript { + apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle" + repositories { mavenCentral() } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.0" } - } String protobufVersion = '2.6.1' diff --git a/buildSrc/shared/build.gradle b/buildSrc/shared/build.gradle index 2d510ed86df..d248644d0ba 100644 --- a/buildSrc/shared/build.gradle +++ b/buildSrc/shared/build.gradle @@ -21,13 +21,7 @@ buildscript { kotlin_version = gradleProperties."kotlin_version" } - repositories { - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } + apply from: '../../gradle/kotlinGradlePlugin.gradle' } apply plugin: 'kotlin' diff --git a/dependencies/build.gradle b/dependencies/build.gradle index f1f7b8918fc..c9be5d9815c 100644 --- a/dependencies/build.gradle +++ b/dependencies/build.gradle @@ -21,13 +21,13 @@ import org.jetbrains.kotlin.konan.properties.KonanProperties import org.jetbrains.kotlin.konan.properties.* buildscript { + apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle" + repositories { - mavenCentral() jcenter() } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' } } diff --git a/gradle/kotlinGradlePlugin.gradle b/gradle/kotlinGradlePlugin.gradle new file mode 100644 index 00000000000..e5590e3c633 --- /dev/null +++ b/gradle/kotlinGradlePlugin.gradle @@ -0,0 +1,11 @@ +if (!hasProperty('kotlin_version')) { + throw new GradleException('Please ensure the "kotlin_version" property is defined before applying this script.') +} + +project.buildscript.repositories { + mavenCentral() +} + +project.buildscript.dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" +} diff --git a/klib/build.gradle b/klib/build.gradle index 2957ccbe892..9476b1c3492 100644 --- a/klib/build.gradle +++ b/klib/build.gradle @@ -15,13 +15,7 @@ */ buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } + apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle" } apply plugin: 'kotlin' diff --git a/performance/build.gradle b/performance/build.gradle index 48f19562d6d..6fef33f6e48 100644 --- a/performance/build.gradle +++ b/performance/build.gradle @@ -1,6 +1,9 @@ buildscript { + ext.kotlin_version = '+' + + apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle" + repositories { - mavenCentral() maven { url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies" } @@ -8,7 +11,6 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:+" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:+" } } diff --git a/shared/build.gradle b/shared/build.gradle index 83688959f5a..8cde6c626d8 100644 --- a/shared/build.gradle +++ b/shared/build.gradle @@ -15,13 +15,7 @@ */ buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } + apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle" } apply plugin: 'kotlin' diff --git a/tools/helpers/build.gradle b/tools/helpers/build.gradle index fe06132d2c3..f0b4294b055 100644 --- a/tools/helpers/build.gradle +++ b/tools/helpers/build.gradle @@ -22,13 +22,7 @@ import org.jetbrains.kotlin.TestFailedException import java.util.concurrent.atomic.AtomicInteger buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } + apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle" } // Copied from backend.native project. ===== diff --git a/tools/kotlin-native-gradle-plugin/build.gradle b/tools/kotlin-native-gradle-plugin/build.gradle index 333a2b808fa..80019572fcd 100644 --- a/tools/kotlin-native-gradle-plugin/build.gradle +++ b/tools/kotlin-native-gradle-plugin/build.gradle @@ -4,13 +4,13 @@ */ buildscript { + apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle" + repositories { - mavenCentral() jcenter() } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' } } diff --git a/utilities/build.gradle b/utilities/build.gradle index 425e255f193..842903e1086 100644 --- a/utilities/build.gradle +++ b/utilities/build.gradle @@ -15,13 +15,7 @@ */ buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } + apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle" } apply plugin: 'kotlin'