diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 64fbb4d..36e3f2b 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: java-version: [17, 21, 24] - kotlin-version: [1.9.25, 2.1.20] + kotlin-version: [1.9.25, 2.1.10] steps: - name: Checkout source repository diff --git a/README.md b/README.md index 7bff2fb..a1047e0 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-2.1.20-7f52ff)](https://kotlinlang.org/) +[![Kotlin](https://img.shields.io/badge/kotlin-2.1.10-7f52ff)](https://kotlinlang.org/) [![bld](https://img.shields.io/badge/2.2.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![release](https://img.shields.io/github/release/ethauvin/isgd-shorten.svg)](https://github.com/ethauvin/isgd-shorten/releases/latest) [![Maven Central](https://img.shields.io/maven-central/v/net.thauvin.erik/isgd-shorten.svg?color=blue)](https://central.sonatype.com/artifact/net.thauvin.erik/isgd-shorten) diff --git a/examples/gradle/build.gradle.kts b/examples/gradle/build.gradle.kts index 4154822..fcdbf8b 100644 --- a/examples/gradle/build.gradle.kts +++ b/examples/gradle/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("application") id("com.github.ben-manes.versions") version "0.51.0" - kotlin("jvm") version "2.1.20" + kotlin("jvm") version "2.1.10" } repositories { diff --git a/pom.xml b/pom.xml index 33a16b9..88cfd2e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 net.thauvin.erik isgd-shorten - 1.1.1-SNAPSHOT + 1.1.0 isgd-shorten A simple implementation of the is.gd URL shortening and lookup APIs https://github.com/ethauvin/isgd-shorten @@ -18,7 +18,7 @@ org.jetbrains.kotlin kotlin-stdlib - 2.1.20 + 2.1.10 compile diff --git a/src/bld/java/net/thauvin/erik/IsgdShortenBuild.java b/src/bld/java/net/thauvin/erik/IsgdShortenBuild.java index e7f33fc..dfe576a 100644 --- a/src/bld/java/net/thauvin/erik/IsgdShortenBuild.java +++ b/src/bld/java/net/thauvin/erik/IsgdShortenBuild.java @@ -39,7 +39,6 @@ import rife.bld.extension.DokkaOperation; import rife.bld.extension.JacocoReportOperation; import rife.bld.extension.dokka.LoggingLevel; import rife.bld.extension.dokka.OutputFormat; -import rife.bld.extension.kotlin.CompileOptions; import rife.bld.operations.exceptions.ExitStatusException; import rife.bld.publish.PomBuilder; import rife.bld.publish.PublishDeveloper; @@ -61,7 +60,7 @@ public class IsgdShortenBuild extends Project { public IsgdShortenBuild() { pkg = "net.thauvin.erik"; name = "isgd-shorten"; - version = version(1, 1, 1, "SNAPSHOT"); + version = version(1, 1, 0); javaRelease = 11; downloadSources = true; @@ -69,7 +68,7 @@ public class IsgdShortenBuild extends Project { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL); - final var kotlin = version(2, 1, 20); + final var kotlin = version(2, 1, 10); scope(compile) .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin)) .include(dependency("net.thauvin.erik.urlencoder", "urlencoder-lib-jvm", version(1, 6, 0))); @@ -119,11 +118,8 @@ public class IsgdShortenBuild extends Project { @BuildCommand(summary = "Compiles the Kotlin project") @Override public void compile() throws Exception { - final var options = new CompileOptions(); - options.jvmOptions().add("--enable-native-access=ALL-UNNAMED"); new CompileKotlinOperation() .fromProject(this) - .compileOptions(options) .execute(); } diff --git a/src/main/kotlin/net/thauvin/erik/isgd/Isgd.kt b/src/main/kotlin/net/thauvin/erik/isgd/Isgd.kt index 9157567..c48609c 100644 --- a/src/main/kotlin/net/thauvin/erik/isgd/Isgd.kt +++ b/src/main/kotlin/net/thauvin/erik/isgd/Isgd.kt @@ -33,7 +33,7 @@ package net.thauvin.erik.isgd import net.thauvin.erik.urlencoder.UrlEncoderUtil import java.net.HttpURLConnection -import java.net.URI +import java.net.URL /** * See the [is.gd API](https://is.gd/apishorteningreference.php). @@ -50,7 +50,7 @@ fun String.encode(): String = UrlEncoderUtil.encode(this) class Isgd private constructor() { companion object { private fun callApi(url: String): String { - val connection = URI(url).toURL().openConnection() as HttpURLConnection + val connection = URL(url).openConnection() as HttpURLConnection try { connection.setRequestProperty( "User-Agent",