Refactoring: cleanup build.gradle files in tests

This commit is contained in:
Alexey Tsvetkov
2016-06-01 23:29:47 +03:00
parent 11d971c4bf
commit b3ed04230d
51 changed files with 212 additions and 556 deletions
@@ -266,9 +266,8 @@ abstract class BaseGradleIT {
} }
add("-Pkotlin_version=" + KOTLIN_VERSION) add("-Pkotlin_version=" + KOTLIN_VERSION)
add("-PpathToKotlinPlugin=" + File("local-repo").absolutePath)
options.incremental?.let { add("-Pkotlin.incremental=$it") } options.incremental?.let { add("-Pkotlin.incremental=$it") }
options.androidGradlePluginVersion?.let { add("-PandroidToolsVersion=$it")} options.androidGradlePluginVersion?.let { add("-Pandroid_tools_version=$it")}
} }
private fun Project.createEnvironmentVariablesMap(options: BuildOptions): Map<String, String> = private fun Project.createEnvironmentVariablesMap(options: BuildOptions): Map<String, String> =
@@ -1,11 +1,9 @@
buildscript { buildscript {
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
@@ -23,11 +21,9 @@ sourceSets {
} }
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
compile 'org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version' compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }
@@ -1,13 +1,12 @@
buildscript { buildscript {
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin }
mavenLocal() mavenLocal()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.android.tools.build:gradle:$androidToolsVersion" classpath "com.android.tools.build:gradle:$android_tools_version"
classpath "com.jakewharton.sdkmanager:gradle-plugin:0.12.+" classpath "com.jakewharton.sdkmanager:gradle-plugin:0.12.+"
} }
} }
@@ -35,7 +34,6 @@ android {
} }
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin }
mavenLocal() mavenLocal()
jcenter() jcenter()
} }
@@ -2,26 +2,20 @@
buildscript { buildscript {
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin }
mavenLocal() mavenLocal()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.android.tools.build:gradle:$androidToolsVersion" classpath "com.android.tools.build:gradle:$android_tools_version"
classpath "com.jakewharton.sdkmanager:gradle-plugin:0.12.+" classpath "com.jakewharton.sdkmanager:gradle-plugin:0.12.+"
} }
} }
allprojects { allprojects {
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin }
mavenLocal() mavenLocal()
jcenter() jcenter()
} }
} }
task clean(type: Delete) {
delete rootProject.buildDir
}
@@ -27,9 +27,9 @@ android {
lintOptions { lintOptions {
abortOnError false abortOnError false
} }
sourceSets { sourceSets {
main.java.srcDirs += 'src/main/kotlin' main.java.srcDirs += 'src/main/kotlin'
} }
} }
repositories { repositories {
@@ -1,16 +1,12 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
mavenLocal() mavenLocal()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$androidToolsVersion" classpath "com.android.tools.build:gradle:$android_tools_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.jakewharton.sdkmanager:gradle-plugin:0.12.+" classpath "com.jakewharton.sdkmanager:gradle-plugin:0.12.+"
} }
}
task wrapper(type: Wrapper) {
gradleVersion = '2.12'
} }
@@ -1,17 +1,12 @@
buildscript { buildscript {
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin jcenter()
}
maven {
url 'http://jcenter.bintray.com'
}
mavenCentral()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
classpath 'com.android.tools.build:gradle:' + androidToolsVersion classpath 'com.android.tools.build:gradle:' + android_tools_version
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+' classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
} }
} }
@@ -44,9 +39,7 @@ android {
} }
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
@@ -3,11 +3,11 @@ buildscript {
ext.dagger_version = '1.2.5' ext.dagger_version = '1.2.5'
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin } mavenLocal()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$androidToolsVersion" classpath "com.android.tools.build:gradle:$android_tools_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.jakewharton.sdkmanager:gradle-plugin:0.12.+" classpath "com.jakewharton.sdkmanager:gradle-plugin:0.12.+"
} }
@@ -15,7 +15,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin } mavenLocal()
jcenter() jcenter()
} }
} }
@@ -1,22 +1,18 @@
buildscript { buildscript {
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin } mavenLocal()
maven { jcenter()
url 'http://jcenter.bintray.com'
}
mavenCentral()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath ('com.android.tools.build:gradle:' + androidToolsVersion) classpath('com.android.tools.build:gradle:' + android_tools_version)
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+' classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
} }
} }
allprojects { allprojects {
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin } mavenLocal()
mavenCentral() mavenCentral()
} }
} }
@@ -1,25 +1,18 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven { }
url 'file://' + pathToKotlinPlugin dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
apply plugin: "kotlin" apply plugin: "kotlin"
apply plugin: 'java' apply plugin: 'java'
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin mavenCentral()
}
mavenCentral()
} }
sourceSets { sourceSets {
@@ -32,18 +25,10 @@ sourceSets {
dependencies { dependencies {
compile 'com.google.guava:guava:12.0' compile 'com.google.guava:guava:12.0'
testCompile 'org.testng:testng:6.8' testCompile 'org.testng:testng:6.8'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }
test { test {
useTestNG() useTestNG()
} }
task show << {
buildscript.configurations.classpath.each { println it }
}
task wrapper(type: Wrapper) {
gradleVersion="1.4"
}
@@ -1,39 +1,25 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven { }
url 'file://' + pathToKotlinPlugin dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
apply plugin: "kotlin" apply plugin: "kotlin"
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin mavenCentral()
}
mavenCentral()
} }
dependencies { dependencies {
compile 'com.google.guava:guava:12.0' compile 'com.google.guava:guava:12.0'
testCompile 'org.testng:testng:6.8' testCompile 'org.testng:testng:6.8'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }
test { test {
useTestNG() useTestNG()
} }
task show << {
buildscript.configurations.classpath.each { println it }
}
task wrapper(type: Wrapper) {
gradleVersion="1.4"
}
@@ -1,6 +1,6 @@
buildscript { buildscript {
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin } mavenLocal()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -11,7 +11,7 @@ apply plugin: "java"
apply plugin: "kotlin" apply plugin: "kotlin"
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin } mavenLocal()
} }
dependencies { dependencies {
@@ -20,8 +20,4 @@ dependencies {
compileJava { compileJava {
options.incremental = true options.incremental = true
}
compileJava.doLast {
} }
@@ -1,9 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal()
mavenCentral() mavenCentral()
maven {
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -21,9 +19,7 @@ sourceSets {
} }
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral() mavenCentral()
} }
@@ -34,7 +30,3 @@ dependencies {
compileKotlin { compileKotlin {
kotlinOptions.jdkHome = System.getenv("JDK_17") kotlinOptions.jdkHome = System.getenv("JDK_17")
} }
task wrapper(type: Wrapper) {
gradleVersion = "1.4"
}
@@ -1,13 +1,10 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven { }
url 'file://' + pathToKotlinPlugin dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
@@ -15,30 +12,24 @@ buildscript {
apply plugin: "kotlin" apply plugin: "kotlin"
sourceSets { sourceSets {
main { main {
kotlin { kotlin {
srcDir 'src' srcDir 'src'
} }
} }
} }
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin mavenCentral()
}
mavenCentral()
} }
dependencies { dependencies {
compile 'com.google.guava:guava:12.0' compile 'com.google.guava:guava:12.0'
testCompile 'org.testng:testng:6.8' testCompile 'org.testng:testng:6.8'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }
test { test {
useTestNG() useTestNG()
} }
task wrapper(type: Wrapper) {
gradleVersion="1.4"
}
@@ -1,9 +1,9 @@
buildscript { buildscript {
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin } mavenLocal()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_verion" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
@@ -11,12 +11,12 @@ apply plugin: "java"
apply plugin: "kotlin" apply plugin: "kotlin"
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin } mavenLocal()
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_verion" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }
@@ -1,6 +1,6 @@
buildscript { buildscript {
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin } mavenLocal()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -1,34 +1,25 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven { }
url 'file://' + pathToKotlinPlugin dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
apply plugin: "kotlin" apply plugin: "kotlin"
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin mavenCentral()
}
mavenCentral()
} }
dependencies { dependencies {
testCompile 'org.testng:testng:6.8' testCompile 'org.testng:testng:6.8'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }
test { test {
useTestNG() useTestNG()
} }
task wrapper(type: Wrapper) {
gradleVersion="1.4"
}
@@ -1,9 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal()
mavenCentral() mavenCentral()
maven {
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -21,9 +19,7 @@ sourceSets {
} }
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral() mavenCentral()
} }
@@ -33,8 +29,4 @@ dependencies {
compileKotlin { compileKotlin {
kotlinOptions.jvmTarget = "1.7" kotlinOptions.jvmTarget = "1.7"
} }
task wrapper(type: Wrapper) {
gradleVersion = "1.4"
}
@@ -2,9 +2,7 @@
buildscript { buildscript {
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
jcenter() jcenter()
} }
dependencies { dependencies {
@@ -16,9 +14,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral() mavenCentral()
} }
} }
@@ -2,9 +2,7 @@
buildscript { buildscript {
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
@@ -16,9 +14,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral() mavenCentral()
} }
} }
@@ -2,9 +2,7 @@
buildscript { buildscript {
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
@@ -16,9 +14,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral() mavenCentral()
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
} }
@@ -2,9 +2,7 @@ buildscript {
ext.realm_version = '1.1.1' ext.realm_version = '1.1.1'
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
jcenter() jcenter()
} }
dependencies { dependencies {
@@ -47,9 +45,7 @@ android {
} }
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
maven { maven {
url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' url 'http://oss.jfrog.org/artifactory/oss-snapshot-local'
} }
@@ -1,9 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal()
mavenCentral() mavenCentral()
maven {
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -15,9 +13,7 @@ apply plugin: "kotlin"
apply plugin: "kotlin-kapt" apply plugin: "kotlin-kapt"
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral() mavenCentral()
} }
@@ -25,8 +21,4 @@ dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
}
task show << {
buildscript.configurations.classpath.each { println it }
} }
@@ -1,9 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal()
mavenCentral() mavenCentral()
maven {
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -15,9 +13,7 @@ apply plugin: "kotlin"
apply plugin: "kotlin-kapt" apply plugin: "kotlin-kapt"
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral() mavenCentral()
} }
@@ -27,10 +23,6 @@ dependencies {
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
} }
task show << {
buildscript.configurations.classpath.each { println it }
}
kapt { kapt {
generateStubs = true generateStubs = true
} }
@@ -1,9 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal()
mavenCentral() mavenCentral()
maven {
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -15,9 +13,7 @@ apply plugin: "kotlin"
apply plugin: "kotlin-kapt" apply plugin: "kotlin-kapt"
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral() mavenCentral()
} }
@@ -26,8 +22,4 @@ dependencies {
compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
}
task show << {
buildscript.configurations.classpath.each { println it }
} }
@@ -1,9 +1,6 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven {
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -14,10 +11,7 @@ apply plugin: "java"
apply plugin: "kotlin" apply plugin: "kotlin"
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral()
} }
dependencies { dependencies {
@@ -26,14 +20,6 @@ dependencies {
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
} }
task show << {
buildscript.configurations.classpath.each { println it }
}
task wrapper(type: Wrapper) {
gradleVersion="1.12"
}
kapt { kapt {
generateStubs = true generateStubs = true
arguments { arguments {
@@ -1,6 +1,6 @@
buildscript { buildscript {
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin } mavenLocal()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -11,7 +11,7 @@ apply plugin: "java"
apply plugin: "kotlin" apply plugin: "kotlin"
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin } mavenLocal()
} }
dependencies { dependencies {
@@ -1,9 +1,6 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven {
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -14,10 +11,7 @@ apply plugin: "java"
apply plugin: "kotlin" apply plugin: "kotlin"
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral()
} }
dependencies { dependencies {
@@ -1,9 +1,6 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven {
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -14,22 +11,11 @@ apply plugin: "java"
apply plugin: "kotlin" apply plugin: "kotlin"
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral()
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
}
task show << {
buildscript.configurations.classpath.each { println it }
}
task wrapper(type: Wrapper) {
gradleVersion="1.12"
} }
@@ -1,9 +1,6 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven {
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -14,10 +11,7 @@ apply plugin: "java"
apply plugin: "kotlin" apply plugin: "kotlin"
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral()
} }
dependencies { dependencies {
@@ -26,14 +20,6 @@ dependencies {
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
} }
task show << {
buildscript.configurations.classpath.each { println it }
}
task wrapper(type: Wrapper) {
gradleVersion="1.12"
}
kapt { kapt {
generateStubs = true generateStubs = true
arguments { arguments {
@@ -1,9 +1,6 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven {
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -14,10 +11,7 @@ apply plugin: "java"
apply plugin: "kotlin" apply plugin: "kotlin"
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral()
} }
dependencies { dependencies {
@@ -25,12 +19,4 @@ dependencies {
compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
}
task show << {
buildscript.configurations.classpath.each { println it }
}
task wrapper(type: Wrapper) {
gradleVersion="1.12"
} }
@@ -1,9 +1,6 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven {
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -14,10 +11,7 @@ apply plugin: "java"
apply plugin: "kotlin" apply plugin: "kotlin"
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral()
} }
dependencies { dependencies {
@@ -27,14 +21,6 @@ dependencies {
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }
task show << {
buildscript.configurations.classpath.each { println it }
}
task wrapper(type: Wrapper) {
gradleVersion="1.12"
}
kapt { kapt {
generateStubs = true generateStubs = true
} }
@@ -1,9 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal()
mavenCentral() mavenCentral()
maven {
url "file://" + pathToKotlinPlugin
}
} }
dependencies { dependencies {
@@ -19,9 +17,7 @@ compileKotlin2Js.kotlinOptions.moduleKind = "amd"
compileKotlin2Js.kotlinOptions.outputFile = outDir + "app.js" compileKotlin2Js.kotlinOptions.outputFile = outDir + "app.js"
repositories { repositories {
maven { mavenLocal()
url "file://" + pathToKotlinPlugin
}
mavenCentral() mavenCentral()
} }
@@ -1,11 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven {
url "file://" + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
@@ -14,10 +10,7 @@ buildscript {
apply plugin: "kotlin2js" apply plugin: "kotlin2js"
repositories { repositories {
maven { mavenLocal()
url "file://" + pathToKotlinPlugin
}
mavenCentral()
} }
dependencies { dependencies {
@@ -1,11 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven {
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
@@ -14,17 +10,14 @@ buildscript {
apply plugin: 'kotlin2js' apply plugin: 'kotlin2js'
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral()
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
} }
task jarSources(type:Jar){ task jarSources(type: Jar) {
from sourceSets.main.allSource from sourceSets.main.allSource
classifier = 'source' classifier = 'source'
} }
@@ -1,11 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven {
url "file://" + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
@@ -14,15 +10,12 @@ buildscript {
apply plugin: "kotlin2js" apply plugin: "kotlin2js"
repositories { repositories {
maven { mavenLocal()
url "file://" + pathToKotlinPlugin
}
mavenCentral()
} }
dependencies { dependencies {
compile project(":libraryProject"), compile project(":libraryProject")
"org.jetbrains.kotlin:kotlin-js-library:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
} }
compileKotlin2Js.kotlinOptions.sourceMap = true compileKotlin2Js.kotlinOptions.sourceMap = true
@@ -1,33 +1,19 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven { }
url 'file://' + pathToKotlinPlugin dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-subplugin-example:$kotlin_version"
} }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-subplugin-example:$kotlin_version"
}
} }
apply plugin: "kotlin" apply plugin: "kotlin"
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral()
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
task show << {
buildscript.configurations.classpath.each { println it }
}
task wrapper(type: Wrapper) {
gradleVersion="1.4"
} }
@@ -1,23 +1,18 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven { }
url 'file://' + pathToKotlinPlugin dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
apply plugin: "kotlin" apply plugin: "kotlin"
apply plugin: 'java' apply plugin: 'java'
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin mavenCentral()
}
mavenCentral()
} }
sourceSets { sourceSets {
@@ -26,18 +21,10 @@ sourceSets {
dependencies { dependencies {
compile 'com.google.guava:guava:12.0' compile 'com.google.guava:guava:12.0'
testCompile 'org.testng:testng:6.8' testCompile 'org.testng:testng:6.8'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }
test { test {
useTestNG() useTestNG()
}
task show << {
buildscript.configurations.classpath.each { println it }
}
task wrapper(type: Wrapper) {
gradleVersion="1.6"
} }
@@ -1,44 +1,31 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven { }
url 'file://' + pathToKotlinPlugin dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
apply plugin: "kotlin" apply plugin: "kotlin"
apply plugin: "java" apply plugin: "java"
sourceSets { sourceSets {
deploy deploy
} }
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin mavenCentral()
}
mavenCentral()
} }
dependencies { dependencies {
compile 'com.google.guava:guava:12.0' compile 'com.google.guava:guava:12.0'
deployCompile 'com.google.guava:guava:12.0' deployCompile 'com.google.guava:guava:12.0'
testCompile 'org.testng:testng:6.8' testCompile 'org.testng:testng:6.8'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }
test { test {
useTestNG() useTestNG()
} }
task show << {
buildscript.configurations.classpath.each { println it }
}
task wrapper(type: Wrapper) {
gradleVersion="1.4"
}
@@ -1,43 +1,29 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven { }
url 'file://' + pathToKotlinPlugin dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
apply plugin: "kotlin" apply plugin: "kotlin"
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin mavenCentral()
}
mavenCentral()
} }
dependencies { dependencies {
compile 'com.google.guava:guava:12.0' compile 'com.google.guava:guava:12.0'
testCompile 'org.testng:testng:6.8' testCompile 'org.testng:testng:6.8'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }
test { test {
useTestNG() useTestNG()
} }
task show << {
buildscript.configurations.classpath.each { println it }
}
task wrapper(type: Wrapper) {
gradleVersion="1.4"
}
task exit << { task exit << {
System.exit(0) System.exit(0)
} }
@@ -1,9 +1,6 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven {
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -21,10 +18,7 @@ sourceSets {
} }
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral()
} }
dependencies { dependencies {
@@ -36,7 +30,3 @@ compileKotlin {
languageVersion = "1.0" languageVersion = "1.0"
} }
} }
task wrapper(type: Wrapper) {
gradleVersion = "1.4"
}
@@ -1,6 +1,6 @@
buildscript { buildscript {
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin } mavenLocal()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -1,15 +1,15 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven { }
url 'file://' + pathToKotlinPlugin dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
task wrapper(type: Wrapper) { allprojects {
gradleVersion="1.4" repositories {
mavenLocal()
mavenCentral()
}
} }
@@ -1,16 +1,9 @@
apply plugin: "kotlin" apply plugin: "kotlin"
repositories {
mavenCentral()
maven {
url 'file://' + pathToKotlinPlugin
}
}
dependencies { dependencies {
compile 'com.google.guava:guava:12.0' compile 'com.google.guava:guava:12.0'
testCompile 'org.testng:testng:6.8' testCompile 'org.testng:testng:6.8'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }
test { test {
@@ -1,11 +1,14 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven { }
url 'file://' + pathToKotlinPlugin dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
allprojects {
repositories {
mavenLocal()
} }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
@@ -1,9 +1 @@
apply plugin: "kotlin" apply plugin: "kotlin"
repositories {
mavenCentral()
maven {
url 'file://' + pathToKotlinPlugin
}
}
@@ -1,12 +1,5 @@
apply plugin: "kotlin" apply plugin: "kotlin"
repositories {
mavenCentral()
maven {
url 'file://' + pathToKotlinPlugin
}
}
dependencies { dependencies {
compile project(':projA') compile project(':projA')
} }
@@ -1,2 +1 @@
include 'projA' include 'projA', 'projB'
include 'projB'
@@ -1,46 +1,31 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenLocal()
maven { }
url 'file://' + pathToKotlinPlugin dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
} }
apply plugin: "kotlin" apply plugin: "kotlin"
apply plugin: 'java' apply plugin: 'java'
sourceSets { sourceSets {
deploy deploy
} }
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin mavenCentral()
}
mavenCentral()
} }
dependencies { dependencies {
compile 'com.google.guava:guava:12.0' compile 'com.google.guava:guava:12.0'
deployCompile 'com.google.guava:guava:12.0' deployCompile 'com.google.guava:guava:12.0'
testCompile 'org.testng:testng:6.8' testCompile 'org.testng:testng:6.8'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }
test { test {
useTestNG() useTestNG()
} }
task show << {
buildscript.configurations.classpath.each { println it }
}
task wrapper(type: Wrapper) {
gradleVersion="1.4"
}
@@ -1,9 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal()
mavenCentral() mavenCentral()
maven {
url 'file://' + pathToKotlinPlugin
}
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -23,17 +21,10 @@ sourceSets {
} }
repositories { repositories {
maven { mavenLocal()
url 'file://' + pathToKotlinPlugin
}
mavenCentral() mavenCentral()
} }
compileKotlin { compileKotlin {
kotlinOptions.suppressWarnings = true kotlinOptions.suppressWarnings = true
} }
task wrapper(type: Wrapper) {
gradleVersion="1.4"
}
@@ -1,18 +1,18 @@
buildscript { buildscript {
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin } mavenLocal()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
apply plugin: "kotlin" apply plugin: "kotlin"
repositories { repositories {
maven { url 'file://' + pathToKotlinPlugin } mavenLocal()
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }