Add kotlin-stdlib explicitly to Gradle integration test data
This is required since ed86757817, otherwise an error "Cannot access
built-in declaration ..." is reported
This commit is contained in:
+2
-1
@@ -31,7 +31,7 @@ class IncrementalCompilationJsMultiProjectIT : BaseIncrementalCompilationMultiPr
|
|||||||
|
|
||||||
class IncrementalCompilationJvmMultiProjectIT : BaseIncrementalCompilationMultiProjectIT() {
|
class IncrementalCompilationJvmMultiProjectIT : BaseIncrementalCompilationMultiProjectIT() {
|
||||||
override val additionalLibDependencies: String =
|
override val additionalLibDependencies: String =
|
||||||
"implementation \"org.jetbrains.kotlin:kotlin-stdlib:${'$'}kotlin_version\""
|
"implementation \"org.jetbrains.kotlin:kotlin-test:${'$'}kotlin_version\""
|
||||||
|
|
||||||
override val compileKotlinTaskName: String
|
override val compileKotlinTaskName: String
|
||||||
get() = "compileKotlin"
|
get() = "compileKotlin"
|
||||||
@@ -71,6 +71,7 @@ class IncrementalCompilationJvmMultiProjectIT : BaseIncrementalCompilationMultiP
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
compile "org.jetbrains.kotlin:kotlin-stdlib:${"$"}kotlin_version"
|
||||||
compile 'org.codehaus.groovy:groovy-all:2.4.7'
|
compile 'org.codehaus.groovy:groovy-all:2.4.7'
|
||||||
}
|
}
|
||||||
""".trimIndent()
|
""".trimIndent()
|
||||||
|
|||||||
+4
@@ -276,6 +276,10 @@ class MultiplatformGradleIT : BaseGradleIT() {
|
|||||||
gradleBuildScript(module).appendText(sourceSetDeclaration)
|
gradleBuildScript(module).appendText(sourceSetDeclaration)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gradleBuildScript("libJvm").appendText(
|
||||||
|
"\ndependencies { ${sourceSetName}Compile \"org.jetbrains.kotlin:kotlin-stdlib:${"$"}kotlin_version\" }"
|
||||||
|
)
|
||||||
|
|
||||||
listOf(
|
listOf(
|
||||||
"expect fun foo(): String" to "lib/src/$sourceSetName/kotlin",
|
"expect fun foo(): String" to "lib/src/$sourceSetName/kotlin",
|
||||||
"actual fun foo(): String = \"jvm\"" to "libJvm/src/$sourceSetName/kotlin",
|
"actual fun foo(): String = \"jvm\"" to "libJvm/src/$sourceSetName/kotlin",
|
||||||
|
|||||||
+1
@@ -2,6 +2,7 @@ apply plugin: 'com.android.library'
|
|||||||
apply plugin: 'kotlin-android'
|
apply plugin: 'kotlin-android'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile files('libs/android-support-v4.jar')
|
compile files('libs/android-support-v4.jar')
|
||||||
// unused but needed for IncrementalCompilationMultiProjectIT.testAndroid to check if non-local dependency affects IC
|
// unused but needed for IncrementalCompilationMultiProjectIT.testAndroid to check if non-local dependency affects IC
|
||||||
compile 'io.reactivex:rxjava:1.1.9'
|
compile 'io.reactivex:rxjava:1.1.9'
|
||||||
|
|||||||
+4
@@ -3,6 +3,10 @@ import org.gradle.util.VersionNumber
|
|||||||
apply plugin: 'com.android.test'
|
apply plugin: 'com.android.test'
|
||||||
apply plugin: 'kotlin-android'
|
apply plugin: 'kotlin-android'
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 22
|
compileSdkVersion 22
|
||||||
buildToolsVersion "25.0.2"
|
buildToolsVersion "25.0.2"
|
||||||
|
|||||||
+2
-1
@@ -1,5 +1,6 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile project(':lib')
|
compile project(':lib')
|
||||||
}
|
}
|
||||||
|
|||||||
+4
@@ -1 +1,5 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
}
|
||||||
|
|||||||
+2
-1
@@ -1,5 +1,6 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile project(':lib')
|
compile project(':lib')
|
||||||
}
|
}
|
||||||
|
|||||||
+4
@@ -1 +1,5 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
}
|
||||||
|
|||||||
+2
-1
@@ -25,8 +25,9 @@ dependencies {
|
|||||||
deployCompile 'com.google.guava:guava:12.0'
|
deployCompile 'com.google.guava:guava:12.0'
|
||||||
testCompile 'org.testng:testng:6.8'
|
testCompile 'org.testng:testng:6.8'
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
deployCompile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
useTestNG()
|
useTestNG()
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-1
@@ -3,4 +3,8 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "com.example.jvm"
|
group = "com.example.jvm"
|
||||||
version = "1.0"
|
version = "1.0"
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
}
|
||||||
|
|||||||
+2
-1
@@ -2,4 +2,5 @@ apply plugin: 'kotlin'
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':lib')
|
compile project(':lib')
|
||||||
}
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
}
|
||||||
|
|||||||
+4
@@ -1 +1,5 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
}
|
||||||
|
|||||||
+4
@@ -1 +1,5 @@
|
|||||||
apply plugin: 'kotlin-platform-common'
|
apply plugin: 'kotlin-platform-common'
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
}
|
||||||
|
|||||||
+1
-1
@@ -17,4 +17,4 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
lintOptions.abortOnError = false
|
lintOptions.abortOnError = false
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -2,5 +2,6 @@ apply plugin: 'kotlin-platform-jvm'
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
expectedBy project(":lib")
|
expectedBy project(":lib")
|
||||||
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile 'com.google.guava:guava:20.0'
|
compile 'com.google.guava:guava:20.0'
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -3,5 +3,6 @@ apply plugin: 'kotlin-platform-jvm'
|
|||||||
dependencies {
|
dependencies {
|
||||||
expectedBy project(":libA")
|
expectedBy project(":libA")
|
||||||
expectedBy project(":libB")
|
expectedBy project(":libB")
|
||||||
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile 'com.google.guava:guava:20.0'
|
compile 'com.google.guava:guava:20.0'
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -2,5 +2,6 @@ apply plugin: 'kotlin-platform-jvm'
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
expectedBy project(":lib")
|
expectedBy project(":lib")
|
||||||
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
compile 'com.google.guava:guava:20.0'
|
compile 'com.google.guava:guava:20.0'
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-1
@@ -1 +1,5 @@
|
|||||||
apply plugin: "kotlin"
|
apply plugin: "kotlin"
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
}
|
||||||
|
|||||||
+2
-1
@@ -2,4 +2,5 @@ apply plugin: "kotlin"
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':projA')
|
compile project(':projA')
|
||||||
}
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
}
|
||||||
|
|||||||
+2
-1
@@ -25,8 +25,9 @@ dependencies {
|
|||||||
deployCompile 'com.google.guava:guava:12.0'
|
deployCompile 'com.google.guava:guava:12.0'
|
||||||
testCompile 'org.testng:testng:6.8'
|
testCompile 'org.testng:testng:6.8'
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib"
|
compile "org.jetbrains.kotlin:kotlin-stdlib"
|
||||||
|
deployCompile "org.jetbrains.kotlin:kotlin-stdlib"
|
||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
useTestNG()
|
useTestNG()
|
||||||
}
|
}
|
||||||
|
|||||||
+4
@@ -20,6 +20,10 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
|||||||
Reference in New Issue
Block a user