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 8437b224b02..344f07393ae 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 @@ -265,6 +265,7 @@ abstract class BaseGradleIT { add(if (options.withDaemon) "--daemon" else "--no-daemon") } + add("-Pkotlin_version=" + KOTLIN_VERSION) add("-PpathToKotlinPlugin=" + File("local-repo").absolutePath) options.incremental?.let { add("-Pkotlin.incremental=$it") } options.androidGradlePluginVersion?.let { add("-PandroidToolsVersion=$it")} diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KOTLIN_VERSION.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KOTLIN_VERSION.kt new file mode 100644 index 00000000000..49ad9fb435d --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KOTLIN_VERSION.kt @@ -0,0 +1,5 @@ +package org.jetbrains.kotlin.gradle + +// constant is held in separate file intentionally for better discoverability +// and to prevent vcs conflicts (its value is 1.1-* in master branch, 0.1-* in 1.0.x branches) +const val KOTLIN_VERSION = "1.1-SNAPSHOT" \ No newline at end of file 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 f264c11df2c..53545c65de8 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 @@ -5,7 +5,7 @@ buildscript { } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version' } } @@ -29,5 +29,5 @@ repositories { } dependencies { - compile 'org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT' + 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 a97ff934058..ab991599b94 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,6 +1,4 @@ buildscript { - ext.kotlin_version = '1.1-SNAPSHOT' - repositories { maven { url 'file://' + pathToKotlinPlugin } mavenLocal() 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 2da8acba68f..0c6de839ad1 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 @@ -1,8 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.1-SNAPSHOT' - repositories { maven { url 'file://' + pathToKotlinPlugin } mavenLocal() 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 489ea17a74e..1ff560f7ff3 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,5 +1,4 @@ buildscript { - ext.kotlin_version = '1.1-SNAPSHOT' repositories { mavenCentral() mavenLocal() 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 c38414820d9..5d765200aa7 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 @@ -9,8 +9,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' - classpath 'org.jetbrains.kotlin:kotlin-android-extensions:1.1-SNAPSHOT' + 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.jakewharton.sdkmanager:gradle-plugin:0.12.+' } @@ -51,5 +51,5 @@ repositories { dependencies { compile 'com.android.support:appcompat-v7:23.1.1' - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" + 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/AndroidKaptChangingDependencies/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/build.gradle index 529b74f1aa4..3ba3a1a541b 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 @@ -1,5 +1,4 @@ buildscript { - ext.kotlin_version = '1.1-SNAPSHOT' ext.support_lib_version = '23.1.1' ext.dagger_version = '1.2.5' diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle index 570b07c42ad..6fe352defdf 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'kotlin-android' dependencies { compile project(':Lib') - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" + 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/AndroidProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/build.gradle index 7662ad0fc39..c7a7ab3a7ec 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 @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath ('com.android.tools.build:gradle:' + androidToolsVersion) classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+' } 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 c8d221b502c..34c9eb1df29 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -33,7 +33,7 @@ sourceSets { dependencies { compile 'com.google.guava:guava:12.0' testCompile 'org.testng:testng:6.8' - compile 'org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { 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 f92cbfa6daa..4ad67ae2f0c 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -23,7 +23,7 @@ repositories { dependencies { compile 'com.google.guava:guava:12.0' testCompile 'org.testng:testng:6.8' - compile 'org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { 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 741e9027d14..00c8a20cf2a 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 @@ -3,7 +3,7 @@ buildscript { maven { url 'file://' + pathToKotlinPlugin } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -15,7 +15,7 @@ repositories { } dependencies { - compile 'org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } compileJava { 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 d29afa03005..bcb025780e6 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -28,7 +28,7 @@ repositories { } dependencies { - compile 'org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } compileKotlin { 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 32dc7da5052..c67725f1a21 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -32,7 +32,7 @@ repositories { dependencies { compile 'com.google.guava:guava:12.0' testCompile 'org.testng:testng:6.8' - compile 'org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { 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 a9891e37511..25f305f7f02 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,5 +1,4 @@ buildscript { - ext.kotlin_verion = '1.1-SNAPSHOT' repositories { maven { url 'file://' + pathToKotlinPlugin } } 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 f5130d05ce0..23cf5feece5 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,5 +1,4 @@ buildscript { - ext.kotlin_version = '1.1-SNAPSHOT' repositories { maven { url 'file://' + pathToKotlinPlugin } } @@ -13,4 +12,4 @@ allprojects { repositories { mavenCentral() } -} +} \ No newline at end of file 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 9cc55325ec5..63a65119afb 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -22,7 +22,7 @@ repositories { dependencies { testCompile 'org.testng:testng:6.8' - compile 'org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { 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 b216eab4d41..cf5e120be25 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -28,7 +28,7 @@ repositories { } dependencies { - compile 'org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } compileKotlin { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-butterknife/app/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-butterknife/app/build.gradle index 4df386b6778..e2dfe5e94df 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-butterknife/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-butterknife/app/build.gradle @@ -33,5 +33,5 @@ dependencies { compile 'com.android.support:appcompat-v7:23.3.0' compile 'com.jakewharton:butterknife:8.0.1' kapt 'com.jakewharton:butterknife-compiler:8.0.1' - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" + 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/kapt2/android-butterknife/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-butterknife/build.gradle index e5bdd85a53b..bfc739bcb87 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 @@ -9,7 +9,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:1.5.+' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.jakewharton.sdkmanager:gradle-plugin:0.12.+" } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dagger/app/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dagger/app/build.gradle index 699d6d2c4f1..86eceea0b08 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dagger/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dagger/app/build.gradle @@ -29,9 +29,9 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:appcompat-v7:23.3.0' - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile 'com.google.dagger:dagger:2.2' - kapt 'com.google.dagger:dagger-compiler:2.2' + compile 'com.google.dagger:dagger:2.6.1' + kapt 'com.google.dagger:dagger-compiler:2.6.1' provided 'org.glassfish:javax.annotation:10.0-b28' } \ No newline at end of file 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 210ae43f3d9..dcef8747cec 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 @@ -9,7 +9,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:1.5.+' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.jakewharton.sdkmanager:gradle-plugin:0.12.+" } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dbflow/app/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dbflow/app/build.gradle index 7d5987b2bcb..d6656d78bb9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dbflow/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dbflow/app/build.gradle @@ -34,6 +34,6 @@ dependencies { compile "com.github.Raizlabs.DBFlow:dbflow-kotlinextensions:${dbflow_version}" // Kotlin - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" + 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/kapt2/android-dbflow/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dbflow/build.gradle index 443eb2d13f5..199ee2ac2ee 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 @@ -9,7 +9,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:1.5.+' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.jakewharton.sdkmanager:gradle-plugin:0.12.+" } } 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 e49f7190066..15ba613de37 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 @@ -9,7 +9,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:1.5.+' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath("io.realm:realm-gradle-plugin:$realm_version") { exclude group: 'com.android.tools.build', module: 'gradle' } @@ -57,7 +57,7 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" - compile "org.jetbrains.kotlin:kotlin-reflect:1.1-SNAPSHOT" + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" compile 'org.jetbrains.anko:anko-common:0.9' } \ No newline at end of file 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 f95e115024c..755751d9f4a 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -22,9 +22,9 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" - compile "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" - kapt "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" + 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 << { 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 b44fb2fdf68..7333af8ffda 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -22,9 +22,9 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" - compile "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" - kapt "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" + 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 << { 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 572b254a6a6..905ee67276c 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -22,9 +22,9 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" - compile "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" - kapt "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" + 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" testCompile 'junit:junit:4.12' } 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 f4363bffc89..d596d2a89d0 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -21,9 +21,9 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" - compile "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" - kapt "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" + 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 << { 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 1df8376f5c8..6539b3b2a42 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,4 @@ buildscript { - ext.kotlin_version = '1.1-SNAPSHOT' - repositories { maven { url 'file://' + pathToKotlinPlugin } } 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 c28df75858e..f14099af447 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -21,9 +21,9 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" - compile "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" - kapt "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" + 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" testCompile 'junit:junit:4.12' } 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 ed54853398a..048afd44b33 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -21,9 +21,9 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" - compile "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" - kapt "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" + 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 << { 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 1efccc508eb..3bb0f326444 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -21,9 +21,9 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" - compile "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" - kapt "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" + 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 << { 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 8dfa59408c6..9e0a30d762f 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -21,9 +21,9 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" - compile "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" - kapt "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" + 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" testCompile 'junit:junit:4.12' } 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 c12251e38c3..9dadb70615d 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -21,9 +21,9 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" - compile "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" - kapt "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" + 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" testCompile 'junit:junit:4.12' } 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 a37429c9a7d..ac70d97b8ea 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,5 +1,4 @@ buildscript { - ext.kotlin_version = '1.1-SNAPSHOT' repositories { mavenCentral() maven { @@ -59,4 +58,4 @@ build.doLast { } } -runRhino.dependsOn build +runRhino.dependsOn build \ No newline at end of file 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 1c3425ebdc0..968bc96fe68 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 @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -21,5 +21,5 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-js-library:1.1-SNAPSHOT" + compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version" } \ No newline at end of file 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 62442e3e51f..b5dd3be9273 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 @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -21,7 +21,7 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-js-library:1.1-SNAPSHOT" + compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version" } task jarSources(type:Jar){ 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 fbca798db75..b696884de0f 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 @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -22,7 +22,7 @@ repositories { dependencies { compile project(":libraryProject"), - "org.jetbrains.kotlin:kotlin-js-library:1.1-SNAPSHOT" + "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 1e0b65bec36..da2f60f19c1 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 @@ -6,8 +6,8 @@ buildscript { } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" - classpath "org.jetbrains.kotlin:kotlin-gradle-subplugin-example:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-subplugin-example:$kotlin_version" } } @@ -21,7 +21,7 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } task show << { 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 d1f7dcca4cd..28e762f3dce 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -27,7 +27,7 @@ sourceSets { dependencies { compile 'com.google.guava:guava:12.0' testCompile 'org.testng:testng:6.8' - compile 'org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { 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 ac5b3921622..319ed85ea5b 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -28,7 +28,7 @@ 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:1.1-SNAPSHOT' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { 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 92b03a2817c..75bbeb77899 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -23,7 +23,7 @@ repositories { dependencies { compile 'com.google.guava:guava:12.0' testCompile 'org.testng:testng:6.8' - compile 'org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { 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 64de233585d..12995184318 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -28,7 +28,7 @@ repositories { } dependencies { - compile 'org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT' + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } compileKotlin { 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 8fc6d08f031..261d39e8d3c 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,9 +1,8 @@ buildscript { - ext.kotlin_version = '1.1-SNAPSHOT' repositories { maven { url 'file://' + pathToKotlinPlugin } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } -} +} \ No newline at end of file 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 271f256a849..b04038dff29 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } 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 273f1f11bba..4bdb4ff1605 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 @@ -10,7 +10,7 @@ repositories { dependencies { compile 'com.google.guava:guava:12.0' testCompile 'org.testng:testng:6.8' - compile 'org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT' + 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 dc9e493d618..338a8ab25a0 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 @@ -6,6 +6,6 @@ buildscript { } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } 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 a0bc172fd57..78e1b443d5a 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -30,7 +30,7 @@ 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:1.1-SNAPSHOT" + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { 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 83d464776fb..367e281f6a0 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 @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } 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 4e068e69ab8..b9fabb209a0 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,5 +1,4 @@ buildscript { - ext.kotlin_version = '1.1-SNAPSHOT' repositories { maven { url 'file://' + pathToKotlinPlugin } }