From 7aa195b017f7a5e4c636b25f3dab6f5bd5f7abf1 Mon Sep 17 00:00:00 2001 From: Juan Chen Date: Mon, 9 Jul 2018 15:49:33 -0700 Subject: [PATCH] Use "implementation" in build scripts when configuring Kotlin (KT-22571) Currently "compile" is used when adding kotlin dependencies to build scripts, which is deprecated. --- .../kotlin/idea/configuration/GroovyBuildScriptManipulator.kt | 2 +- .../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 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GroovyBuildScriptManipulator.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GroovyBuildScriptManipulator.kt index b7f0a9b3dc2..5ffb5f81afa 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GroovyBuildScriptManipulator.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GroovyBuildScriptManipulator.kt @@ -348,7 +348,7 @@ class GroovyBuildScriptManipulator( private fun getGroovyDependencySnippet( artifactName: String, withVersion: Boolean - ) = "compile \"org.jetbrains.kotlin:$artifactName${if (withVersion) ":\$kotlin_version" else ""}\"" + ) = "implementation \"org.jetbrains.kotlin:$artifactName${if (withVersion) ":\$kotlin_version" else ""}\"" private fun getApplyPluginDirective(pluginName: String) = "apply plugin: '$pluginName'" diff --git a/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle b/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle index 55750a08b2c..aaf3af9677d 100644 --- a/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle +++ b/idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_after.gradle @@ -29,7 +29,7 @@ android { dependencies { compile 'com.android.support:support-v4:13.0.0' - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$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 34541e294bd..3dfb4da3172 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/idea/testData/configuration/android-gradle/buildConfigs_after.gradle b/idea/testData/configuration/android-gradle/buildConfigs_after.gradle index d97485715a0..481296119fe 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$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 8a86a7a77e3..c5deb9b55e5 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/idea/testData/configuration/android-gradle/emptyFile_after.gradle b/idea/testData/configuration/android-gradle/emptyFile_after.gradle index 3771a16109f..2d1f1d3ad98 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$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 ffccae25e16..f03f592adcf 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$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 1bab61e815f..b3541f2c873 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$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 0b8f2e6506b..7c0b9c0cca5 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$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 c6a06dc21b9..94e60f2335a 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$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 acb7edfdbd3..1e1eb53fccd 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$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 5da95b54cab..45874425d8e 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$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 9470c1f4f5e..cf69deccfd7 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$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 0aa46218bfa..f5d6018abfb 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$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 8fc87b9eda9..36c57bee09f 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } buildscript { diff --git a/idea/testData/configuration/android-gradle/helloWorld_after.gradle b/idea/testData/configuration/android-gradle/helloWorld_after.gradle index 009a26eada3..30ba9628e6e 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$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 a02b4217ad3..a0fbcdfc505 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$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 93396f9ae31..c42e2f084bf 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle b/idea/testData/configuration/android-gradle/missedBuildscriptBlock_after.gradle index 91288f9d998..4b53dfd1eae 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$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 8f1104a1912..1d00b9d40ee 100644 --- a/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle +++ b/idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_after.gradle @@ -29,7 +29,7 @@ android { dependencies { compile 'com.android.support:support-v4:13.0.0' - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } // VERSION: $VERSION$ diff --git a/idea/testData/configuration/android-gradle/productFlavor_after.gradle b/idea/testData/configuration/android-gradle/productFlavor_after.gradle index 8c4d92eeeca..fbc24531b82 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-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } \ No newline at end of file