diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index a848665..eb6c31c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -17,7 +17,7 @@ jobs: build: strategy: matrix: - java-version: [8, 11, 17, 21] + java-version: [11, 17, 21] os: - macos-latest - ubuntu-latest diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a930768..5ac1f4c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -25,7 +25,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: "21" + java-version: "11" distribution: "zulu" - name: Validate Gradle wrapper diff --git a/README.md b/README.md index 5f3a0b6..0e2b404 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ repositories { } dependencies { - implementation("net.thauvin.erik.urlencoder:urlencoder-lib:1.6.0") + implementation("net.thauvin.erik.urlencoder:urlencoder-lib:1.5.0") } ``` @@ -71,7 +71,7 @@ to the artifact URL. net.thauvin.erik.urlencoder urlencoder-lib-jvm - 1.6.0 + 1.5.0 ``` diff --git a/build.gradle.kts b/build.gradle.kts index 5ccf894..cd67874 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "net.thauvin.erik.urlencoder" -version = "1.6.0" +version = "1.5.0" dependencies { kover(projects.urlencoderLib) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 1819780..48a5c25 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -4,9 +4,8 @@ plugins { dependencies { implementation("com.github.ben-manes:gradle-versions-plugin:0.51.0") - implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.7") + implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.1") implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20") - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24") - implementation("org.jetbrains.kotlinx:kover-gradle-plugin:0.8.3") - implementation("org.apache.httpcomponents:httpclient:4.5.13") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23") + implementation("org.jetbrains.kotlinx:kover-gradle-plugin:0.7.4") } diff --git a/buildSrc/src/main/kotlin/buildsrc/conventions/lang/kotlin-multiplatform-base.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/conventions/lang/kotlin-multiplatform-base.gradle.kts index 3ceabc1..d41b539 100644 --- a/buildSrc/src/main/kotlin/buildsrc/conventions/lang/kotlin-multiplatform-base.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/conventions/lang/kotlin-multiplatform-base.gradle.kts @@ -45,12 +45,12 @@ kotlin { tasks { withType().configureEach { - sourceCompatibility = JavaVersion.VERSION_1_8.toString() - targetCompatibility = JavaVersion.VERSION_1_8.toString() + sourceCompatibility = JavaVersion.VERSION_11.toString() + targetCompatibility = JavaVersion.VERSION_11.toString() } withType().configureEach { - compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8) + compilerOptions.jvmTarget.set(JvmTarget.JVM_11) } withType().configureEach { diff --git a/buildSrc/src/main/kotlin/buildsrc/utils/Rife2TestListener.kt b/buildSrc/src/main/kotlin/buildsrc/utils/Rife2TestListener.kt index 59df2bd..9e70473 100644 --- a/buildSrc/src/main/kotlin/buildsrc/utils/Rife2TestListener.kt +++ b/buildSrc/src/main/kotlin/buildsrc/utils/Rife2TestListener.kt @@ -16,13 +16,14 @@ package buildsrc.utils -import org.apache.http.client.methods.HttpPost -import org.apache.http.impl.client.HttpClients -import org.apache.http.util.EntityUtils import org.gradle.api.provider.Provider import org.gradle.api.tasks.testing.TestDescriptor import org.gradle.api.tasks.testing.TestListener import org.gradle.api.tasks.testing.TestResult +import java.net.URI +import java.net.http.HttpClient +import java.net.http.HttpRequest +import java.net.http.HttpResponse class Rife2TestListener( private val testBadgeApiKey: Provider @@ -40,23 +41,23 @@ class Rife2TestListener( if (apiKey != null) { println(apiKey) - val url = "https://rife2.com/tests-badge/update/net.thauvin.erik/urlencoder?" + - "apiKey=$apiKey&" + - "passed=$passed&" + - "failed=$failed&" + - "skipped=$skipped" - - val client = HttpClients.createDefault() - val post = HttpPost(url) - - val response = client.execute(post) - val entity = response.entity - - val statusCode = response.statusLine.statusCode - val responseBody = EntityUtils.toString(entity, "UTF-8") - - println("RESPONSE: $statusCode") - println(responseBody) + val response: HttpResponse = HttpClient.newHttpClient() + .send( + HttpRequest.newBuilder() + .uri( + URI( + "https://rife2.com/tests-badge/update/net.thauvin.erik/urlencoder?" + + "apiKey=$apiKey&" + + "passed=$passed&" + + "failed=$failed&" + + "skipped=$skipped" + ) + ) + .POST(HttpRequest.BodyPublishers.noBody()) + .build(), HttpResponse.BodyHandlers.ofString() + ) + println("RESPONSE: ${response.statusCode()}") + println(response.body()) } } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9..d64cd49 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 df97d72..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -15,8 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# SPDX-License-Identifier: Apache-2.0 -# ############################################################################## # @@ -57,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -86,8 +84,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 9d21a21..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,6 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem @if "%DEBUG%"=="" @echo off @rem ##########################################################################