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

Fix testdata: Android projects use kotlin-stdlib-jre7

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-03-15 17:44:19 +01:00
parent 12fc89f35d
commit 49a4625368
20 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle
Vendored
+1 -1
View File
@@ -33,7 +33,7 @@ android {
dependencies { dependencies {
compile 'com.android.support:support-v4:13.0.0' compile 'com.android.support:support-v4:13.0.0'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
// VERSION: $VERSION$ // VERSION: $VERSION$
idea/testData/configuration/android-gradle/androidStudioDefault_after.gradle
Vendored
+1 -1
View File
@@ -27,5 +27,5 @@ android {
dependencies { dependencies {
compile 'com.android.support:support-v4:13.0.0' compile 'com.android.support:support-v4:13.0.0'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
idea/testData/configuration/android-gradle/buildConfigs_after.gradle
Vendored
+1 -1
View File
@@ -34,5 +34,5 @@ repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
idea/testData/configuration/android-gradle/emptyDependencyList_after.gradle
Vendored
+1 -1
View File
@@ -18,5 +18,5 @@ android {
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
idea/testData/configuration/android-gradle/emptyFile_after.gradle
Vendored
+1 -1
View File
@@ -12,5 +12,5 @@ repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_after.gradle
Vendored
+1 -1
View File
@@ -34,7 +34,7 @@ project.afterEvaluate {
dependencies { dependencies {
compile project(':lib') compile project(':lib')
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
buildscript { buildscript {
idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_after.gradle
Vendored
+1 -1
View File
@@ -20,7 +20,7 @@ dependencies {
debugCompile 'com.android.support:support-v13:13.0.0' debugCompile 'com.android.support:support-v13:13.0.0'
compile 'com.google.android.gms:play-services:3.1.36' compile 'com.google.android.gms:play-services:3.1.36'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
android { android {
idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_after.gradle
Vendored
+1 -1
View File
@@ -52,5 +52,5 @@ repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_after.gradle
Vendored
+1 -1
View File
@@ -63,5 +63,5 @@ repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_after.gradle
Vendored
+1 -1
View File
@@ -27,5 +27,5 @@ repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_after.gradle
Vendored
+1 -1
View File
@@ -28,5 +28,5 @@ android.applicationVariants.each { variant ->
variant.outputFile = file("$project.buildDir/${variant.name}.apk") variant.outputFile = file("$project.buildDir/${variant.name}.apk")
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_after.gradle
Vendored
+1 -1
View File
@@ -47,5 +47,5 @@ repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_after.gradle
Vendored
+1 -1
View File
@@ -21,7 +21,7 @@ repositories {
dependencies { dependencies {
compile 'com.example.android.multiproject:util:1.0' compile 'com.example.android.multiproject:util:1.0'
releaseCompile 'com.google.guava:guava:11.0.2' releaseCompile 'com.google.guava:guava:11.0.2'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
android { android {
idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_after.gradle
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ android {
// //
dependencies { dependencies {
compile project(':lib') compile project(':lib')
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
buildscript { buildscript {
idea/testData/configuration/android-gradle/helloWorld_after.gradle
Vendored
+1 -1
View File
@@ -19,5 +19,5 @@ repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
idea/testData/configuration/android-gradle/libraryFile_after.gradle
Vendored
+1 -1
View File
@@ -41,5 +41,5 @@ repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
idea/testData/configuration/android-gradle/missedApplyAndroidStatement_after.gradle
Vendored
+1 -1
View File
@@ -26,5 +26,5 @@ android {
dependencies { dependencies {
compile 'com.android.support:support-v4:13.0.0' compile 'com.android.support:support-v4:13.0.0'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ android {
dependencies { dependencies {
compile 'com.android.support:support-v4:13.0.0' compile 'com.android.support:support-v4:13.0.0'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
buildscript { buildscript {
ext.kotlin_version = '$VERSION$' ext.kotlin_version = '$VERSION$'
idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle
Vendored
+1 -1
View File
@@ -32,7 +32,7 @@ android {
dependencies { dependencies {
compile 'com.android.support:support-v4:13.0.0' compile 'com.android.support:support-v4:13.0.0'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }
// VERSION: $VERSION$ // VERSION: $VERSION$
idea/testData/configuration/android-gradle/productFlavor_after.gradle
Vendored
+1 -1
View File
@@ -27,5 +27,5 @@ repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
} }