From b3ed04230d70d648a54343d041b0311f8723f44d Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 1 Jun 2016 23:29:47 +0300 Subject: [PATCH] Refactoring: cleanup build.gradle files in tests --- .../jetbrains/kotlin/gradle/BaseGradleIT.kt | 3 +- .../incrementalGradleProject/build.gradle | 12 ++---- .../AndroidDaggerProject/app/build.gradle | 4 +- .../AndroidExtensionsProject/build.gradle | 10 +---- .../AndroidIcepickProject/app/build.gradle | 6 +-- .../AndroidIcepickProject/build.gradle | 24 +++++------- .../app/build.gradle | 15 ++------ .../build.gradle | 6 +-- .../testProject/AndroidProject/build.gradle | 12 ++---- .../additionalJavaSrc/build.gradle | 33 +++++------------ .../testProject/classpathTest/build.gradle | 34 +++++------------ .../convertBetweenJavaAndKotlin/build.gradle | 8 +--- .../testProject/customJdk/build.gradle | 12 +----- .../testProject/customSrcDir/build.gradle | 37 +++++++------------ .../build.gradle | 8 ++-- .../incrementalMultiproject/build.gradle | 2 +- .../testProject/internalTest/build.gradle | 29 +++++---------- .../testProject/jvmTarget/build.gradle | 14 ++----- .../kapt2/android-butterknife/build.gradle | 8 +--- .../kapt2/android-dagger/build.gradle | 8 +--- .../kapt2/android-dbflow/build.gradle | 8 +--- .../kapt2/android-realm/build.gradle | 8 +--- .../kapt2/generatedDirUpToDate/build.gradle | 12 +----- .../kapt2/inheritedAnnotations/build.gradle | 12 +----- .../testProject/kapt2/simple/build.gradle | 12 +----- .../testProject/kaptArguments/build.gradle | 18 +-------- .../kaptEnumConstructor/build.gradle | 4 +- .../build.gradle | 10 +---- .../kaptInheritedAnnotations/build.gradle | 18 +-------- .../kaptOutputKotlinCode/build.gradle | 18 +-------- .../testProject/kaptSimple/build.gradle | 18 +-------- .../testProject/kaptStubs/build.gradle | 18 +-------- .../kotlin2JsModuleKind/build.gradle | 8 +--- .../kotlin2JsNoOutputFileProject/build.gradle | 11 +----- .../libraryProject/build.gradle | 13 ++----- .../kotlin2JsProject/mainProject/build.gradle | 15 ++------ .../kotlinGradleSubplugin/build.gradle | 30 ++++----------- .../testProject/kotlinInJavaRoot/build.gradle | 31 +++++----------- .../kotlinJavaProject/build.gradle | 35 ++++++------------ .../testProject/kotlinProject/build.gradle | 32 +++++----------- .../testProject/languageVersion/build.gradle | 14 +------ .../moveClassToOtherModule/build.gradle | 2 +- .../multiprojectClassPathTest/build.gradle | 20 +++++----- .../subproject/build.gradle | 11 +----- .../multiprojectWithDependency/build.gradle | 19 ++++++---- .../projA/build.gradle | 10 +---- .../projB/build.gradle | 7 ---- .../settings.gradle | 3 +- .../testProject/simpleProject/build.gradle | 37 ++++++------------- .../testProject/suppressWarnings/build.gradle | 13 +------ .../testProject/typeAlias/build.gradle | 16 ++++---- 51 files changed, 212 insertions(+), 556 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index 344f07393ae..7433ecd1bb0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -266,9 +266,8 @@ abstract class BaseGradleIT { } add("-Pkotlin_version=" + KOTLIN_VERSION) - add("-PpathToKotlinPlugin=" + File("local-repo").absolutePath) 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 = diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/incrementalGradleProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/incrementalGradleProject/build.gradle index 53545c65de8..2eab2147b29 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/incrementalGradleProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/incrementalGradleProject/build.gradle @@ -1,11 +1,9 @@ buildscript { repositories { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() } 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 { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() } dependencies { - compile 'org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidDaggerProject/app/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidDaggerProject/app/build.gradle index ab991599b94..6a0ab1b96f2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidDaggerProject/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidDaggerProject/app/build.gradle @@ -1,13 +1,12 @@ buildscript { repositories { - maven { url 'file://' + pathToKotlinPlugin } mavenLocal() jcenter() } dependencies { 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.+" } } @@ -35,7 +34,6 @@ android { } repositories { - maven { url 'file://' + pathToKotlinPlugin } mavenLocal() jcenter() } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidExtensionsProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidExtensionsProject/build.gradle index 0c6de839ad1..ed8bf90283e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidExtensionsProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidExtensionsProject/build.gradle @@ -2,26 +2,20 @@ buildscript { repositories { - maven { url 'file://' + pathToKotlinPlugin } mavenLocal() jcenter() } dependencies { 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.+" } } allprojects { repositories { - maven { url 'file://' + pathToKotlinPlugin } mavenLocal() jcenter() } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidIcepickProject/app/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidIcepickProject/app/build.gradle index 07bf4d58484..f9c131a40e9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidIcepickProject/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidIcepickProject/app/build.gradle @@ -27,9 +27,9 @@ android { lintOptions { abortOnError false } - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } } repositories { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidIcepickProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidIcepickProject/build.gradle index 1ff560f7ff3..fd749977776 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidIcepickProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidIcepickProject/build.gradle @@ -1,16 +1,12 @@ buildscript { - repositories { - mavenCentral() - mavenLocal() - jcenter() - } - dependencies { - classpath "com.android.tools.build:gradle:$androidToolsVersion" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "com.jakewharton.sdkmanager:gradle-plugin:0.12.+" - } -} - -task wrapper(type: Wrapper) { - gradleVersion = '2.12' + repositories { + mavenCentral() + mavenLocal() + jcenter() + } + dependencies { + classpath "com.android.tools.build:gradle:$android_tools_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "com.jakewharton.sdkmanager:gradle-plugin:0.12.+" + } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/build.gradle index 5d765200aa7..727c1c1020c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/build.gradle @@ -1,17 +1,12 @@ buildscript { repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - maven { - url 'http://jcenter.bintray.com' - } - mavenCentral() + mavenLocal() + jcenter() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$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.+' } } @@ -44,9 +39,7 @@ android { } repositories { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() } dependencies { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/build.gradle index 3ba3a1a541b..323f65b128b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/build.gradle @@ -3,11 +3,11 @@ buildscript { ext.dagger_version = '1.2.5' repositories { - maven { url 'file://' + pathToKotlinPlugin } + mavenLocal() jcenter() } 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 "com.jakewharton.sdkmanager:gradle-plugin:0.12.+" } @@ -15,7 +15,7 @@ buildscript { allprojects { repositories { - maven { url 'file://' + pathToKotlinPlugin } + mavenLocal() jcenter() } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/build.gradle index c7a7ab3a7ec..2dc7759423f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/build.gradle @@ -1,22 +1,18 @@ buildscript { repositories { - maven { url 'file://' + pathToKotlinPlugin } - maven { - url 'http://jcenter.bintray.com' - } - mavenCentral() - + mavenLocal() + jcenter() } dependencies { 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.+' } } allprojects { repositories { - maven { url 'file://' + pathToKotlinPlugin } + mavenLocal() mavenCentral() } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/build.gradle index 34c9eb1df29..ab606503f03 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/build.gradle @@ -1,25 +1,18 @@ buildscript { - repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin + repositories { + mavenLocal() + } + 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: 'java' repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() + mavenCentral() } sourceSets { @@ -32,18 +25,10 @@ sourceSets { dependencies { compile 'com.google.guava:guava:12.0' - testCompile 'org.testng:testng:6.8' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + testCompile 'org.testng:testng:6.8' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { useTestNG() } - -task show << { - buildscript.configurations.classpath.each { println it } -} - -task wrapper(type: Wrapper) { - gradleVersion="1.4" -} diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/classpathTest/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/classpathTest/build.gradle index 4ad67ae2f0c..8fd807312d2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/classpathTest/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/classpathTest/build.gradle @@ -1,39 +1,25 @@ buildscript { - repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin + repositories { + mavenLocal() + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } } apply plugin: "kotlin" - repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() + mavenCentral() } dependencies { compile 'com.google.guava:guava:12.0' - testCompile 'org.testng:testng:6.8' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + testCompile 'org.testng:testng:6.8' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { useTestNG() -} - -task show << { - buildscript.configurations.classpath.each { println it } -} - -task wrapper(type: Wrapper) { - gradleVersion="1.4" -} +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/convertBetweenJavaAndKotlin/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/convertBetweenJavaAndKotlin/build.gradle index 00c8a20cf2a..747397c0d65 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/convertBetweenJavaAndKotlin/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/convertBetweenJavaAndKotlin/build.gradle @@ -1,6 +1,6 @@ buildscript { repositories { - maven { url 'file://' + pathToKotlinPlugin } + mavenLocal() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -11,7 +11,7 @@ apply plugin: "java" apply plugin: "kotlin" repositories { - maven { url 'file://' + pathToKotlinPlugin } + mavenLocal() } dependencies { @@ -20,8 +20,4 @@ dependencies { compileJava { options.incremental = true -} - -compileJava.doLast { - } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customJdk/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customJdk/build.gradle index bcb025780e6..8579a03e25a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customJdk/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customJdk/build.gradle @@ -1,9 +1,7 @@ buildscript { repositories { + mavenLocal() mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -21,9 +19,7 @@ sourceSets { } repositories { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() mavenCentral() } @@ -34,7 +30,3 @@ dependencies { compileKotlin { kotlinOptions.jdkHome = System.getenv("JDK_17") } - -task wrapper(type: Wrapper) { - gradleVersion = "1.4" -} diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/build.gradle index c67725f1a21..fae8239ed00 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/build.gradle @@ -1,13 +1,10 @@ buildscript { - repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin + repositories { + mavenLocal() + } + 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" sourceSets { - main { - kotlin { - srcDir 'src' - } - } + main { + kotlin { + srcDir 'src' + } + } } repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() + mavenCentral() } dependencies { compile 'com.google.guava:guava:12.0' - testCompile 'org.testng:testng:6.8' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + testCompile 'org.testng:testng:6.8' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { useTestNG() } - -task wrapper(type: Wrapper) { - gradleVersion="1.4" -} diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/destinationDirReferencedDuringEvaluation/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/destinationDirReferencedDuringEvaluation/build.gradle index 25f305f7f02..785b101ccf9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/destinationDirReferencedDuringEvaluation/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/destinationDirReferencedDuringEvaluation/build.gradle @@ -1,9 +1,9 @@ buildscript { repositories { - maven { url 'file://' + pathToKotlinPlugin } + mavenLocal() } 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" repositories { - maven { url 'file://' + pathToKotlinPlugin } + mavenLocal() mavenCentral() } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_verion" + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" testCompile 'junit:junit:4.12' } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/incrementalMultiproject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/incrementalMultiproject/build.gradle index 23cf5feece5..00afee79d0d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/incrementalMultiproject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/incrementalMultiproject/build.gradle @@ -1,6 +1,6 @@ buildscript { repositories { - maven { url 'file://' + pathToKotlinPlugin } + mavenLocal() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/internalTest/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/internalTest/build.gradle index 63a65119afb..b83472f5033 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/internalTest/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/internalTest/build.gradle @@ -1,34 +1,25 @@ buildscript { - repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin + repositories { + mavenLocal() + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } } apply plugin: "kotlin" repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() + mavenCentral() } dependencies { - testCompile 'org.testng:testng:6.8' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + testCompile 'org.testng:testng:6.8' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { useTestNG() -} - -task wrapper(type: Wrapper) { - gradleVersion="1.4" -} +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/jvmTarget/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/jvmTarget/build.gradle index cf5e120be25..0c84d98a803 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/jvmTarget/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/jvmTarget/build.gradle @@ -1,9 +1,7 @@ buildscript { repositories { + mavenLocal() mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -21,9 +19,7 @@ sourceSets { } repositories { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() mavenCentral() } @@ -33,8 +29,4 @@ dependencies { compileKotlin { kotlinOptions.jvmTarget = "1.7" -} - -task wrapper(type: Wrapper) { - gradleVersion = "1.4" -} +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-butterknife/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-butterknife/build.gradle index bfc739bcb87..f4ae733bdc7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-butterknife/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-butterknife/build.gradle @@ -2,9 +2,7 @@ buildscript { repositories { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() jcenter() } dependencies { @@ -16,9 +14,7 @@ buildscript { allprojects { repositories { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() mavenCentral() } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dagger/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dagger/build.gradle index dcef8747cec..c651d1bec31 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dagger/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dagger/build.gradle @@ -2,9 +2,7 @@ buildscript { repositories { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() mavenCentral() } dependencies { @@ -16,9 +14,7 @@ buildscript { allprojects { repositories { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() mavenCentral() } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dbflow/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dbflow/build.gradle index 199ee2ac2ee..2b2855dfd43 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dbflow/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dbflow/build.gradle @@ -2,9 +2,7 @@ buildscript { repositories { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() mavenCentral() } dependencies { @@ -16,9 +14,7 @@ buildscript { allprojects { repositories { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() mavenCentral() maven { url "https://jitpack.io" } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-realm/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-realm/build.gradle index 15ba613de37..b0ec56c4266 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-realm/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-realm/build.gradle @@ -2,9 +2,7 @@ buildscript { ext.realm_version = '1.1.1' repositories { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() jcenter() } dependencies { @@ -47,9 +45,7 @@ android { } repositories { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/generatedDirUpToDate/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/generatedDirUpToDate/build.gradle index 755751d9f4a..f276cd40603 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/generatedDirUpToDate/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/generatedDirUpToDate/build.gradle @@ -1,9 +1,7 @@ buildscript { repositories { + mavenLocal() mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -15,9 +13,7 @@ apply plugin: "kotlin" apply plugin: "kotlin-kapt" repositories { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() mavenCentral() } @@ -25,8 +21,4 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "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 } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/inheritedAnnotations/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/inheritedAnnotations/build.gradle index 7333af8ffda..5e5680583fb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/inheritedAnnotations/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/inheritedAnnotations/build.gradle @@ -1,9 +1,7 @@ buildscript { repositories { + mavenLocal() mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -15,9 +13,7 @@ apply plugin: "kotlin" apply plugin: "kotlin-kapt" repositories { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() mavenCentral() } @@ -27,10 +23,6 @@ dependencies { kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" } -task show << { - buildscript.configurations.classpath.each { println it } -} - kapt { generateStubs = true } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/simple/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/simple/build.gradle index 905ee67276c..74d0ce6b4ec 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/simple/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/simple/build.gradle @@ -1,9 +1,7 @@ buildscript { repositories { + mavenLocal() mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -15,9 +13,7 @@ apply plugin: "kotlin" apply plugin: "kotlin-kapt" repositories { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() mavenCentral() } @@ -26,8 +22,4 @@ dependencies { compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" testCompile 'junit:junit:4.12' -} - -task show << { - buildscript.configurations.classpath.each { println it } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptArguments/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptArguments/build.gradle index d596d2a89d0..7ae0d91d73c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptArguments/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptArguments/build.gradle @@ -1,9 +1,6 @@ buildscript { repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -14,10 +11,7 @@ apply plugin: "java" apply plugin: "kotlin" repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() } dependencies { @@ -26,14 +20,6 @@ dependencies { 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 { generateStubs = true arguments { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptEnumConstructor/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptEnumConstructor/build.gradle index 6539b3b2a42..6998a9ff244 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptEnumConstructor/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptEnumConstructor/build.gradle @@ -1,6 +1,6 @@ buildscript { repositories { - maven { url 'file://' + pathToKotlinPlugin } + mavenLocal() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -11,7 +11,7 @@ apply plugin: "java" apply plugin: "kotlin" repositories { - maven { url 'file://' + pathToKotlinPlugin } + mavenLocal() } dependencies { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptIncrementalCompilationProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptIncrementalCompilationProject/build.gradle index f14099af447..99369092cbc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptIncrementalCompilationProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptIncrementalCompilationProject/build.gradle @@ -1,9 +1,6 @@ buildscript { repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -14,10 +11,7 @@ apply plugin: "java" apply plugin: "kotlin" repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() } dependencies { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptInheritedAnnotations/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptInheritedAnnotations/build.gradle index 048afd44b33..6a256b5f3f6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptInheritedAnnotations/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptInheritedAnnotations/build.gradle @@ -1,9 +1,6 @@ buildscript { repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -14,22 +11,11 @@ apply plugin: "java" apply plugin: "kotlin" repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() } dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "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" } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptOutputKotlinCode/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptOutputKotlinCode/build.gradle index 3bb0f326444..b44aa9fc4b8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptOutputKotlinCode/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptOutputKotlinCode/build.gradle @@ -1,9 +1,6 @@ buildscript { repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -14,10 +11,7 @@ apply plugin: "java" apply plugin: "kotlin" repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() } dependencies { @@ -26,14 +20,6 @@ dependencies { 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 { generateStubs = true arguments { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptSimple/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptSimple/build.gradle index 9e0a30d762f..f218c4b3e19 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptSimple/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptSimple/build.gradle @@ -1,9 +1,6 @@ buildscript { repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -14,10 +11,7 @@ apply plugin: "java" apply plugin: "kotlin" repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() } dependencies { @@ -25,12 +19,4 @@ dependencies { compile "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" testCompile 'junit:junit:4.12' -} - -task show << { - buildscript.configurations.classpath.each { println it } -} - -task wrapper(type: Wrapper) { - gradleVersion="1.12" } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptStubs/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptStubs/build.gradle index 9dadb70615d..6a2ae62c732 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptStubs/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptStubs/build.gradle @@ -1,9 +1,6 @@ buildscript { repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -14,10 +11,7 @@ apply plugin: "java" apply plugin: "kotlin" repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() } dependencies { @@ -27,14 +21,6 @@ dependencies { testCompile 'junit:junit:4.12' } -task show << { - buildscript.configurations.classpath.each { println it } -} - -task wrapper(type: Wrapper) { - gradleVersion="1.12" -} - kapt { generateStubs = true } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsModuleKind/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsModuleKind/build.gradle index ac70d97b8ea..172a074e8b0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsModuleKind/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsModuleKind/build.gradle @@ -1,9 +1,7 @@ buildscript { repositories { + mavenLocal() mavenCentral() - maven { - url "file://" + pathToKotlinPlugin - } } dependencies { @@ -19,9 +17,7 @@ compileKotlin2Js.kotlinOptions.moduleKind = "amd" compileKotlin2Js.kotlinOptions.outputFile = outDir + "app.js" repositories { - maven { - url "file://" + pathToKotlinPlugin - } + mavenLocal() mavenCentral() } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle index 968bc96fe68..d748c781898 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle @@ -1,11 +1,7 @@ buildscript { repositories { - mavenCentral() - maven { - url "file://" + pathToKotlinPlugin - } + mavenLocal() } - dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } @@ -14,10 +10,7 @@ buildscript { apply plugin: "kotlin2js" repositories { - maven { - url "file://" + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() } dependencies { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle index b5dd3be9273..c9ea9d333de 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle @@ -1,11 +1,7 @@ buildscript { repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() } - dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } @@ -14,17 +10,14 @@ buildscript { apply plugin: 'kotlin2js' repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() } dependencies { compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version" } -task jarSources(type:Jar){ +task jarSources(type: Jar) { from sourceSets.main.allSource classifier = 'source' } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle index b696884de0f..81b1499d9b9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle @@ -1,11 +1,7 @@ buildscript { repositories { - mavenCentral() - maven { - url "file://" + pathToKotlinPlugin - } + mavenLocal() } - dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } @@ -14,15 +10,12 @@ buildscript { apply plugin: "kotlin2js" repositories { - maven { - url "file://" + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() } dependencies { - compile project(":libraryProject"), - "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version" + compile project(":libraryProject") + compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version" } compileKotlin2Js.kotlinOptions.sourceMap = true diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinGradleSubplugin/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinGradleSubplugin/build.gradle index da2f60f19c1..914418da03e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinGradleSubplugin/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinGradleSubplugin/build.gradle @@ -1,33 +1,19 @@ buildscript { - repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin + repositories { + mavenLocal() + } + 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" repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -} - -task show << { - buildscript.configurations.classpath.each { println it } -} - -task wrapper(type: Wrapper) { - gradleVersion="1.4" + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinInJavaRoot/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinInJavaRoot/build.gradle index 28e762f3dce..9e2e20cc9c5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinInJavaRoot/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinInJavaRoot/build.gradle @@ -1,23 +1,18 @@ buildscript { - repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin + repositories { + mavenLocal() + } + 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: 'java' repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() + mavenCentral() } sourceSets { @@ -26,18 +21,10 @@ sourceSets { dependencies { compile 'com.google.guava:guava:12.0' - testCompile 'org.testng:testng:6.8' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + testCompile 'org.testng:testng:6.8' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { useTestNG() -} - -task show << { - buildscript.configurations.classpath.each { println it } -} - -task wrapper(type: Wrapper) { - gradleVersion="1.6" } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/build.gradle index 319ed85ea5b..83f4d4a303a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/build.gradle @@ -1,44 +1,31 @@ buildscript { - repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin + repositories { + mavenLocal() + } + 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: "java" sourceSets { - deploy + deploy } repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() + mavenCentral() } dependencies { compile 'com.google.guava:guava:12.0' deployCompile 'com.google.guava:guava:12.0' - testCompile 'org.testng:testng:6.8' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + testCompile 'org.testng:testng:6.8' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { useTestNG() -} - -task show << { - buildscript.configurations.classpath.each { println it } -} - -task wrapper(type: Wrapper) { - gradleVersion="1.4" -} +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/build.gradle index 75bbeb77899..57f99eef42c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/build.gradle @@ -1,43 +1,29 @@ buildscript { - repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin + repositories { + mavenLocal() + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } } apply plugin: "kotlin" - repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() + mavenCentral() } dependencies { compile 'com.google.guava:guava:12.0' - testCompile 'org.testng:testng:6.8' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + testCompile 'org.testng:testng:6.8' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { useTestNG() } -task show << { - buildscript.configurations.classpath.each { println it } -} - -task wrapper(type: Wrapper) { - gradleVersion="1.4" -} - task exit << { System.exit(0) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/languageVersion/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/languageVersion/build.gradle index 12995184318..89815fbdbb7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/languageVersion/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/languageVersion/build.gradle @@ -1,9 +1,6 @@ buildscript { repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -21,10 +18,7 @@ sourceSets { } repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() } dependencies { @@ -36,7 +30,3 @@ compileKotlin { languageVersion = "1.0" } } - -task wrapper(type: Wrapper) { - gradleVersion = "1.4" -} diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/moveClassToOtherModule/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/moveClassToOtherModule/build.gradle index 261d39e8d3c..bb102efa132 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/moveClassToOtherModule/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/moveClassToOtherModule/build.gradle @@ -1,6 +1,6 @@ buildscript { repositories { - maven { url 'file://' + pathToKotlinPlugin } + mavenLocal() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectClassPathTest/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectClassPathTest/build.gradle index b04038dff29..064e5c637e9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectClassPathTest/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectClassPathTest/build.gradle @@ -1,15 +1,15 @@ buildscript { - repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin + repositories { + mavenLocal() + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } } -task wrapper(type: Wrapper) { - gradleVersion="1.4" +allprojects { + repositories { + mavenLocal() + mavenCentral() + } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectClassPathTest/subproject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectClassPathTest/subproject/build.gradle index 4bdb4ff1605..6bf3dc15e13 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectClassPathTest/subproject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectClassPathTest/subproject/build.gradle @@ -1,16 +1,9 @@ apply plugin: "kotlin" -repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } -} - dependencies { compile 'com.google.guava:guava:12.0' - testCompile 'org.testng:testng:6.8' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + testCompile 'org.testng:testng:6.8' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectWithDependency/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectWithDependency/build.gradle index 338a8ab25a0..386545bd445 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectWithDependency/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectWithDependency/build.gradle @@ -1,11 +1,14 @@ buildscript { - repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin + repositories { + mavenLocal() + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +allprojects { + repositories { + mavenLocal() } - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectWithDependency/projA/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectWithDependency/projA/build.gradle index 5ec3dc08aac..1145cf9be3e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectWithDependency/projA/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectWithDependency/projA/build.gradle @@ -1,9 +1 @@ -apply plugin: "kotlin" - -repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } -} - +apply plugin: "kotlin" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectWithDependency/projB/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectWithDependency/projB/build.gradle index fc7a8d5d75f..3ba7fa42f9c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectWithDependency/projB/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectWithDependency/projB/build.gradle @@ -1,12 +1,5 @@ apply plugin: "kotlin" -repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } -} - dependencies { compile project(':projA') } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectWithDependency/settings.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectWithDependency/settings.gradle index 7b2cd064ed6..e0685135bd5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectWithDependency/settings.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectWithDependency/settings.gradle @@ -1,2 +1 @@ -include 'projA' -include 'projB' +include 'projA', 'projB' diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/build.gradle index 78e1b443d5a..919d54a7d6d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/build.gradle @@ -1,46 +1,31 @@ buildscript { - repositories { - mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin + repositories { + mavenLocal() + } + 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: 'java' sourceSets { - deploy + deploy } repositories { - maven { - url 'file://' + pathToKotlinPlugin - } - mavenCentral() + mavenLocal() + mavenCentral() } dependencies { compile 'com.google.guava:guava:12.0' deployCompile 'com.google.guava:guava:12.0' - testCompile 'org.testng:testng:6.8' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + testCompile 'org.testng:testng:6.8' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { useTestNG() -} - -task show << { - buildscript.configurations.classpath.each { println it } -} - -task wrapper(type: Wrapper) { - gradleVersion="1.4" -} +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/suppressWarnings/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/suppressWarnings/build.gradle index 367e281f6a0..0084502bf3c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/suppressWarnings/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/suppressWarnings/build.gradle @@ -1,9 +1,7 @@ buildscript { repositories { + mavenLocal() mavenCentral() - maven { - url 'file://' + pathToKotlinPlugin - } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -23,17 +21,10 @@ sourceSets { } repositories { - maven { - url 'file://' + pathToKotlinPlugin - } + mavenLocal() mavenCentral() } compileKotlin { kotlinOptions.suppressWarnings = true } - - -task wrapper(type: Wrapper) { - gradleVersion="1.4" -} diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/typeAlias/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/typeAlias/build.gradle index b9fabb209a0..4a9504b7a97 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/typeAlias/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/typeAlias/build.gradle @@ -1,18 +1,18 @@ buildscript { - repositories { - maven { url 'file://' + pathToKotlinPlugin } - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } + repositories { + mavenLocal() + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } } apply plugin: "kotlin" repositories { - maven { url 'file://' + pathToKotlinPlugin } + mavenLocal() } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } \ No newline at end of file