From 334c9e14dff14f0eb08bda10bac9e622aa132afc Mon Sep 17 00:00:00 2001 From: Ignat Beresnev Date: Thu, 14 Apr 2022 16:08:11 +0300 Subject: Use common gradle+kotlin versions across gradle integration tests (#2287) * Use common gradle+kotlin versions across gradle integration tests * Separate JVM/Android/MPP tested versions * Fix react integration tests for 1.6.10 * Move kotlin react wrapper mapping to TestedVersions * Update gradle to 6.9.2 --- integration-tests/gradle/projects/it-multimodule-1/build.gradle | 4 ++-- integration-tests/gradle/projects/it-multimodule-1/gradle.properties | 2 +- .../it-multimodule-1/gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'integration-tests/gradle/projects/it-multimodule-1') diff --git a/integration-tests/gradle/projects/it-multimodule-1/build.gradle b/integration-tests/gradle/projects/it-multimodule-1/build.gradle index aa46d030..57d22b79 100644 --- a/integration-tests/gradle/projects/it-multimodule-1/build.gradle +++ b/integration-tests/gradle/projects/it-multimodule-1/build.gradle @@ -7,8 +7,8 @@ apply from: '../template.root.gradle.kts' dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib" - compile project(':first') - compile project(':second') + implementation project(':first') + implementation project(':second') } diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties index 80455dd0..04177526 100644 --- a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties +++ b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.4.0 +dokka_it_kotlin_version=1.6.10 diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.properties index ba94df84..ec991f9a 100644 --- a/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -- cgit