Skip to content

Update kotlin to 1.5.0 and gradle to 7.0 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 5, 2021
Merged

Update kotlin to 1.5.0 and gradle to 7.0 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d1b8e1
Update kotlin to 1.5.0 and gradle to 7.0
petertrr May 5, 2021
57e0bf7
Update build.gradle.kts
petertrr May 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -59,7 +59,7 @@ tasks.withType<KotlinJvmTest> {

// configure Jacoco-based code coverage reports for JVM tests executions
jacoco {
toolVersion = "0.8.6"
toolVersion = "0.8.7"
}
val jvmTestTask by tasks.named<KotlinJvmTest>("jvmTest") {
configure<JacocoTaskExtension> {
Expand All @@ -77,4 +77,4 @@ val jacocoTestReportTask by tasks.register<JacocoReport>("jacocoTestReport") {
}
}
jvmTestTask.finalizedBy(jacocoTestReportTask)
jacocoTestReportTask.dependsOn(jvmTestTask)
jacocoTestReportTask.dependsOn(jvmTestTask)
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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