From 72ca05f86aab2df9f5939bb1a68fe0411c73db6d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 27 Mar 2019 20:11:17 +0100 Subject: [PATCH] Add kotlin-stdlib explicitly to Gradle integration test data This is required since ed86757817, otherwise an error "Cannot access built-in declaration ..." is reported --- .../kotlin/gradle/IncrementalCompilationMultiProjectIT.kt | 3 ++- .../org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt | 4 ++++ .../resources/testProject/AndroidProject/Lib/build.gradle | 1 + .../resources/testProject/AndroidProject/Test/build.gradle | 4 ++++ .../resources/testProject/duplicatedClass/app/build.gradle | 3 ++- .../resources/testProject/duplicatedClass/lib/build.gradle | 4 ++++ .../testProject/incrementalMultiproject/app/build.gradle | 3 ++- .../testProject/incrementalMultiproject/lib/build.gradle | 4 ++++ .../resources/testProject/kotlinJavaProject/build.gradle | 3 ++- .../resources/testProject/kt-29971/jvm-app/build.gradle | 6 +++++- .../testProject/moveClassToOtherModule/app/build.gradle | 3 ++- .../testProject/moveClassToOtherModule/lib/build.gradle | 4 ++++ .../multiplatformAndroidProject/lib/build.gradle | 4 ++++ .../multiplatformAndroidProject/libAndroid/build.gradle | 2 +- .../multiplatformAndroidProject/libJvm/build.gradle | 3 ++- .../multiplatformMultipleCommonModules/libJvm/build.gradle | 3 ++- .../testProject/multiplatformProject/libJvm/build.gradle | 3 ++- .../multiprojectWithDependency/projA/build.gradle | 6 +++++- .../multiprojectWithDependency/projB/build.gradle | 3 ++- .../test/resources/testProject/simpleProject/build.gradle | 3 ++- .../resources/testProject/suppressWarnings/build.gradle | 4 ++++ 21 files changed, 60 insertions(+), 13 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt index 7491f954c8c..58ea456310f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt @@ -31,7 +31,7 @@ class IncrementalCompilationJsMultiProjectIT : BaseIncrementalCompilationMultiPr class IncrementalCompilationJvmMultiProjectIT : BaseIncrementalCompilationMultiProjectIT() { override val additionalLibDependencies: String = - "implementation \"org.jetbrains.kotlin:kotlin-stdlib:${'$'}kotlin_version\"" + "implementation \"org.jetbrains.kotlin:kotlin-test:${'$'}kotlin_version\"" override val compileKotlinTaskName: String get() = "compileKotlin" @@ -71,6 +71,7 @@ class IncrementalCompilationJvmMultiProjectIT : BaseIncrementalCompilationMultiP apply plugin: 'kotlin' dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:${"$"}kotlin_version" compile 'org.codehaus.groovy:groovy-all:2.4.7' } """.trimIndent() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt index 32dde204240..037088caa3c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt @@ -276,6 +276,10 @@ class MultiplatformGradleIT : BaseGradleIT() { gradleBuildScript(module).appendText(sourceSetDeclaration) } + gradleBuildScript("libJvm").appendText( + "\ndependencies { ${sourceSetName}Compile \"org.jetbrains.kotlin:kotlin-stdlib:${"$"}kotlin_version\" }" + ) + listOf( "expect fun foo(): String" to "lib/src/$sourceSetName/kotlin", "actual fun foo(): String = \"jvm\"" to "libJvm/src/$sourceSetName/kotlin", diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle index fd1c302bc60..4e4a4531e0a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle @@ -2,6 +2,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile files('libs/android-support-v4.jar') // unused but needed for IncrementalCompilationMultiProjectIT.testAndroid to check if non-local dependency affects IC compile 'io.reactivex:rxjava:1.1.9' diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle index e7004279526..6e7de7d357a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle @@ -3,6 +3,10 @@ import org.gradle.util.VersionNumber apply plugin: 'com.android.test' apply plugin: 'kotlin-android' +dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" +} + android { compileSdkVersion 22 buildToolsVersion "25.0.2" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/duplicatedClass/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/duplicatedClass/app/build.gradle index ed6cb6a85e3..b5432a9eb42 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/duplicatedClass/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/duplicatedClass/app/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'kotlin' dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile project(':lib') -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/duplicatedClass/lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/duplicatedClass/lib/build.gradle index 90470485bb0..ee7434e1b5d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/duplicatedClass/lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/duplicatedClass/lib/build.gradle @@ -1 +1,5 @@ apply plugin: 'kotlin' + +dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/app/build.gradle index ed6cb6a85e3..b5432a9eb42 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/app/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'kotlin' dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile project(':lib') -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/lib/build.gradle index 90470485bb0..ee7434e1b5d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/lib/build.gradle @@ -1 +1,5 @@ apply plugin: 'kotlin' + +dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinJavaProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinJavaProject/build.gradle index baf1d5d4e81..c18cf3c9095 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinJavaProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinJavaProject/build.gradle @@ -25,8 +25,9 @@ dependencies { deployCompile 'com.google.guava:guava:12.0' testCompile 'org.testng:testng:6.8' compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + deployCompile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } test { useTestNG() -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-29971/jvm-app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-29971/jvm-app/build.gradle index f2f3c27fb6d..50154d056ff 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-29971/jvm-app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-29971/jvm-app/build.gradle @@ -3,4 +3,8 @@ plugins { } group = "com.example.jvm" -version = "1.0" \ No newline at end of file +version = "1.0" + +dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/moveClassToOtherModule/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/moveClassToOtherModule/app/build.gradle index ed6cb6a85e3..6b6a43b35cf 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/moveClassToOtherModule/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/moveClassToOtherModule/app/build.gradle @@ -2,4 +2,5 @@ apply plugin: 'kotlin' dependencies { compile project(':lib') -} \ No newline at end of file + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/moveClassToOtherModule/lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/moveClassToOtherModule/lib/build.gradle index 90470485bb0..ee7434e1b5d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/moveClassToOtherModule/lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/moveClassToOtherModule/lib/build.gradle @@ -1 +1,5 @@ apply plugin: 'kotlin' + +dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidProject/lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidProject/lib/build.gradle index 48e89733657..bd07e135b4a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidProject/lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidProject/lib/build.gradle @@ -1 +1,5 @@ apply plugin: 'kotlin-platform-common' + +dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidProject/libAndroid/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidProject/libAndroid/build.gradle index 068b669c69d..10377b9e07f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidProject/libAndroid/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidProject/libAndroid/build.gradle @@ -17,4 +17,4 @@ android { } lintOptions.abortOnError = false -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidProject/libJvm/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidProject/libJvm/build.gradle index c5f014ee3fc..9f694bbd6a1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidProject/libJvm/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidProject/libJvm/build.gradle @@ -2,5 +2,6 @@ apply plugin: 'kotlin-platform-jvm' dependencies { expectedBy project(":lib") + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile 'com.google.guava:guava:20.0' -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/build.gradle index 3e6e7448a83..92e8632acdb 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/build.gradle @@ -3,5 +3,6 @@ apply plugin: 'kotlin-platform-jvm' dependencies { expectedBy project(":libA") expectedBy project(":libB") + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile 'com.google.guava:guava:20.0' -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJvm/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJvm/build.gradle index c5f014ee3fc..9f694bbd6a1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJvm/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformProject/libJvm/build.gradle @@ -2,5 +2,6 @@ apply plugin: 'kotlin-platform-jvm' dependencies { expectedBy project(":lib") + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile 'com.google.guava:guava:20.0' -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiprojectWithDependency/projA/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiprojectWithDependency/projA/build.gradle index 1145cf9be3e..3b0ff938324 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiprojectWithDependency/projA/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiprojectWithDependency/projA/build.gradle @@ -1 +1,5 @@ -apply plugin: "kotlin" \ No newline at end of file +apply plugin: "kotlin" + +dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiprojectWithDependency/projB/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiprojectWithDependency/projB/build.gradle index 3ba7fa42f9c..74c5be77652 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiprojectWithDependency/projB/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiprojectWithDependency/projB/build.gradle @@ -2,4 +2,5 @@ apply plugin: "kotlin" dependencies { compile project(':projA') -} \ No newline at end of file + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleProject/build.gradle index 792377e6c29..f212061aae5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simpleProject/build.gradle @@ -25,8 +25,9 @@ dependencies { deployCompile 'com.google.guava:guava:12.0' testCompile 'org.testng:testng:6.8' compile "org.jetbrains.kotlin:kotlin-stdlib" + deployCompile "org.jetbrains.kotlin:kotlin-stdlib" } test { useTestNG() -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/suppressWarnings/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/suppressWarnings/build.gradle index 0084502bf3c..c673dfc03ed 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/suppressWarnings/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/suppressWarnings/build.gradle @@ -20,6 +20,10 @@ sourceSets { } } +dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" +} + repositories { mavenLocal() mavenCentral()