Updated copyright

Updated dependencies
Bumped bld to version 2.1.0 Bumped Gradle to version 8.10.1 Bumped Kotlin to version 2.0.20 Bumped JUnit to version 5.11.0
2024-09-21 12:51:17 -07:00 · 2024-09-21 12:31:57 -07:00
36 changed files with 160 additions and 104 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -1,4 +1,8 @@
-version: 2
+version: 2.1
+
+orbs:
+  sdkman: joshdholtz/sdkman@0.2.0
+
 defaults: &defaults
  working_directory: ~/repo
  environment:
@ -6,18 +10,31 @@ defaults: &defaults
    TERM: dumb
    CI_NAME: "CircleCI"

-defaults_bld: &defaults_bld
-  steps:
-    - checkout
-    - run:
-        name: Download the bld dependencies
-        command: ./bld download
-    - run:
-        name: Compile source with bld
-        command: ./bld compile
-    - run:
-        name: Run tests with bld
-        command: ./bld test
+commands:
+  build_and_test:
+    parameters:
+      reports-dir:
+        type: string
+        default: "build/reports/test_results"
+    steps:
+      - checkout
+      - sdkman/setup-sdkman
+      - sdkman/sdkman-install:
+          candidate: kotlin
+          version: 2.0.20
+      - run:
+          name: Download dependencies
+          command: ./bld download
+      - run:
+          name: Compile source
+          command: ./bld compile
+      - run:
+          name: Run tests
+          command: ./bld jacoco -reports-dir=<< parameters.reports-dir >>
+      - store_test_results:
+          path: << parameters.reports-dir >>
+      - store_artifacts:
+          path: build/reports/jacoco/test/html

 jobs:
  bld_jdk17:
@ -26,7 +43,8 @@ jobs:
    docker:
      - image: cimg/openjdk:17.0

-    <<: *defaults_bld
+    steps:
+      - build_and_test

  bld_jdk20:
    <<: *defaults
@ -34,10 +52,10 @@ jobs:
    docker:
      - image: cimg/openjdk:20.0

-    <<: *defaults_bld
+    steps:
+      - build_and_test

 workflows:
-  version: 2
  bld:
    jobs:
      - bld_jdk17
--- a/.github/workflows/bld.yml
+++ b/.github/workflows/bld.yml
@ -2,16 +2,20 @@ name: bld-ci

 on: [push, pull_request, workflow_dispatch]

+env:
+  COVERAGE_JDK: "21"
+  COVERAGE_KOTLIN: "2.0.0"
+  KOTLIN_HOME: /usr/share/kotlinc
+  PINBOARD_API_TOKEN: ${{ secrets.PINBOARD_API_TOKEN }}
+
 jobs:
  build-bld-project:
    runs-on: ubuntu-latest

-    env:
-      COVERAGE_SDK: "17"
-
    strategy:
      matrix:
        java-version: [17, 21, 22]
+        kotlin-version: [1.19.24, 2.0.20]

    steps:
      - name: Checkout source repository
@ -19,33 +23,28 @@ jobs:
        with:
          fetch-depth: 0

-      - name: Set up JDK ${{ matrix.java-version }}
+      - name: Set up JDK ${{ matrix.java-version }} with Kotlin ${{ matrix.kotlin-version }}
        uses: actions/setup-java@v4
        with:
          distribution: "zulu"
          java-version: ${{ matrix.java-version }}

-      - name: Grant bld execute permission
-        run: chmod +x bld
-
-      - name: Download the bld dependencies
+      - name: Download dependencies
        run: ./bld download

-      - name: Compile source with bld
+      - name: Compile source
        run: ./bld compile

-      - name: Run tests with bld
-        env:
-          PINBOARD_API_TOKEN: ${{ secrets.PINBOARD_API_TOKEN }}
+      - name: Run tests
        run: ./bld jacoco

      - name: Remove pom.xml
-        if: success() && matrix.java-version == env.COVERAGE_SDK
+        if: success() && matrix.java-version == env.COVERAGE_JDK && matrix.kotlin-version == env.COVERAGE_KOTLIN
        run: rm -rf pom.xml

      - name: SonarCloud Scan
        uses: sonarsource/sonarcloud-github-action@master
-        if: success() && matrix.java-version == env.COVERAGE_SDK
+        if: success() && matrix.java-version == env.COVERAGE_JDK && matrix.kotlin-version == env.COVERAGE_KOTLIN
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,11 +1,24 @@
-image: openjdk:17
+image: fedora:latest
+
+variables:
+  CI_NAME: "GitLab CI"

 stages:
  - test

+before_script:
+  - dnf -qy update && dnf -y install zip
+  - curl -s "https://get.sdkman.io" | bash
+  - echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
+  - echo sdkman_auto_selfupdate=true >> $HOME/.sdkman/etc/config
+  - source "$HOME/.sdkman/bin/sdkman-init.sh"
+  - sdk install java
+  - sdk install kotlin
+  - source "$HOME/.sdkman/bin/sdkman-init.sh"
+
 test:
  stage: test
  script:
-      - ./bld download
-      - ./bld compile
-      - ./bld test
+    - ./bld download
+    - ./bld compile
+    - ./bld test
--- a/.idea/bld.xml
+++ b/.idea/bld.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="BldConfiguration">
+    <events />
+  </component>
+</project>
--- a/.idea/copyright/Erik_s_Copyright_Notice.xml
+++ b/.idea/copyright/Erik_s_Copyright_Notice.xml
@ -1,6 +1,6 @@
 <component name="CopyrightManager">
  <copyright>
-    <option name="notice" value="&amp;#36;file.fileName&#10;&#10;Copyright 2021-&amp;#36;today.year Erik C. Thauvin (erik@thauvin.net)&#10;&#10;Redistribution and use in source and binary forms, with or without&#10;modification, are permitted provided that the following conditions are met:&#10;&#10;  Redistributions of source code must retain the above copyright notice, this&#10;  list of conditions and the following disclaimer.&#10;&#10;  Redistributions in binary form must reproduce the above copyright notice,&#10;  this list of conditions and the following disclaimer in the documentation&#10;  and/or other materials provided with the distribution.&#10;&#10;  Neither the name of this project nor the names of its contributors may be&#10;  used to endorse or promote products derived from this software without&#10;  specific prior written permission.&#10;&#10;THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&quot;&#10;AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE&#10;IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE&#10;DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE&#10;FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL&#10;DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR&#10;SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER&#10;CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,&#10;OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE&#10;OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." />
+    <option name="notice" value="&amp;#36;file.fileName&#10;&#10;Copyright (c) 2017-&amp;#36;today.year, Erik C. Thauvin (erik@thauvin.net)&#10;&#10;Redistribution and use in source and binary forms, with or without&#10;modification, are permitted provided that the following conditions are met:&#10;&#10;  Redistributions of source code must retain the above copyright notice, this&#10;  list of conditions and the following disclaimer.&#10;&#10;  Redistributions in binary form must reproduce the above copyright notice,&#10;  this list of conditions and the following disclaimer in the documentation&#10;  and/or other materials provided with the distribution.&#10;&#10;  Neither the name of this project nor the names of its contributors may be&#10;  used to endorse or promote products derived from this software without&#10;  specific prior written permission.&#10;&#10;THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&quot;&#10;AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE&#10;IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE&#10;DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE&#10;FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL&#10;DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR&#10;SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER&#10;CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,&#10;OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE&#10;OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." />
    <option name="myName" value="Erik's Copyright Notice" />
  </copyright>
 </component>
--- a/.idea/libraries/bld.xml
+++ b/.idea/libraries/bld.xml
@ -2,12 +2,12 @@
  <library name="bld">
    <CLASSES>
      <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.1.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.1.0.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
      <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.1-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.1.0-sources.jar!/" />
    </SOURCES>
    <excluded>
      <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />
--- a/.idea/libraries/compile.xml
+++ b/.idea/libraries/compile.xml
@ -7,7 +7,7 @@
    <SOURCES>
      <root url="file://$PROJECT_DIR$/lib/compile" />
    </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" type="SOURCES" />
  </library>
 </component>
--- a/.idea/libraries/runtime.xml
+++ b/.idea/libraries/runtime.xml
@ -8,7 +8,7 @@
    <SOURCES>
      <root url="file://$PROJECT_DIR$/lib/runtime" />
    </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" type="SOURCES" />
  </library>
 </component>
--- a/.idea/libraries/test.xml
+++ b/.idea/libraries/test.xml
@ -8,7 +8,7 @@
    <SOURCES>
      <root url="file://$PROJECT_DIR$/lib/test" />
    </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" type="SOURCES" />
  </library>
 </component>
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -9,7 +9,7 @@
    ],
    "java.configuration.updateBuildConfiguration": "automatic",
    "java.project.referencedLibraries": [
-        "${HOME}/.bld/dist/bld-1.9.1.jar",
+        "${HOME}/.bld/dist/bld-2.1.0.jar",
        "lib/**/*.jar"
    ]
 }
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -1,4 +1,4 @@
-Copyright (c) 2017-2023, Erik C. Thauvin (erik@thauvin.net)
+Copyright (c) 2017-2024, Erik C. Thauvin (erik@thauvin.net)
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
--- a/README.md
+++ b/README.md
@ -1,8 +1,8 @@
 # [Pinboard](https://pinboard.in) Poster for Kotlin, Java and Android

 [![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.0.0-7f52ff)](https://kotlinlang.org/)
-[![bld](https://img.shields.io/badge/1.9.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
+[![Kotlin](https://img.shields.io/badge/kotlin-2.0.20-7f52ff)](https://kotlinlang.org/)
+[![bld](https://img.shields.io/badge/2.1.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
 [![Release](https://img.shields.io/github/release/ethauvin/pinboard-poster.svg)](https://github.com/ethauvin/pinboard-poster/releases/latest)
 [![Maven Central](https://img.shields.io/maven-central/v/net.thauvin.erik/pinboard-poster.svg?color=blue)](https://central.sonatype.com/artifact/net.thauvin.erik/pinboard-poster)
 [![Nexus Snapshot](https://img.shields.io/nexus/s/net.thauvin.erik/pinboard-poster?label=snapshot&server=https%3A%2F%2Foss.sonatype.org%2F)](https://oss.sonatype.org/content/repositories/snapshots/net/thauvin/erik/pinboard-poster/)
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@ -1,10 +1,20 @@
-image: openjdk:17
+image: ubuntu:latest

 pipelines:
  default:
    - step:
        name: Test with bld
        script:
+          # Install latest Java & Kotlin via SDKMAN!
+          - apt-get update -qq && apt-get install -y curl zip
+          - curl -s "https://get.sdkman.io" | bash
+          - echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
+          - echo sdkman_auto_selfupdate=true >> $HOME/.sdkman/etc/config
+          - source "$HOME/.sdkman/bin/sdkman-init.sh"
+          - sdk install java
+          - sdk install kotlin
+          - source "$HOME/.sdkman/bin/sdkman-init.sh"
+          # Download, compile and test with bld
          - ./bld download
          - ./bld compile
          - ./bld test
--- a/examples/bld/.idea/libraries/bld.xml
+++ b/examples/bld/.idea/libraries/bld.xml
@ -2,12 +2,12 @@
  <library name="bld">
    <CLASSES>
      <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.1.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.1.0.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
      <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.1-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.1.0-sources.jar!/" />
    </SOURCES>
    <excluded>
      <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />
--- a/examples/bld/.idea/libraries/compile.xml
+++ b/examples/bld/.idea/libraries/compile.xml
@ -7,7 +7,7 @@
    <SOURCES>
      <root url="file://$PROJECT_DIR$/lib/compile" />
    </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" type="SOURCES" />
  </library>
 </component>
--- a/examples/bld/.idea/libraries/runtime.xml
+++ b/examples/bld/.idea/libraries/runtime.xml
@ -8,7 +8,7 @@
    <SOURCES>
      <root url="file://$PROJECT_DIR$/lib/runtime" />
    </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" type="SOURCES" />
  </library>
 </component>
--- a/examples/bld/.idea/libraries/test.xml
+++ b/examples/bld/.idea/libraries/test.xml
@ -8,7 +8,7 @@
    <SOURCES>
      <root url="file://$PROJECT_DIR$/lib/test" />
    </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" type="SOURCES" />
  </library>
 </component>
--- a/examples/bld/.vscode/settings.json
+++ b/examples/bld/.vscode/settings.json
@ -9,7 +9,7 @@
    ],
    "java.configuration.updateBuildConfiguration": "automatic",
    "java.project.referencedLibraries": [
-        "${HOME}/.bld/dist/bld-1.9.1.jar",
+        "${HOME}/.bld/dist/bld-2.1.0.jar",
        "lib/**/*.jar"
    ]
 }
--- a/examples/bld/lib/bld/bld-wrapper.jar
+++ b/examples/bld/lib/bld/bld-wrapper.jar
--- a/examples/bld/lib/bld/bld-wrapper.properties
+++ b/examples/bld/lib/bld/bld-wrapper.properties
@ -1,7 +1,7 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
-bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.8
-bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
+bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.2
+bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.sourceDirectories=
-bld.version=1.9.1
+bld.version=2.1.0
--- a/examples/gradle/java/gradle/wrapper/gradle-wrapper.jar
+++ b/examples/gradle/java/gradle/wrapper/gradle-wrapper.jar
--- a/examples/gradle/java/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/java/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
--- a/examples/gradle/java/gradlew
+++ b/examples/gradle/java/gradlew
@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#

 ##############################################################################
 #
@ -84,7 +86,8 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
--- a/examples/gradle/java/gradlew.bat
+++ b/examples/gradle/java/gradlew.bat
@ -13,6 +13,8 @@
@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 ##########################################################################
--- a/examples/gradle/kotlin/build.gradle.kts
+++ b/examples/gradle/kotlin/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.0.0"
+    kotlin("jvm") version "2.0.20"
 }

 defaultTasks(ApplicationPlugin.TASK_RUN_NAME)
--- a/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.jar
+++ b/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.jar
--- a/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
--- a/examples/gradle/kotlin/gradlew
+++ b/examples/gradle/kotlin/gradlew
@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#

 ##############################################################################
 #
@ -84,7 +86,8 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
--- a/examples/gradle/kotlin/gradlew.bat
+++ b/examples/gradle/kotlin/gradlew.bat
@ -13,6 +13,8 @@
@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 ##########################################################################
--- a/lib/bld/bld-wrapper.jar
+++ b/lib/bld/bld-wrapper.jar
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@ -1,9 +1,10 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
-bld.extension.jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.5
-bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.8
-bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.4
-bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
+bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.7
+bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.1
+bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.8
+bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.2
+bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.sourceDirectories=
-bld.version=1.9.1
+bld.version=2.1.0
--- a/pom.xml
+++ b/pom.xml
@ -18,19 +18,19 @@
    <dependency>
      <groupId>org.jetbrains.kotlin</groupId>
      <artifactId>kotlin-stdlib</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.20</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.jetbrains.kotlin</groupId>
      <artifactId>kotlin-stdlib-common</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.20</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.jetbrains.kotlin</groupId>
      <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.20</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java
+++ b/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java
@ -1,7 +1,7 @@
 /*
 * PinboardPosterBuild.java
 *
- * Copyright 2021-2023 Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2017-2024, Erik C. Thauvin (erik@thauvin.net)
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
@ -35,8 +35,8 @@ import rife.bld.BuildCommand;
 import rife.bld.Project;
 import rife.bld.extension.CompileKotlinOperation;
 import rife.bld.extension.DetektOperation;
+import rife.bld.extension.DokkaOperation;
 import rife.bld.extension.JacocoReportOperation;
-import rife.bld.extension.dokka.DokkaOperation;
 import rife.bld.extension.dokka.LoggingLevel;
 import rife.bld.extension.dokka.OutputFormat;
 import rife.bld.operations.exceptions.ExitStatusException;
@ -70,7 +70,7 @@ public class PinboardPosterBuild extends Project {
        repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL);

        final var okHttp = version(4, 12, 0);
-        final var kotlin = version(2, 0, 0);
+        final var kotlin = version(2, 0, 20);
        scope(compile)
                // Kotlin
                .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin))
@ -81,36 +81,34 @@ public class PinboardPosterBuild extends Project {
                .include(dependency("com.squareup.okhttp3", "logging-interceptor", okHttp));
        scope(test)
                .include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", kotlin))
-                .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("org.junit.jupiter", "junit-jupiter", version(5, 11, 0)))
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 0)));

        publishOperation()
                .repository(version.isSnapshot() ? repository(SONATYPE_SNAPSHOTS_LEGACY.location())
                        .withCredentials(property("sonatype.user"), property("sonatype.password"))
                        : repository(SONATYPE_RELEASES_LEGACY.location())
                        .withCredentials(property("sonatype.user"), property("sonatype.password")))
+                .repository(repository("github"))
                .info()
                .groupId(pkg)
                .artifactId(name)
                .description("A small library for posting to Pinboard")
                .url("https://github.com/ethauvin/" + name)
-                .developer(
-                        new PublishDeveloper()
-                                .id("ethauvin")
-                                .name("Erik C. Thauvin")
-                                .email("erik@thauvin.net")
-                                .url("https://erik.thauvin.net/")
+                .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")
+                .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)
+                .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"));
@ -124,7 +122,7 @@ public class PinboardPosterBuild extends Project {

    @BuildCommand(summary = "Compiles the Kotlin project")
    @Override
-    public void compile() throws IOException {
+    public void compile() throws Exception {
        new CompileKotlinOperation()
                .fromProject(this)
                .execute();
@ -148,7 +146,7 @@ public class PinboardPosterBuild extends Project {
    }

    @BuildCommand(summary = "Generates JaCoCo Reports")
-    public void jacoco() throws IOException {
+    public void jacoco() throws Exception {
        new JacocoReportOperation()
                .fromProject(this)
                .sourceFiles(srcMainKotlin)
@ -173,6 +171,12 @@ public class PinboardPosterBuild extends Project {
        pomRoot();
    }

+    @Override
+    public void publishLocal() throws Exception {
+        super.publishLocal();
+        pomRoot();
+    }
+
    @BuildCommand(value = "pom-root", summary = "Generates the POM file in the root directory")
    public void pomRoot() throws FileUtilsErrorException {
        PomBuilder.generateInto(publishOperation().fromProject(this).info(), dependencies(),
--- a/src/main/kotlin/net/thauvin/erik/pinboard/PinConfig.kt
+++ b/src/main/kotlin/net/thauvin/erik/pinboard/PinConfig.kt
@ -1,8 +1,7 @@
 /*
 * PinConfig.kt
 *
- * Copyright (c) 2017-2023, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
+ * Copyright (c) 2017-2024, Erik C. Thauvin (erik@thauvin.net)
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
@ -141,7 +140,5 @@ class PinConfig private constructor(builder: Builder) {
            return "Builder(url='$url', description='$description', extended='$extended'," +
                    "tags=${tags.contentToString()}, dt=$dt, replace=$replace, shared=$shared, toRead=$toRead)"
        }
-
-
    }
 }
--- a/src/main/kotlin/net/thauvin/erik/pinboard/PinboardPoster.kt
+++ b/src/main/kotlin/net/thauvin/erik/pinboard/PinboardPoster.kt
@ -1,8 +1,7 @@
 /*
 * PinboardPoster.kt
 *
- * Copyright (c) 2017-2023, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
+ * Copyright (c) 2017-2024, Erik C. Thauvin (erik@thauvin.net)
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/src/test/kotlin/net/thauvin/erik/pinboard/PinboardPosterTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/pinboard/PinboardPosterTest.kt
@ -1,8 +1,7 @@
 /*
 * PinboardPosterTest.kt
 *
- * Copyright (c) 2017-2023, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
+ * Copyright (c) 2017-2024, Erik C. Thauvin (erik@thauvin.net)
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
@ -49,7 +48,7 @@ class PinboardPosterTest {
    private val localProps = Paths.get("local.properties")
    private val isCi = "true" == System.getenv("CI")

-    private fun randomUrl(): String = "http://www.example.com/?random=" + (1000..10000).random()
+    private fun randomUrl(): String = "https://www.example.com/?random=" + (1000..10000).random()

    @Test
    fun testAddPin() {
Author	SHA1	Message	Date
Erik C. Thauvin	86ae130748	Updated copyright	2024-09-21 12:51:17 -07:00
Erik C. Thauvin	19f21f22dc	Updated dependencies Bumped bld to version 2.1.0 Bumped Gradle to version 8.10.1 Bumped Kotlin to version 2.0.20 Bumped JUnit to version 5.11.0	2024-09-21 12:31:57 -07:00