Refactoring: extract kotlin_version constant for gradle tests

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")}

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"

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'
 }

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()

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()

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()

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"
 }

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'
 

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'
 }
 

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.+'
     }

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 {

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 {

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 {

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 {

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 {

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 }
     }

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()
     }
-}
+}

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 {

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 {

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"
 }

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.+"
     }
 }

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'
 }

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.+"
     }
 }

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"
 
 }

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.+"
     }
 }

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'
 }

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 << {

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 << {

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'
 }
 

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 << {

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 }
     }

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'
 }
 

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 << {

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 << {

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'
 }
 

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'
 }
 

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

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"
 }

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){

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

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 << {

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 {

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 {

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 {

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 {

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"
     }
-}
+}

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"
   }
 }
 

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 {

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"
   }
 }

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 {

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"
     }
 }
 

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 }
   }