From 83a8b041ad66c18475e3aafedcde7246f2a9928a Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Mon, 30 Jan 2017 16:47:58 +0300
Subject: [PATCH] Fix ConfigureProjectTestGenerated / GradleConfigureProject
 ... for branch 163 (jre7->jre8)

---
 .../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 +-
 idea/testData/configuration/gradle/default_after.gradle         | 2 +-
 idea/testData/configuration/gradle/eapVersion_after.gradle      | 2 +-
 idea/testData/configuration/gradle/m04Version_after.gradle      | 2 +-
 idea/testData/configuration/gradle/missedLibrary_after.gradle   | 2 +-
 idea/testData/configuration/gradle/plugin_present_after.gradle  | 2 +-
 idea/testData/configuration/gradle/rcVersion_after.gradle       | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle b/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle
index b1fb9d89848..9e6ff8f9665 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$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 9182798fcff..23479bb9a19 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
 }
diff --git a/idea/testData/configuration/android-gradle/buildConfigs_after.gradle b/idea/testData/configuration/android-gradle/buildConfigs_after.gradle
index 7fd78842ec2..bd09dcb2148 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$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 6a4382d4aa9..ad975c6899c 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
 }
diff --git a/idea/testData/configuration/android-gradle/emptyFile_after.gradle b/idea/testData/configuration/android-gradle/emptyFile_after.gradle
index 6cefa1cc8e8..98959355709 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$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 e81683abdd0..28d3a2369b0 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$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 c45d035717f..0e03638b368 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$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 575ac2bdef3..540e382bbeb 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$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 1e20e22b2dd..83e3f51b7c8 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$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 f3eed0ca325..21439379ae6 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$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 293375ac3e9..b4172157fc2 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$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 7c73da66059..66175bea143 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$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 a3d655f3978..fcf48dfe44f 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$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 640db3d6c98..273fa4a488d 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
 }
 
 buildscript {
diff --git a/idea/testData/configuration/android-gradle/helloWorld_after.gradle b/idea/testData/configuration/android-gradle/helloWorld_after.gradle
index db18d41e9ac..aa019ed67d3 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$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 547b5cf74bc..c798bfa6b03 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$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 b3d180d4a9e..c1bb05d896d 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
 }
diff --git a/idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle b/idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle
index 7d54dfb9d47..e516b2db523 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$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 a5e1fda10a4..64b87dc1a2d 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$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 c0e1831c8cc..20f59ca4dae 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-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
 }
\ No newline at end of file
diff --git a/idea/testData/configuration/gradle/default_after.gradle b/idea/testData/configuration/gradle/default_after.gradle
index 0f7e4279c27..26248b945ed 100644
--- a/idea/testData/configuration/gradle/default_after.gradle
+++ b/idea/testData/configuration/gradle/default_after.gradle
@@ -10,7 +10,7 @@ repositories {
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
 }
 buildscript {
     ext.kotlin_version = '$VERSION$'
diff --git a/idea/testData/configuration/gradle/eapVersion_after.gradle b/idea/testData/configuration/gradle/eapVersion_after.gradle
index 2bacca93060..3877d935b60 100644
--- a/idea/testData/configuration/gradle/eapVersion_after.gradle
+++ b/idea/testData/configuration/gradle/eapVersion_after.gradle
@@ -13,7 +13,7 @@ repositories {
 
 dependencies {
   testCompile group: 'junit', name: 'junit', version: '4.11'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
 }
 buildscript {
     ext.kotlin_version = '$VERSION$'
diff --git a/idea/testData/configuration/gradle/m04Version_after.gradle b/idea/testData/configuration/gradle/m04Version_after.gradle
index cbf9cd93bc5..460fa409d10 100644
--- a/idea/testData/configuration/gradle/m04Version_after.gradle
+++ b/idea/testData/configuration/gradle/m04Version_after.gradle
@@ -13,7 +13,7 @@ repositories {
 
 dependencies {
   testCompile group: 'junit', name: 'junit', version: '4.11'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
 }
 buildscript {
     ext.kotlin_version = '$VERSION$'
diff --git a/idea/testData/configuration/gradle/missedLibrary_after.gradle b/idea/testData/configuration/gradle/missedLibrary_after.gradle
index 27e2f50c459..b5056e6062e 100644
--- a/idea/testData/configuration/gradle/missedLibrary_after.gradle
+++ b/idea/testData/configuration/gradle/missedLibrary_after.gradle
@@ -6,7 +6,7 @@ version = '1.0'
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
 }
 
 buildscript {
diff --git a/idea/testData/configuration/gradle/plugin_present_after.gradle b/idea/testData/configuration/gradle/plugin_present_after.gradle
index 069f7efe6c6..08c943f5447 100644
--- a/idea/testData/configuration/gradle/plugin_present_after.gradle
+++ b/idea/testData/configuration/gradle/plugin_present_after.gradle
@@ -6,7 +6,7 @@ version = '1.0'
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
 }
 
 buildscript {
diff --git a/idea/testData/configuration/gradle/rcVersion_after.gradle b/idea/testData/configuration/gradle/rcVersion_after.gradle
index 2bacca93060..3877d935b60 100644
--- a/idea/testData/configuration/gradle/rcVersion_after.gradle
+++ b/idea/testData/configuration/gradle/rcVersion_after.gradle
@@ -13,7 +13,7 @@ repositories {
 
 dependencies {
   testCompile group: 'junit', name: 'junit', version: '4.11'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
 }
 buildscript {
     ext.kotlin_version = '$VERSION$'