diff --git a/README.md b/README.md index 5f930bd..ce08668 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.9.20-7f52ff)](https://kotlinlang.org/) +[![Kotlin](https://img.shields.io/badge/kotlin-1.9.21-7f52ff)](https://kotlinlang.org/) [![Nexus Snapshot](https://img.shields.io/nexus/s/net.thauvin.erik/bitly-shorten?label=snapshot&server=https%3A%2F%2Foss.sonatype.org%2F)](https://oss.sonatype.org/content/repositories/snapshots/net/thauvin/erik/bitly-shorten/) [![Release](https://img.shields.io/github/release/ethauvin/bitly-shorten.svg)](https://github.com/ethauvin/bitly-shorten/releases/latest) [![Maven Central](https://img.shields.io/maven-central/v/net.thauvin.erik/bitly-shorten.svg?color=blue)](https://central.sonatype.com/artifact/net.thauvin.erik/bitly-shorten) diff --git a/examples/bld/README.md b/examples/bld/README.md index e2b6087..2468f25 100644 --- a/examples/bld/README.md +++ b/examples/bld/README.md @@ -1,7 +1,7 @@ ## Kotlin Example To compile & run the Kotlin example: -```text +```console ./bld compile @@ -14,7 +14,7 @@ To compile & run the Kotlin example: cd To compile & run the Java example: -```text +```console ./bld compile ./bld run-java --args='https://erik.thauvin.net/ https://bit.ly/2PsNMAA' diff --git a/examples/bld/src/bld/java/com/example/ExampleBuild.java b/examples/bld/src/bld/java/com/example/ExampleBuild.java index 29e33f7..d1c9d0d 100644 --- a/examples/bld/src/bld/java/com/example/ExampleBuild.java +++ b/examples/bld/src/bld/java/com/example/ExampleBuild.java @@ -1,12 +1,10 @@ package com.example; -import rife.bld.BaseProject; import rife.bld.BuildCommand; import rife.bld.extension.CompileKotlinOperation; -import rife.bld.extension.CompileKotlinOptions; import rife.bld.operations.RunOperation; +import rife.bld.BaseProject; -import java.util.List; import static rife.bld.dependencies.Repository.*; import static rife.bld.dependencies.Scope.compile; @@ -37,11 +35,6 @@ public class ExampleBuild extends BaseProject { public void compile() throws Exception { new CompileKotlinOperation() .fromProject(this) - .compileOptions( - new CompileKotlinOptions() - .jdkRelease(javaRelease) - .verbose(true) - ) .execute(); // Also compile the Java source code diff --git a/examples/gradle/README.md b/examples/gradle/README.md index f04e364..9abc517 100644 --- a/examples/gradle/README.md +++ b/examples/gradle/README.md @@ -1,7 +1,7 @@ ## Kotlin Example To compile & run the Kotlin example: -```text +```console ./gradlew run --args='https://erik.thauvin.net/ https://bit.ly/2PsNMAA' ./gradlew runRetrieve ``` @@ -10,6 +10,6 @@ To compile & run the Kotlin example: To compile & run the Java example: -```text +```console ./gradlew runJava --args='https://erik.thauvin.net/ https://bit.ly/2PsNMAA' ``` diff --git a/examples/gradle/build.gradle.kts b/examples/gradle/build.gradle.kts index 754791d..ab96c06 100644 --- a/examples/gradle/build.gradle.kts +++ b/examples/gradle/build.gradle.kts @@ -2,8 +2,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("application") - id("com.github.ben-manes.versions") version "0.49.0" - kotlin("jvm") version "1.9.20" + id("com.github.ben-manes.versions") version "0.50.0" + kotlin("jvm") version "1.9.21" } // ./gradlew run --args='https://erik.thauvin.net/ https://bit.ly/2PsNMAA' diff --git a/pom.xml b/pom.xml index 1978052..8d2d139 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.jetbrains.kotlin kotlin-stdlib - 1.9.20 + 1.9.21 compile @@ -49,7 +49,7 @@ - scm:git:https://github.com/ethauvin/bitly-shorten + scm:git:https://github.com/ethauvin/bitly-shorten.git scm:git:git@github.com:ethauvin/bitly-shorten.git https://github.com/ethauvin/bitly-shorten diff --git a/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java b/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java index 0189627..4288cce 100644 --- a/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java +++ b/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java @@ -68,12 +68,12 @@ public class BitlyShortenBuild extends Project { var okHttp = version(4, 12, 0); scope(compile) - .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", version(1, 9, 20))) + .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", version(1, 9, 21))) .include(dependency("com.squareup.okhttp3", "okhttp", okHttp)) .include(dependency("com.squareup.okhttp3", "logging-interceptor", okHttp)) .include(dependency("org.json", "json", "20231013")); scope(test) - .include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", version(1, 9, 20))) + .include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", version(1, 9, 21))) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 1))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 1))) .include(dependency("com.willowtreeapps.assertk", "assertk-jvm", version(0, 27, 0))); @@ -88,18 +88,24 @@ public class BitlyShortenBuild extends Project { .artifactId(name) .description("A simple implementation of the Bitly link shortening API v4") .url("https://github.com/ethauvin/" + name) - .developer(new PublishDeveloper() - .id("ethauvin") - .name("Erik C. Thauvin") - .email("erik@thauvin.net") - .url("https://erik.thauvin.net/")) - .license(new PublishLicense() - .name("BSD 3-Clause") - .url("https://opensource.org/licenses/BSD-3-Clause")) - .scm(new PublishScm() - .connection("scm:git:https://github.com/ethauvin/" + name) - .developerConnection("scm:git:git@github.com:ethauvin/" + name + ".git") - .url("https://github.com/ethauvin/" + name)) + .developer( + new PublishDeveloper() + .id("ethauvin") + .name("Erik C. Thauvin") + .email("erik@thauvin.net") + .url("https://erik.thauvin.net/") + ) + .license( + new PublishLicense() + .name("BSD 3-Clause") + .url("https://opensource.org/licenses/BSD-3-Clause") + ) + .scm( + new PublishScm() + .connection("scm:git:https://github.com/ethauvin/" + name + ".git") + .developerConnection("scm:git:git@github.com:ethauvin/" + name + ".git") + .url("https://github.com/ethauvin/" + name) + ) .signKey(property("sign.key")) .signPassphrase(property("sign.passphrase")); @@ -115,11 +121,6 @@ public class BitlyShortenBuild extends Project { public void compile() throws IOException { new CompileKotlinOperation() .fromProject(this) - .compileOptions( - new CompileKotlinOptions() - .jdkRelease(javaRelease) - .verbose(true) - ) .execute(); }