diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 95570c9..0419392 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: java-version: [17, 21, 23] - kotlin-version: [1.9.24, 2.1.0] + kotlin-version: [1.9.25, 2.1.10] steps: - name: Checkout source repository diff --git a/.idea/icon.svg b/.idea/icon.svg new file mode 100644 index 0000000..94a6708 --- /dev/null +++ b/.idea/icon.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 5c4010c..153a060 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index 4c33beb..ba429d0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-2.1.0.jar", + "${HOME}/.bld/dist/bld-2.2.1.jar", "lib/**/*.jar" ] } diff --git a/LICENSE.txt b/LICENSE.txt index 54bfa71..9926d00 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2017-2024, Erik C. Thauvin (erik@thauvin.net) +Copyright (c) 2017-2025, Erik C. Thauvin (erik@thauvin.net) All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/README.md b/README.md index 34ff437..f892b2d 100644 --- 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.1.0-7f52ff)](https://kotlinlang.org/) -[![bld](https://img.shields.io/badge/2.1.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![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/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/) @@ -55,7 +55,7 @@ To use with [bld](https://rife2.com/bld), include the following dependency in yo repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY); scope(compile) - .include(dependency("net.thauvin.erik:pinboard-poster:1.1.1")); + .include(dependency("net.thauvin.erik:pinboard-poster:1.2.0")); ``` Be sure to use the [bld Kotlin extension](https://github.com/rife2/bld-kotlin) in your project. @@ -71,7 +71,7 @@ repositories { } dependencies { - compile 'net.thauvin.erik:pinboard-poster:1.1.1' + compile 'net.thauvin.erik:pinboard-poster:1.2.0' } ``` diff --git a/examples/bld/.idea/libraries/bld.xml b/examples/bld/.idea/libraries/bld.xml index 5c4010c..153a060 100644 --- a/examples/bld/.idea/libraries/bld.xml +++ b/examples/bld/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/examples/bld/.vscode/settings.json b/examples/bld/.vscode/settings.json index 4c33beb..ba429d0 100644 --- 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-2.1.0.jar", + "${HOME}/.bld/dist/bld-2.2.1.jar", "lib/**/*.jar" ] } diff --git a/examples/bld/lib/bld/bld-wrapper.jar b/examples/bld/lib/bld/bld-wrapper.jar index 41cfbb1..968a8ab 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/lib/bld/bld-wrapper.properties b/examples/bld/lib/bld/bld-wrapper.properties index 686fe3c..1ffe3ff 100644 --- 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.downloadLocation= -bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.3 +bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.4 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.sourceDirectories= -bld.version=2.1.0 +bld.version=2.2.1 diff --git a/examples/bld/src/bld/java/net/thauvin/erik/pinboard/samples/ExampleBuild.java b/examples/bld/src/bld/java/net/thauvin/erik/pinboard/samples/ExampleBuild.java index 3fee4a8..e706cb7 100644 --- a/examples/bld/src/bld/java/net/thauvin/erik/pinboard/samples/ExampleBuild.java +++ b/examples/bld/src/bld/java/net/thauvin/erik/pinboard/samples/ExampleBuild.java @@ -25,7 +25,7 @@ public class ExampleBuild extends BaseProject { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY); scope(compile) - .include(dependency("net.thauvin.erik", "pinboard-poster", version(1, 1, 2, "SNAPSHOT"))); + .include(dependency("net.thauvin.erik", "pinboard-poster", version(1, 2, 0))); } public static void main(String[] args) { diff --git a/examples/gradle/java/build.gradle b/examples/gradle/java/build.gradle index 36833f6..4d15fa4 100644 --- a/examples/gradle/java/build.gradle +++ b/examples/gradle/java/build.gradle @@ -21,5 +21,5 @@ repositories { } dependencies { - implementation 'net.thauvin.erik:pinboard-poster:1.1.2-SNAPSHOT' + implementation 'net.thauvin.erik:pinboard-poster:1.2.0' } diff --git a/examples/gradle/java/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/java/gradle/wrapper/gradle-wrapper.jar index a4b76b9..9bbc975 100644 Binary files a/examples/gradle/java/gradle/wrapper/gradle-wrapper.jar and b/examples/gradle/java/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/gradle/java/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/java/gradle/wrapper/gradle-wrapper.properties index cea7a79..37f853b 100644 --- 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.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/examples/gradle/java/gradlew b/examples/gradle/java/gradlew index f3b75f3..faf9300 100755 --- a/examples/gradle/java/gradlew +++ b/examples/gradle/java/gradlew @@ -205,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. diff --git a/examples/gradle/kotlin/build.gradle.kts b/examples/gradle/kotlin/build.gradle.kts index 814708a..74e5812 100644 --- 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.1.0" + kotlin("jvm") version "2.1.10" } defaultTasks(ApplicationPlugin.TASK_RUN_NAME) @@ -14,7 +14,7 @@ repositories { } dependencies { - implementation("net.thauvin.erik:pinboard-poster:1.1.1") + implementation("net.thauvin.erik:pinboard-poster:1.2.0") } java { diff --git a/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.jar index a4b76b9..9bbc975 100644 Binary files a/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.jar and b/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/kotlin/gradle/wrapper/gradle-wrapper.properties index cea7a79..37f853b 100644 --- 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.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/examples/gradle/kotlin/gradlew b/examples/gradle/kotlin/gradlew index f3b75f3..faf9300 100755 --- a/examples/gradle/kotlin/gradlew +++ b/examples/gradle/kotlin/gradlew @@ -205,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index d6229f9..7add961 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 04271d1..154abb0 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,10 +1,10 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= -bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.7 -bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.2 -bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.8 -bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.3 +bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.9 +bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.3 +bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.9 +bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.4 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.sourceDirectories= -bld.version=2.1.0 +bld.version=2.2.1 diff --git a/pom.xml b/pom.xml index 08f5e9e..4850a68 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 net.thauvin.erik pinboard-poster - 1.1.2-SNAPSHOT + 1.2.0 pinboard-poster A small library for posting to Pinboard https://github.com/ethauvin/pinboard-poster @@ -18,19 +18,19 @@ org.jetbrains.kotlin kotlin-stdlib - 2.1.0 + 2.1.10 compile org.jetbrains.kotlin kotlin-stdlib-common - 2.1.0 + 2.1.10 compile org.jetbrains.kotlin kotlin-stdlib-jdk8 - 2.1.0 + 2.1.10 compile diff --git a/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java b/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java index 8590f52..f285b8a 100644 --- 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 (c) 2017-2024, Erik C. Thauvin (erik@thauvin.net) + * Copyright (c) 2017-2025, 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: @@ -60,7 +60,7 @@ public class PinboardPosterBuild extends Project { public PinboardPosterBuild() { pkg = "net.thauvin.erik"; name = "pinboard-poster"; - version = version(1, 1, 2, "SNAPSHOT"); + version = version(1, 2, 0); mainClass = pkg + ".PinboardPoster"; @@ -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, 1, 0); + final var kotlin = version(2, 1, 10); scope(compile) // Kotlin .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin)) @@ -81,8 +81,8 @@ 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, 11, 4))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 4))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1))); publishOperation() .repository(version.isSnapshot() ? repository(SONATYPE_SNAPSHOTS_LEGACY.location()) diff --git a/src/main/kotlin/net/thauvin/erik/pinboard/PinConfig.kt b/src/main/kotlin/net/thauvin/erik/pinboard/PinConfig.kt index 033ad59..a41e563 100644 --- a/src/main/kotlin/net/thauvin/erik/pinboard/PinConfig.kt +++ b/src/main/kotlin/net/thauvin/erik/pinboard/PinConfig.kt @@ -1,7 +1,7 @@ /* * PinConfig.kt * - * Copyright (c) 2017-2024, Erik C. Thauvin (erik@thauvin.net) + * Copyright (c) 2017-2025, 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: diff --git a/src/main/kotlin/net/thauvin/erik/pinboard/PinboardPoster.kt b/src/main/kotlin/net/thauvin/erik/pinboard/PinboardPoster.kt index f96562b..00d2cc1 100644 --- a/src/main/kotlin/net/thauvin/erik/pinboard/PinboardPoster.kt +++ b/src/main/kotlin/net/thauvin/erik/pinboard/PinboardPoster.kt @@ -1,7 +1,7 @@ /* * PinboardPoster.kt * - * Copyright (c) 2017-2024, Erik C. Thauvin (erik@thauvin.net) + * Copyright (c) 2017-2025, 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: diff --git a/src/test/kotlin/net/thauvin/erik/pinboard/PinboardPosterTest.kt b/src/test/kotlin/net/thauvin/erik/pinboard/PinboardPosterTest.kt index f4fe0df..9281df5 100644 --- a/src/test/kotlin/net/thauvin/erik/pinboard/PinboardPosterTest.kt +++ b/src/test/kotlin/net/thauvin/erik/pinboard/PinboardPosterTest.kt @@ -1,7 +1,7 @@ /* * PinboardPosterTest.kt * - * Copyright (c) 2017-2024, Erik C. Thauvin (erik@thauvin.net) + * Copyright (c) 2017-2025, 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: