Reduce boilerplate for applying kotlin-gradle-plugin.

This commit is contained in:
Robert Hencke
2017-08-06 13:21:54 -04:00
committed by ilmat192
parent a0e15a7776
commit 72ca603d71
14 changed files with 31 additions and 70 deletions
+1 -7
View File
@@ -15,13 +15,7 @@
*/ */
buildscript { buildscript {
repositories { apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle"
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
apply plugin: 'kotlin' apply plugin: 'kotlin'
+1 -7
View File
@@ -15,13 +15,7 @@
*/ */
buildscript { buildscript {
repositories { apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle"
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
apply plugin: 'kotlin' apply plugin: 'kotlin'
+1 -7
View File
@@ -15,13 +15,7 @@
*/ */
buildscript { buildscript {
repositories { apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle"
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
apply plugin: 'kotlin' apply plugin: 'kotlin'
+2 -6
View File
@@ -16,12 +16,8 @@
buildscript { buildscript {
ext.kotlin_version = '1.0.3' ext.kotlin_version = '1.0.3'
repositories {
mavenCentral() apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle"
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.3"
}
} }
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'kotlin' apply plugin: 'kotlin'
+2 -2
View File
@@ -15,15 +15,15 @@
*/ */
buildscript { buildscript {
apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle"
repositories { repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.0" classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.0"
} }
} }
String protobufVersion = '2.6.1' String protobufVersion = '2.6.1'
+1 -7
View File
@@ -21,13 +21,7 @@ buildscript {
kotlin_version = gradleProperties."kotlin_version" kotlin_version = gradleProperties."kotlin_version"
} }
repositories { apply from: '../../gradle/kotlinGradlePlugin.gradle'
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
apply plugin: 'kotlin' apply plugin: 'kotlin'
+2 -2
View File
@@ -21,13 +21,13 @@ import org.jetbrains.kotlin.konan.properties.KonanProperties
import org.jetbrains.kotlin.konan.properties.* import org.jetbrains.kotlin.konan.properties.*
buildscript { buildscript {
apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle"
repositories { repositories {
mavenCentral()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
} }
} }
+11
View File
@@ -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"
}
+1 -7
View File
@@ -15,13 +15,7 @@
*/ */
buildscript { buildscript {
repositories { apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle"
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
apply plugin: 'kotlin' apply plugin: 'kotlin'
+4 -2
View File
@@ -1,6 +1,9 @@
buildscript { buildscript {
ext.kotlin_version = '+'
apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle"
repositories { repositories {
mavenCentral()
maven { maven {
url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies" url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies"
} }
@@ -8,7 +11,6 @@ buildscript {
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:+" classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:+"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:+"
} }
} }
+1 -7
View File
@@ -15,13 +15,7 @@
*/ */
buildscript { buildscript {
repositories { apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle"
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
apply plugin: 'kotlin' apply plugin: 'kotlin'
+1 -7
View File
@@ -22,13 +22,7 @@ import org.jetbrains.kotlin.TestFailedException
import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicInteger
buildscript { buildscript {
repositories { apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle"
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
// Copied from backend.native project. ===== // Copied from backend.native project. =====
@@ -4,13 +4,13 @@
*/ */
buildscript { buildscript {
apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle"
repositories { repositories {
mavenCentral()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
} }
} }
+1 -7
View File
@@ -15,13 +15,7 @@
*/ */
buildscript { buildscript {
repositories { apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle"
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
apply plugin: 'kotlin' apply plugin: 'kotlin'