From 7c56f1e9b4ef75df1ad4dff948ec20d8b03140f6 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 20 Feb 2023 15:50:19 -0800 Subject: [PATCH] Moved to Kotlin 1.8.10 --- .idea/kotlinc.xml | 2 +- README.md | 2 +- build.gradle.kts | 16 ++++++++++++---- examples/build.gradle.kts | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- pom.xml | 4 ++-- 7 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 2b8a50f..0fc3113 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/README.md b/README.md index 4265eb2..a308934 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](https://opensource.org/licenses/BSD-3-Clause) -[![Kotlin](https://img.shields.io/badge/kotlin-1.8.0-blue)](https://kotlinlang.org/) +[![Kotlin](https://img.shields.io/badge/kotlin-1.8.10-7f52ff)](https://kotlinlang.org/) [![Nexus Snapshot](https://img.shields.io/nexus/s/net.thauvin.erik/cryptoprice?label=snapshot&server=https%3A%2F%2Foss.sonatype.org%2F)](https://oss.sonatype.org/content/repositories/snapshots/net/thauvin/erik/cryptoprice/) [![Release](https://img.shields.io/github/release/ethauvin/cryptoprice.svg)](https://github.com/ethauvin/cryptoprice/releases/latest) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/net.thauvin.erik/cryptoprice/badge.svg?color=blue)](https://maven-badges.herokuapp.com/maven-central/net.thauvin.erik/cryptoprice) diff --git a/build.gradle.kts b/build.gradle.kts index ec7c712..137c513 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,15 +7,15 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { id("application") - id("com.github.ben-manes.versions") version "0.44.0" + id("com.github.ben-manes.versions") version "0.46.0" id("io.gitlab.arturbosch.detekt") version "1.22.0" id("java") id("maven-publish") id("org.jetbrains.dokka") version "1.7.20" id("org.jetbrains.kotlinx.kover") version "0.6.1" - id("org.sonarqube") version "3.5.0.2730" + id("org.sonarqube") version "4.0.0.2929" id("signing") - kotlin("jvm") version "1.8.0" + kotlin("jvm") version "1.8.10" } defaultTasks(ApplicationPlugin.TASK_RUN_NAME) @@ -104,6 +104,14 @@ tasks { } } + withType().configureEach { + this.jvmTarget = java.targetCompatibility.toString() + } + + withType().configureEach { + this.jvmTarget = java.targetCompatibility.toString() + } + withType { destination = file("$projectDir/pom.xml") } @@ -139,7 +147,7 @@ tasks { mustRunAfter(clean) } - "sonarqube" { + "sonar" { dependsOn(koverReport) } } diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts index 8710dc8..51a370d 100644 --- a/examples/build.gradle.kts +++ b/examples/build.gradle.kts @@ -2,8 +2,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("application") - id("com.github.ben-manes.versions") version "0.44.0" - kotlin("jvm") version "1.8.0" + id("com.github.ben-manes.versions") version "0.46.0" + kotlin("jvm") version "1.8.10" } // ./gradlew run diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties index 070cb70..f72df95 100644 --- a/examples/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb70..f72df95 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-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/pom.xml b/pom.xml index 661ec0f..c1887af 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ org.jetbrains.kotlin kotlin-bom - 1.8.0 + 1.8.10 pom import @@ -50,7 +50,7 @@ org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.8.0 + 1.8.10 runtime