azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump advance Gradle version in tests to '7.0-rc-1'.

Browse Source 
- Add missing dependency on ':kotlin-serialization' required
 by some tests.
- Add additional location for libcurl on Linux machines.
This commit is contained in:
Yahor Berdnikau
2021-03-24 17:10:24 +01:00
committed by TeamCityServer
parent 6e31ff4fb1
commit 48599e3768
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/tasks.kt
+1
View File
@@ -56,6 +56,7 @@ val kotlinGradlePluginAndItsRequired = arrayOf(
":kotlin-scripting-jvm", ":kotlin-scripting-jvm",
":kotlin-scripting-compiler-embeddable", ":kotlin-scripting-compiler-embeddable",
":kotlin-scripting-compiler-impl-embeddable", ":kotlin-scripting-compiler-impl-embeddable",
":kotlin-serialization",
":kotlin-test-js-runner", ":kotlin-test-js-runner",
":native:kotlin-klib-commonizer-embeddable", ":native:kotlin-klib-commonizer-embeddable",
":native:kotlin-klib-commonizer-api" ":native:kotlin-klib-commonizer-api"
libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+1 -1
View File
@@ -81,7 +81,7 @@ fun Test.includeNative(include: Boolean) {
} }
fun Test.advanceGradleVersion() { fun Test.advanceGradleVersion() {
val gradleVersionForTests = "7.0-milestone-3" val gradleVersionForTests = "7.0-rc-1"
systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests) systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests)
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl.def
+1 -1
View File
@@ -3,4 +3,4 @@ headerFilter = curl/*
compilerOpts = -Ilibs/include compilerOpts = -Ilibs/include
linkerOpts.osx = -L/opt/local/lib -L/usr/local/opt/curl/lib -lcurl linkerOpts.osx = -L/opt/local/lib -L/usr/local/opt/curl/lib -lcurl
linkerOpts.linux = -L/usr/lib/x86_64-linux-gnu -lcurl linkerOpts.linux = -L/usr/lib/x86_64-linux-gnu -L/usr/lib64 -lcurl
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl2.def
+1 -1
View File
@@ -3,4 +3,4 @@ headerFilter = curl/*
compilerOpts = -Ilibs/include compilerOpts = -Ilibs/include
linkerOpts.osx = -L/opt/local/lib -L/usr/local/opt/curl/lib -lcurl linkerOpts.osx = -L/opt/local/lib -L/usr/local/opt/curl/lib -lcurl
linkerOpts.linux = -L/usr/lib/x86_64-linux-gnu -lcurl linkerOpts.linux = -L/usr/lib/x86_64-linux-gnu -L/usr/lib64 -lcurl