diff --git a/.circleci/config.yml b/.circleci/config.yml
index 77889be..09d8896 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ defaults: &defaults
TERM: dumb
CI_NAME: "CircleCI"
-defaults_gradle: &defaults_bld
+defaults_bld: &defaults_bld
steps:
- checkout
- run:
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5633e79..1b057c3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,7 +8,9 @@
"java.configuration.updateBuildConfiguration": "automatic",
"java.project.referencedLibraries": [
"${HOME}/.bld/dist/bld-1.8.0.jar",
+ "lib/bld/*.jar",
"lib/compile/*.jar",
+ "lib/provided/*.jar",
"lib/runtime/*.jar",
"lib/test/*.jar"
]
diff --git a/examples/bld/.vscode/settings.json b/examples/bld/.vscode/settings.json
index 5633e79..1b057c3 100644
--- a/examples/bld/.vscode/settings.json
+++ b/examples/bld/.vscode/settings.json
@@ -8,7 +8,9 @@
"java.configuration.updateBuildConfiguration": "automatic",
"java.project.referencedLibraries": [
"${HOME}/.bld/dist/bld-1.8.0.jar",
+ "lib/bld/*.jar",
"lib/compile/*.jar",
+ "lib/provided/*.jar",
"lib/runtime/*.jar",
"lib/test/*.jar"
]
diff --git a/examples/bld/lib/bld/bld-wrapper.jar b/examples/bld/lib/bld/bld-wrapper.jar
index 5db889b..83ed707 100644
Binary files a/examples/bld/lib/bld/bld-wrapper.jar and b/examples/bld/lib/bld/bld-wrapper.jar differ
diff --git a/examples/bld/src/bld/java/com/example/ExampleBuild.java b/examples/bld/src/bld/java/com/example/ExampleBuild.java
index d5645a1..dabe0a3 100644
--- a/examples/bld/src/bld/java/com/example/ExampleBuild.java
+++ b/examples/bld/src/bld/java/com/example/ExampleBuild.java
@@ -24,8 +24,8 @@ public class ExampleBuild extends BaseProject {
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY);
scope(compile)
- .include(dependency("net.thauvin.erik:bitly-shorten:1.0.1"))
- .include(dependency("org.json:json:20231013"));
+ .include(dependency("net.thauvin.erik:bitly-shorten:1.0.2-SNAPSHOT"))
+ .include(dependency("org.json:json:20240205"));
}
public static void main(String[] args) {
diff --git a/examples/gradle/build.gradle.kts b/examples/gradle/build.gradle.kts
index 24fdffd..bae658f 100644
--- a/examples/gradle/build.gradle.kts
+++ b/examples/gradle/build.gradle.kts
@@ -18,7 +18,7 @@ repositories {
dependencies {
implementation("net.thauvin.erik:bitly-shorten:1.0.1")
- implementation("org.json:json:20231013")
+ implementation("org.json:json:20240205")
}
application {
diff --git a/examples/gradle/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/gradle/wrapper/gradle-wrapper.jar
index 7f93135..d64cd49 100644
Binary files a/examples/gradle/gradle/wrapper/gradle-wrapper.jar and b/examples/gradle/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/examples/gradle/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/gradle/wrapper/gradle-wrapper.properties
index 1af9e09..a80b22c 100644
--- a/examples/gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/gradle/gradlew.bat b/examples/gradle/gradlew.bat
index 93e3f59..25da30d 100644
--- a/examples/gradle/gradlew.bat
+++ b/examples/gradle/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar
index 5db889b..83ed707 100644
Binary files a/lib/bld/bld-wrapper.jar and b/lib/bld/bld-wrapper.jar differ
diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index 826f8dd..064de94 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -2,7 +2,7 @@ bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true
bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.2
bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.0
-bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.0
+bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.1
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.downloadLocation=
bld.sourceDirectories=
diff --git a/pom.xml b/pom.xml
index 8f5ea55..8702bcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,18 @@
1.9.22
compile
+
+ org.jetbrains.kotlin
+ kotlin-stdlib-common
+ 1.9.22
+ compile
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib-jdk8
+ 1.9.22
+ compile
+
com.squareup.okhttp3
okhttp
@@ -36,7 +48,7 @@
org.json
json
- 20231013
+ 20240205
compile
diff --git a/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java b/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java
index 43c9c58..5924c98 100644
--- a/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java
+++ b/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java
@@ -69,14 +69,19 @@ public class BitlyShortenBuild extends Project {
var okHttp = version(4, 12, 0);
final var kotlin = version(1, 9, 22);
scope(compile)
+ // Kotlin
.include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin))
+ .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib-common", kotlin))
+ .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib-jdk8", kotlin))
+ //
.include(dependency("com.squareup.okhttp3", "okhttp", okHttp))
.include(dependency("com.squareup.okhttp3", "logging-interceptor", okHttp))
- .include(dependency("org.json", "json", "20231013"));
+ // JSON
+ .include(dependency("org.json", "json", "20240205"));
scope(test)
.include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", kotlin))
- .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("org.junit.jupiter", "junit-jupiter", version(5, 10, 2)))
+ .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2)))
.include(dependency("com.willowtreeapps.assertk", "assertk-jvm", version(0, 28, 0)));
publishOperation()