Configure new projects with kotlin-stdlib-jdk7/8 (KT-20286)

No migration for old projects has been added yet.

 #KT-20286 Fixed
This commit is contained in:
Nikolay Krasko
2017-10-24 18:07:06 +03:00
parent b7b3caedcc
commit 6a43743c98
45 changed files with 113 additions and 49 deletions
@@ -34,7 +34,7 @@ project.afterEvaluate {
dependencies {
compile project(':lib')
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
buildscript {
@@ -20,7 +20,7 @@ dependencies {
debugCompile 'com.android.support:support-v13:13.0.0'
compile 'com.google.android.gms:play-services:3.1.36'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
android {
@@ -52,5 +52,5 @@ repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
@@ -63,5 +63,5 @@ repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
@@ -27,5 +27,5 @@ repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
@@ -28,5 +28,5 @@ android.applicationVariants.each { variant ->
variant.outputFile = file("$project.buildDir/${variant.name}.apk")
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
@@ -47,5 +47,5 @@ repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
@@ -21,7 +21,7 @@ repositories {
dependencies {
compile 'com.example.android.multiproject:util:1.0'
releaseCompile 'com.google.guava:guava:11.0.2'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
android {
@@ -11,7 +11,7 @@ android {
//
dependencies {
compile project(':lib')
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
buildscript {