Bump advance Gradle version in tests to '7.0-rc-1'.
- Add missing dependency on ':kotlin-serialization' required by some tests. - Add additional location for libcurl on Linux machines.
This commit is contained in:
committed by
TeamCityServer
parent
6e31ff4fb1
commit
48599e3768
@@ -56,6 +56,7 @@ val kotlinGradlePluginAndItsRequired = arrayOf(
|
||||
":kotlin-scripting-jvm",
|
||||
":kotlin-scripting-compiler-embeddable",
|
||||
":kotlin-scripting-compiler-impl-embeddable",
|
||||
":kotlin-serialization",
|
||||
":kotlin-test-js-runner",
|
||||
":native:kotlin-klib-commonizer-embeddable",
|
||||
":native:kotlin-klib-commonizer-api"
|
||||
|
||||
@@ -81,7 +81,7 @@ fun Test.includeNative(include: Boolean) {
|
||||
}
|
||||
|
||||
fun Test.advanceGradleVersion() {
|
||||
val gradleVersionForTests = "7.0-milestone-3"
|
||||
val gradleVersionForTests = "7.0-rc-1"
|
||||
systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests)
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -3,4 +3,4 @@ headerFilter = curl/*
|
||||
compilerOpts = -Ilibs/include
|
||||
|
||||
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
|
||||
|
||||
+1
-1
@@ -3,4 +3,4 @@ headerFilter = curl/*
|
||||
compilerOpts = -Ilibs/include
|
||||
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user