diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index 38c9c8c80fe..ce08cbde17c 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -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" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts index 64de826189e..833b662804c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts @@ -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) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl.def b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl.def index 647cf9ff8bc..648c1b28fdf 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl.def +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl.def @@ -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 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl2.def b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl2.def index 647cf9ff8bc..648c1b28fdf 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl2.def +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl2.def @@ -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