Bumped bld to 1.8.0

ethauvin · Jan 31, 2024 · ee2f4f3 · ee2f4f3
1 parent 3ba6479
commit ee2f4f3
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 22 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,7 +7,7 @@
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.bld/dist/bld-1.7.5.jar",
+        "${HOME}/.bld/dist/bld-1.8.0.jar",
         "lib/compile/*.jar",
         "lib/runtime/*.jar",
         "lib/test/*.jar"

diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 [![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.21-7f52ff)](https://kotlinlang.org/)
+[![bld](https://img.shields.io/badge/1.8.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
 [![Release](https://img.shields.io/github/release/ethauvin/cryptoprice.svg)](https://github.com/ethauvin/cryptoprice/releases/latest)
 [![Maven Central](https://img.shields.io/maven-central/v/net.thauvin.erik/cryptoprice)](https://central.sonatype.com/artifact/net.thauvin.erik/cryptoprice)
 [![Nexus Snapshot](https://img.shields.io/nexus/s/net.thauvin.erik/cryptoprice?label=snapshot&server=https%3A%2F%2Foss.sonatype.org%2F)](https://oss.sonatype.org/content/repositories/snapshots/net/thauvin/erik/cryptoprice/)

diff --git a/examples/bld/.idea/libraries/bld.xml b/examples/bld/.idea/libraries/bld.xml
diff --git a/examples/bld/.vscode/settings.json b/examples/bld/.vscode/settings.json
@@ -7,7 +7,7 @@
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.bld/dist/bld-1.7.5.jar",
+        "${HOME}/.bld/dist/bld-1.8.0.jar",
         "lib/compile/*.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
diff --git a/examples/bld/lib/bld/bld-wrapper.properties b/examples/bld/lib/bld/bld-wrapper.properties
@@ -4,4 +4,4 @@ bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.0-SNAPSHOT
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
 bld.sourceDirectories=
-bld.version=1.7.5
+bld.version=1.8.0
diff --git a/examples/bld/src/bld/java/com/example/CryptoPriceExampleBuild.java b/examples/bld/src/bld/java/com/example/CryptoPriceExampleBuild.java
@@ -25,7 +25,7 @@ public CryptoPriceExampleBuild() {
         repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY);
 
         scope(compile)
-                .include(dependency("net.thauvin.erik", "cryptoprice", version(1, 0, 2)))
+                .include(dependency("net.thauvin.erik", "cryptoprice", version(1, 0, 3, "SNAPSHOT")))
                 .include(dependency("org.json", "json", "20231013"));
     }
 

diff --git 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.50.0"
-    kotlin("jvm") version "1.9.21"
+    id("com.github.ben-manes.versions") version "0.51.0"
+    kotlin("jvm") version "1.9.22"
 }
 
 defaultTasks(ApplicationPlugin.TASK_RUN_NAME)

diff --git 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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar
diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
@@ -1,9 +1,9 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
-bld.extension.jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.1
-bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.0-SNAPSHOT
-bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.0-SNAPSHOT
+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.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
 bld.sourceDirectories=
-bld.version=1.7.5
+bld.version=1.8.0
diff --git a/src/bld/java/net/thauvin/erik/crypto/CryptoPriceBuild.java b/src/bld/java/net/thauvin/erik/crypto/CryptoPriceBuild.java
@@ -36,17 +36,14 @@ public CryptoPriceBuild() {
         autoDownloadPurge = true;
         repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL);
 
-        final var kotlin = version(1, 9, 21);
+        final var kotlin = version(1, 9, 22);
         scope(compile)
                 .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin))
-                .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib-common", kotlin))
-                .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib-jdk7", kotlin))
-                .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib-jdk8", kotlin))
                 .include(dependency("org.json", "json", "20231013"))
                 .include(dependency("com.squareup.okhttp3", "okhttp", version(4, 12, 0)));
         scope(test)
-                .include(dependency("com.willowtreeapps.assertk", "assertk-jvm", version(0, 27, 0)))
-                .include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", version(1, 9, 21)))
+                .include(dependency("com.willowtreeapps.assertk", "assertk-jvm", version(0, 28, 0)))
+                .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)));