From 30a29eaa465aaa5c1017f098d554c35451c9b940 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 7 Sep 2016 16:11:33 +0300 Subject: [PATCH] Minor: Fix Gradle tests, update Kotlin artifact version to 1.1 --- .../testProject/kapt2/android-butterknife/app/build.gradle | 2 +- .../testProject/kapt2/android-butterknife/build.gradle | 2 +- .../testProject/kapt2/android-dagger/app/build.gradle | 2 +- .../resources/testProject/kapt2/android-dagger/build.gradle | 2 +- .../testProject/kapt2/android-dbflow/app/build.gradle | 2 +- .../resources/testProject/kapt2/android-dbflow/build.gradle | 2 +- .../resources/testProject/kapt2/android-realm/build.gradle | 6 +++--- .../testProject/kapt2/generatedDirUpToDate/build.gradle | 6 +++--- .../testProject/kapt2/inheritedAnnotations/build.gradle | 6 +++--- .../test/resources/testProject/kapt2/simple/build.gradle | 6 +++--- 10 files changed, 18 insertions(+), 18 deletions(-) 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 7618cfd15fa..4df386b6778 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:0.1-SNAPSHOT" + compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" } \ 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 5f7722ed29e..e5bdd85a53b 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:0.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" 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 0bd1716bb7b..699d6d2c4f1 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,7 +29,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:appcompat-v7:23.3.0' - compile "org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT" + compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" compile 'com.google.dagger:dagger:2.2' kapt 'com.google.dagger:dagger-compiler:2.2' 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 18d5287ed3d..210ae43f3d9 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:0.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" 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 6d23730231a..7d5987b2bcb 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:0.1-SNAPSHOT" + compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" } \ 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 f326bf72531..443eb2d13f5 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:0.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" 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 e772bd03f28..e49f7190066 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:0.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" 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:0.1-SNAPSHOT" - compile "org.jetbrains.kotlin:kotlin-reflect:0.1-SNAPSHOT" + compile "org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT" + compile "org.jetbrains.kotlin:kotlin-reflect:1.1-SNAPSHOT" 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 5cefa3be6d6..345901787f8 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:0.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" } } @@ -23,8 +23,8 @@ repositories { dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT" - compile "org.jetbrains.kotlin:annotation-processor-example:0.1-SNAPSHOT" - kapt "org.jetbrains.kotlin:annotation-processor-example:0.1-SNAPSHOT" + compile "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" + kapt "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" } 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 8ead0526477..bfe110a87bd 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:0.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" } } @@ -23,8 +23,8 @@ repositories { dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT" - compile "org.jetbrains.kotlin:annotation-processor-example:0.1-SNAPSHOT" - kapt "org.jetbrains.kotlin:annotation-processor-example:0.1-SNAPSHOT" + compile "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" + kapt "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" } 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 5b9e5480ddd..53be87a8ada 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:0.1-SNAPSHOT" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT" } } @@ -23,8 +23,8 @@ repositories { dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT" - compile "org.jetbrains.kotlin:annotation-processor-example:0.1-SNAPSHOT" - kapt "org.jetbrains.kotlin:annotation-processor-example:0.1-SNAPSHOT" + compile "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" + kapt "org.jetbrains.kotlin:annotation-processor-example:1.1-SNAPSHOT" testCompile 'junit:junit:4.12' }