From a000f0d72d187164f3f76ef56fd306dbf896f953 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 18 Feb 2023 00:59:26 -0800 Subject: [PATCH 1/2] Minor cleanup --- README.md | 2 +- src/test/kotlin/net/thauvin/erik/jokeapi/JokeUtilTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 918a017..8f46b2a 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.10-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/jokeapi?label=snapshot&server=https%3A%2F%2Foss.sonatype.org%2F)](https://oss.sonatype.org/content/repositories/snapshots/net/thauvin/erik/jokeapi/) [![Release](https://img.shields.io/github/release/ethauvin/jokeapi.svg)](https://github.com/ethauvin/jokeapi/releases/latest) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/net.thauvin.erik/jokeapi/badge.svg?color=blue)](https://maven-badges.herokuapp.com/maven-central/net.thauvin.erik/jokeapi) diff --git a/src/test/kotlin/net/thauvin/erik/jokeapi/JokeUtilTest.kt b/src/test/kotlin/net/thauvin/erik/jokeapi/JokeUtilTest.kt index c61191e..8f8d936 100644 --- a/src/test/kotlin/net/thauvin/erik/jokeapi/JokeUtilTest.kt +++ b/src/test/kotlin/net/thauvin/erik/jokeapi/JokeUtilTest.kt @@ -55,6 +55,6 @@ internal class JokeUtilTest { fun `Validate Authentication Header`() { val token = "AUTH-TOKEN" val body = fetchUrl("https://postman-echo.com/get", token) - assertThat(body, "body").contains("\"authentication\":\"$token\"") + assertThat(body, "body").contains("\"authentication\": \"$token\"") } } From 637503a0b242d60dd3ed8a5bc7d74e941a91623e Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 18 Feb 2023 00:59:43 -0800 Subject: [PATCH 2/2] Upgraded to Gradle 8.0.1 --- build.gradle.kts | 10 +++++++++- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 14424cd..604ff10 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { 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.10" } @@ -77,6 +77,14 @@ tasks { } } + withType().configureEach { + this.jvmTarget = java.targetCompatibility.toString() + } + + withType().configureEach { + this.jvmTarget = java.targetCompatibility.toString() + } + withType { destination = file("$projectDir/pom.xml") } 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