azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: Fix Gradle tests, update Kotlin artifact version to 1.1

Browse Source
This commit is contained in:
Yan Zhulanow
2016-09-07 16:11:33 +03:00
parent 025f861e76
commit 30a29eaa46
10 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-butterknife/app/build.gradle
+1 -1
View File
@@ -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"
}
libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-butterknife/build.gradle
+1 -1
View File
@@ -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.+"
}
}
libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dagger/app/build.gradle
+1 -1
View File
@@ -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'
libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dagger/build.gradle
+1 -1
View File
@@ -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.+"
}
}
libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dbflow/app/build.gradle
+1 -1
View File
@@ -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"
}
libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-dbflow/build.gradle
+1 -1
View File
@@ -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.+"
}
}
libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/android-realm/build.gradle
+3 -3
View File
@@ -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'
}
libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/generatedDirUpToDate/build.gradle
+3 -3
View File
@@ -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 << {
libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/inheritedAnnotations/build.gradle
+3 -3
View File
@@ -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 << {
libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kapt2/simple/build.gradle
+3 -3
View File
@@ -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'
}