From 1d1b8e157b1b49bc93fcc28cb06958ff58e39703 Mon Sep 17 00:00:00 2001 From: petertrr Date: Wed, 5 May 2021 17:12:42 +0300 Subject: [PATCH 1/2] Update kotlin to 1.5.0 and gradle to 7.0 --- build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4ff6336..99e0f89 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ import io.github.petertrr.configureVersioning import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest plugins { - kotlin("multiplatform") version "1.4.31" + kotlin("multiplatform") version "1.5.0" jacoco id("com.github.ben-manes.versions") version "0.38.0" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d913..f371643 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 57e0bf77ec0e20fada91cf4577f65d4d9201a783 Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Wed, 5 May 2021 17:36:33 +0300 Subject: [PATCH 2/2] Update build.gradle.kts --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 99e0f89..4d17e73 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -59,7 +59,7 @@ tasks.withType { // configure Jacoco-based code coverage reports for JVM tests executions jacoco { - toolVersion = "0.8.6" + toolVersion = "0.8.7" } val jvmTestTask by tasks.named("jvmTest") { configure { @@ -77,4 +77,4 @@ val jacocoTestReportTask by tasks.register("jacocoTestReport") { } } jvmTestTask.finalizedBy(jacocoTestReportTask) -jacocoTestReportTask.dependsOn(jvmTestTask) \ No newline at end of file +jacocoTestReportTask.dependsOn(jvmTestTask)