Upgraded to Kotlin 1.9.0

Removed Sonar plugin

.gitignore

@@ -2,7 +2,6 @@
 .gradle
 build/
 deploy/
-gradle.properties
 
 ### Kotlin/JVM ###
 *.class

app/build.gradle.kts

@@ -20,7 +20,6 @@ import org.jetbrains.dokka.gradle.DokkaTask
 plugins {
     buildsrc.conventions.lang.`kotlin-jvm`
     buildsrc.conventions.publishing
-    buildsrc.conventions.sonarqube
     id("application")
     id("com.github.ben-manes.versions")
 }

app/pom.xml

@@ -8,14 +8,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.thauvin.erik</groupId>
   <artifactId>urlencoder</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <name>UrlEncoder for Kotlin</name>
   <description>A simple defensive application to encode/decode URL components</description>
   <url>https://github.com/ethauvin/urlencoder</url>
   <licenses>
     <license>
       <name>The Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
     </license>
   </licenses>
   <developers>
@@ -45,13 +45,13 @@
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>1.8.0</version>
+      <version>1.9.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>net.thauvin.erik</groupId>
       <artifactId>urlencoder-lib</artifactId>
-      <version>1.3.1-SNAPSHOT</version>
+      <version>1.4.0-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>

build.gradle.kts

@@ -17,7 +17,6 @@
 
 plugins {
     buildsrc.conventions.base
-    buildsrc.conventions.sonarqube
 }
 
 group = "net.thauvin.erik"
@@ -27,16 +26,3 @@ dependencies {
     kover(projects.lib)
     kover(projects.app)
 }
-
-sonar {
-    properties {
-        property("sonar.projectName", rootProject.name)
-        property("sonar.projectKey", "ethauvin_${rootProject.name}")
-        property("sonar.organization", "ethauvin-github")
-        property("sonar.host.url", "https://sonarcloud.io")
-        property("sonar.sourceEncoding", "UTF-8")
-        property("sonar.coverage.jacoco.xmlReportPaths",
-            "${project.rootDir}/lib/build/reports/kover/report.xml,${project.rootDir}/app/build/reports/kover/report.xml")
-        property("sonar.log.level", "DEBUG")
-    }
-}

buildSrc/build.gradle.kts

@@ -6,7 +6,6 @@ dependencies {
     implementation("com.github.ben-manes:gradle-versions-plugin:0.47.0")
     implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.0")
     implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.8.20")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0")
     implementation("org.jetbrains.kotlinx:kover-gradle-plugin:0.7.1")
-    implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.2.0.3129")
 }

buildSrc/src/main/kotlin/buildsrc/conventions/sonarqube.gradle.kts

@@ -1,40 +0,0 @@
-/*
- * Copyright 2001-2023 Geert Bevin (gbevin[remove] at uwyn dot com)
- * Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package buildsrc.conventions
-
-import org.sonarqube.gradle.SonarTask
-
-/**
- * Convention plugin for SonarQube analysis.
- *
- * SonarQube depends on an aggregated XML coverage report from
- * [Kotlinx Kover](https://github.com/Kotlin/kotlinx-kover).
- * See the Kover docs for
- * [how to aggregate coverage reports](https://kotlin.github.io/kotlinx-kover/gradle-plugin/#multiproject-build).
- */
-
-plugins {
-    id("org.sonarqube")
-    id("org.jetbrains.kotlinx.kover")
-}
-
-tasks.withType<SonarTask>().configureEach {
-    dependsOn(tasks.withType<Test>())
-    // workaround for https://github.com/Kotlin/kotlinx-kover/issues/394
-    dependsOn(tasks.matching { it.name == "koverXmlReport" })
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,11 +130,14 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
+fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then

lib/build.gradle.kts

@@ -20,7 +20,6 @@ import org.jetbrains.dokka.gradle.DokkaTask
 plugins {
     buildsrc.conventions.lang.`kotlin-jvm`
     buildsrc.conventions.publishing
-    buildsrc.conventions.sonarqube
     id("com.github.ben-manes.versions")
 }
 

lib/pom.xml

@@ -7,7 +7,7 @@
   <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.thauvin.erik</groupId>
-  <artifactId>urlencoder</artifactId>
+  <artifactId>urlencoder-lib</artifactId>
   <version>1.4.0-SNAPSHOT</version>
   <name>UrlEncoder for Kotlin</name>
   <description>A simple defensive library to encode/decode URL components</description>
@@ -15,7 +15,7 @@
   <licenses>
     <license>
       <name>The Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
     </license>
   </licenses>
   <developers>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>1.8.21</version>
+      <version>1.9.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>