From 49a4625368df8d9f540e4ea6c519b998be1d5191 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 15 Mar 2017 17:44:19 +0100 Subject: [PATCH] Fix testdata: Android projects use kotlin-stdlib-jre7 --- .../android-gradle/androidStudioDefaultShapshot_after.gradle | 2 +- .../android-gradle/androidStudioDefault_after.gradle | 2 +- .../configuration/android-gradle/buildConfigs_after.gradle | 2 +- .../android-gradle/emptyDependencyList_after.gradle | 2 +- .../configuration/android-gradle/emptyFile_after.gradle | 2 +- .../android-gradle/gradleExamples/gradleExample0_after.gradle | 2 +- .../android-gradle/gradleExamples/gradleExample18_after.gradle | 2 +- .../android-gradle/gradleExamples/gradleExample22_after.gradle | 2 +- .../android-gradle/gradleExamples/gradleExample44_after.gradle | 2 +- .../android-gradle/gradleExamples/gradleExample50_after.gradle | 2 +- .../android-gradle/gradleExamples/gradleExample58_after.gradle | 2 +- .../android-gradle/gradleExamples/gradleExample5_after.gradle | 2 +- .../android-gradle/gradleExamples/gradleExample65_after.gradle | 2 +- .../android-gradle/gradleExamples/gradleExample8_after.gradle | 2 +- .../configuration/android-gradle/helloWorld_after.gradle | 2 +- .../configuration/android-gradle/libraryFile_after.gradle | 2 +- .../android-gradle/missedApplyAndroidStatement_after.gradle | 2 +- .../android-gradle/missedBuildscriptBlock_after.gradle | 2 +- .../missedRepositoriesInBuildscriptBlock_after.gradle | 2 +- .../configuration/android-gradle/productFlavor_after.gradle | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle b/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle index 9e6ff8f9665..b1fb9d89848 100644 --- a/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle +++ b/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle @@ -33,7 +33,7 @@ android { dependencies { 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$ diff --git a/idea/testData/configuration/android-gradle/androidStudioDefault_after.gradle b/idea/testData/configuration/android-gradle/androidStudioDefault_after.gradle index 23479bb9a19..9182798fcff 100644 --- a/idea/testData/configuration/android-gradle/androidStudioDefault_after.gradle +++ b/idea/testData/configuration/android-gradle/androidStudioDefault_after.gradle @@ -27,5 +27,5 @@ android { dependencies { 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" } diff --git a/idea/testData/configuration/android-gradle/buildConfigs_after.gradle b/idea/testData/configuration/android-gradle/buildConfigs_after.gradle index bd09dcb2148..7fd78842ec2 100644 --- a/idea/testData/configuration/android-gradle/buildConfigs_after.gradle +++ b/idea/testData/configuration/android-gradle/buildConfigs_after.gradle @@ -34,5 +34,5 @@ repositories { mavenCentral() } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/emptyDependencyList_after.gradle b/idea/testData/configuration/android-gradle/emptyDependencyList_after.gradle index ad975c6899c..6a4382d4aa9 100644 --- a/idea/testData/configuration/android-gradle/emptyDependencyList_after.gradle +++ b/idea/testData/configuration/android-gradle/emptyDependencyList_after.gradle @@ -18,5 +18,5 @@ android { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } diff --git a/idea/testData/configuration/android-gradle/emptyFile_after.gradle b/idea/testData/configuration/android-gradle/emptyFile_after.gradle index 98959355709..6cefa1cc8e8 100644 --- a/idea/testData/configuration/android-gradle/emptyFile_after.gradle +++ b/idea/testData/configuration/android-gradle/emptyFile_after.gradle @@ -12,5 +12,5 @@ repositories { mavenCentral() } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_after.gradle index 28d3a2369b0..e81683abdd0 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_after.gradle +++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_after.gradle @@ -34,7 +34,7 @@ project.afterEvaluate { dependencies { compile project(':lib') - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } buildscript { diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_after.gradle index 0e03638b368..c45d035717f 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_after.gradle +++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_after.gradle @@ -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-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } android { diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_after.gradle index 540e382bbeb..575ac2bdef3 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_after.gradle +++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_after.gradle @@ -52,5 +52,5 @@ repositories { mavenCentral() } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_after.gradle index 83e3f51b7c8..1e20e22b2dd 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_after.gradle +++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_after.gradle @@ -63,5 +63,5 @@ repositories { mavenCentral() } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_after.gradle index 21439379ae6..f3eed0ca325 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_after.gradle +++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_after.gradle @@ -27,5 +27,5 @@ repositories { mavenCentral() } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_after.gradle index b4172157fc2..293375ac3e9 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_after.gradle +++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_after.gradle @@ -28,5 +28,5 @@ android.applicationVariants.each { variant -> variant.outputFile = file("$project.buildDir/${variant.name}.apk") } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_after.gradle index 66175bea143..7c73da66059 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_after.gradle +++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_after.gradle @@ -47,5 +47,5 @@ repositories { mavenCentral() } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_after.gradle index fcf48dfe44f..a3d655f3978 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_after.gradle +++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_after.gradle @@ -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-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } android { diff --git a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_after.gradle b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_after.gradle index 273fa4a488d..640db3d6c98 100644 --- a/idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_after.gradle +++ b/idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_after.gradle @@ -11,7 +11,7 @@ android { // dependencies { compile project(':lib') - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } buildscript { diff --git a/idea/testData/configuration/android-gradle/helloWorld_after.gradle b/idea/testData/configuration/android-gradle/helloWorld_after.gradle index aa019ed67d3..db18d41e9ac 100644 --- a/idea/testData/configuration/android-gradle/helloWorld_after.gradle +++ b/idea/testData/configuration/android-gradle/helloWorld_after.gradle @@ -19,5 +19,5 @@ repositories { mavenCentral() } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/libraryFile_after.gradle b/idea/testData/configuration/android-gradle/libraryFile_after.gradle index c798bfa6b03..547b5cf74bc 100644 --- a/idea/testData/configuration/android-gradle/libraryFile_after.gradle +++ b/idea/testData/configuration/android-gradle/libraryFile_after.gradle @@ -41,5 +41,5 @@ repositories { mavenCentral() } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/missedApplyAndroidStatement_after.gradle b/idea/testData/configuration/android-gradle/missedApplyAndroidStatement_after.gradle index c1bb05d896d..b3d180d4a9e 100644 --- a/idea/testData/configuration/android-gradle/missedApplyAndroidStatement_after.gradle +++ b/idea/testData/configuration/android-gradle/missedApplyAndroidStatement_after.gradle @@ -26,5 +26,5 @@ android { dependencies { 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" } diff --git a/idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle b/idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle index e516b2db523..7d54dfb9d47 100644 --- a/idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle +++ b/idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle @@ -17,7 +17,7 @@ android { dependencies { 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 { ext.kotlin_version = '$VERSION$' diff --git a/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle b/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle index 64b87dc1a2d..a5e1fda10a4 100644 --- a/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle +++ b/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle @@ -32,7 +32,7 @@ android { dependencies { 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$ \ No newline at end of file diff --git a/idea/testData/configuration/android-gradle/productFlavor_after.gradle b/idea/testData/configuration/android-gradle/productFlavor_after.gradle index 20f59ca4dae..c0e1831c8cc 100644 --- a/idea/testData/configuration/android-gradle/productFlavor_after.gradle +++ b/idea/testData/configuration/android-gradle/productFlavor_after.gradle @@ -27,5 +27,5 @@ repositories { mavenCentral() } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" } \ No newline at end of file