diff --git a/.gitignore b/.gitignore
index 6e5d032..2a8f5da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
.gradle
build/
deploy/
-gradle.properties
### Kotlin/JVM ###
*.class
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1020055..569519b 100644
--- a/app/build.gradle.kts
+++ b/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")
}
diff --git a/app/pom.xml b/app/pom.xml
index e610169..087b75b 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -8,14 +8,14 @@
4.0.0
net.thauvin.erik
urlencoder
- 1.3.1-SNAPSHOT
+ 1.4.0-SNAPSHOT
UrlEncoder for Kotlin
A simple defensive application to encode/decode URL components
https://github.com/ethauvin/urlencoder
The Apache License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
+ https://www.apache.org/licenses/LICENSE-2.0.txt
@@ -45,13 +45,13 @@
org.jetbrains.kotlin
kotlin-stdlib-jdk8
- 1.8.0
+ 1.9.0
compile
net.thauvin.erik
urlencoder-lib
- 1.3.1-SNAPSHOT
+ 1.4.0-SNAPSHOT
runtime
diff --git a/build.gradle.kts b/build.gradle.kts
index 89e596d..97f2397 100644
--- a/build.gradle.kts
+++ b/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")
- }
-}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 5442a22..1919b2d 100644
--- a/buildSrc/build.gradle.kts
+++ b/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")
}
diff --git a/buildSrc/src/main/kotlin/buildsrc/conventions/sonarqube.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/conventions/sonarqube.gradle.kts
deleted file mode 100644
index f55c17e..0000000
--- a/buildSrc/src/main/kotlin/buildsrc/conventions/sonarqube.gradle.kts
+++ /dev/null
@@ -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().configureEach {
- dependsOn(tasks.withType())
- // workaround for https://github.com/Kotlin/kotlinx-kover/issues/394
- dependsOn(tasks.matching { it.name == "koverXmlReport" })
-}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c1962a7..033e24c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37aef8d..9f4197d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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
diff --git a/gradlew b/gradlew
index aeb74cb..fcb6fca 100755
--- a/gradlew
+++ b/gradlew
@@ -130,10 +130,13 @@ 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.
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index eee938b..ba01500 100644
--- a/lib/build.gradle.kts
+++ b/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")
}
diff --git a/lib/pom.xml b/lib/pom.xml
index 5956aa0..79c97ad 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -7,7 +7,7 @@
4.0.0
net.thauvin.erik
- urlencoder
+ urlencoder-lib
1.4.0-SNAPSHOT
UrlEncoder for Kotlin
A simple defensive library to encode/decode URL components
@@ -15,7 +15,7 @@
The Apache License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
+ https://www.apache.org/licenses/LICENSE-2.0.txt
@@ -45,7 +45,7 @@
org.jetbrains.kotlin
kotlin-stdlib-jdk8
- 1.8.21
+ 1.9.0
compile