From dedb3a4ad4d775104e04278cbc95e91fc3ce22f8 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 8 Nov 2017 23:04:20 -0800 Subject: [PATCH 001/190] Fixed examples links. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9a9a920..3692d75 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ poster.addPin("http://www.example.com/foo", "This is a test") poster.deletePin("http:///www.example.com/bar") ``` -[View Example](https://github.com/ethauvin/pinboard-poster/blob/master/src/main/kotlin/net/thauvin/erik/pinboard/PinboardPoster.kt#L219) +[View Example](https://github.com/ethauvin/pinboard-poster/blob/master/src/main/kotlin/net/thauvin/erik/pinboard/PinboardPoster.kt#L232) ### Java ```java @@ -27,7 +27,7 @@ final PinboardPoster poster = new PinBboardPoster("user:TOKEN"); poster.addPin("http://www.example.com/foo", "This is a test"); poster.deletePin("http:///www.example.com/bar"); ``` -[View Example](https://github.com/ethauvin/pinboard-poster/blob/master/src/main/java/net/thauvin/erik/pinboard/JavaExample.java) +[View Example](https://github.com/ethauvin/pinboard-poster/blob/master/src/main/java/net/thauvin/erik/pinboard/JavaExample.java#L40) Your API authentication token is available on the [Pinboard settings page](https://pinboard.in/settings/password). From 96695c8bfdebf746c27a9b5b8ea7a0cef101a80c Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 16 Jan 2018 14:31:06 -0800 Subject: [PATCH 002/190] Updated copyright. --- .idea/copyright/Erik_s_Copyright_Notice.xml | 3 +-- LICENCE.txt | 2 +- src/main/java/net/thauvin/erik/pinboard/JavaExample.java | 2 +- .../kotlin/net/thauvin/erik/pinboard/PinboardPoster.kt | 7 ++++++- .../kotlin/net/thauvin/erik/pinboard/PinboardPosterTest.kt | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.idea/copyright/Erik_s_Copyright_Notice.xml b/.idea/copyright/Erik_s_Copyright_Notice.xml index 08660a1..e000a9b 100644 --- a/.idea/copyright/Erik_s_Copyright_Notice.xml +++ b/.idea/copyright/Erik_s_Copyright_Notice.xml @@ -1,6 +1,5 @@ - \ No newline at end of file diff --git a/LICENCE.txt b/LICENCE.txt index 861c1ef..8bbc8da 100644 --- a/LICENCE.txt +++ b/LICENCE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2017, Erik C. Thauvin (erik@thauvin.net) +Copyright (c) 2017-2018, Erik C. Thauvin (erik@thauvin.net) All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/main/java/net/thauvin/erik/pinboard/JavaExample.java b/src/main/java/net/thauvin/erik/pinboard/JavaExample.java index d252652..6f609a6 100644 --- a/src/main/java/net/thauvin/erik/pinboard/JavaExample.java +++ b/src/main/java/net/thauvin/erik/pinboard/JavaExample.java @@ -1,7 +1,7 @@ /* * JavaExample.java * - * Copyright (c) 2017, Erik C. Thauvin (erik@thauvin.net) + * Copyright (c) 2017-2018, Erik C. Thauvin (erik@thauvin.net) * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/kotlin/net/thauvin/erik/pinboard/PinboardPoster.kt b/src/main/kotlin/net/thauvin/erik/pinboard/PinboardPoster.kt index 495a11d..7f6d8d5 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, Erik C. Thauvin (erik@thauvin.net) + * Copyright (c) 2017-2018, Erik C. Thauvin (erik@thauvin.net) * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,6 +36,7 @@ import okhttp3.HttpUrl import okhttp3.OkHttpClient import okhttp3.Request import org.xml.sax.InputSource +import java.io.File import java.io.StringReader import java.net.URL import java.nio.file.Files @@ -76,6 +77,10 @@ open class PinboardPoster() { } } + @Suppress("unused") + @JvmOverloads + constructor(propertyFile: File, key: String = ENV_API_TOKEN) : this(propertyFile.toPath(), key) + var apiToken: String = if (System.getenv(ENV_API_TOKEN).isNullOrBlank()) "" else System.getenv(ENV_API_TOKEN) var apiEndPoint: String = Constants.API_ENDPOINT diff --git a/src/test/kotlin/net/thauvin/erik/pinboard/PinboardPosterTest.kt b/src/test/kotlin/net/thauvin/erik/pinboard/PinboardPosterTest.kt index 06cf351..83c417e 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, Erik C. Thauvin (erik@thauvin.net) + * Copyright (c) 2017-2018, Erik C. Thauvin (erik@thauvin.net) * All rights reserved. * * Redistribution and use in source and binary forms, with or without From 961167daeecdae6bdb77c9692ca085c7b9a903f9 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 16 Jan 2018 14:32:39 -0800 Subject: [PATCH 003/190] Moved to Gemasium since VersionEye is shutting down. --- README.md | 2 +- kobalt/src/Build.kt | 16 +++++++--------- pom.xml | 6 +++--- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 3692d75..06133ce 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # [Pinboard](https://pinboard.in) Poster for Kotlin/Java [![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](http://opensource.org/licenses/BSD-3-Clause) [![release](http://github-release-version.herokuapp.com/github/ethauvin/pinboard-poster/release.svg?style=flat)](https://github.com/ethauvin/pinboard-poster/releases/latest) [![Download](https://api.bintray.com/packages/ethauvin/maven/pinboard-poster/images/download.svg)](https://bintray.com/ethauvin/maven/pinboard-poster/_latestVersion) -[![Dependency Status](https://www.versioneye.com/user/projects/591c0293b81f680038a784b3/badge.svg?style=flat-square)](https://www.versioneye.com/user/projects/591c0293b81f680038a784b3) [![Build Status](https://travis-ci.org/ethauvin/pinboard-poster.svg?branch=master)](https://travis-ci.org/ethauvin/pinboard-poster) [![CircleCI](https://circleci.com/gh/ethauvin/pinboard-poster/tree/master.svg?style=shield)](https://circleci.com/gh/ethauvin/pinboard-poster/tree/master) +[![Dependency Status](https://beta.gemnasium.com/badges/github.com/ethauvin/pinboard-poster.svg)](https://beta.gemnasium.com/projects/github.com/ethauvin/pinboard-poster) [![Build Status](https://travis-ci.org/ethauvin/pinboard-poster.svg?branch=master)](https://travis-ci.org/ethauvin/pinboard-poster) [![CircleCI](https://circleci.com/gh/ethauvin/pinboard-poster/tree/master.svg?style=shield)](https://circleci.com/gh/ethauvin/pinboard-poster/tree/master) A small Kotlin/Java library for posting to [Pinboard](https://pinboard.in). diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 0439817..5412ae9 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -6,14 +6,14 @@ import com.beust.kobalt.plugin.packaging.install import com.beust.kobalt.plugin.publish.autoGitTag import com.beust.kobalt.plugin.publish.bintray import com.beust.kobalt.project -import net.thauvin.erik.kobalt.plugin.versioneye.versionEye +import net.thauvin.erik.kobalt.plugin.pom2xml.pom2xml import org.apache.maven.model.Developer import org.apache.maven.model.License import org.apache.maven.model.Model import org.apache.maven.model.Scm val bs = buildScript { - plugins("net.thauvin.erik:kobalt-versioneye:", "net.thauvin.erik:kobalt-maven-local:") + plugins("net.thauvin.erik:kobalt-pom2xml:", "net.thauvin.erik:kobalt-maven-local:") } val p = project { @@ -43,8 +43,8 @@ val p = project { } dependencies { - compile("org.jetbrains.kotlin:kotlin-stdlib:1.1.51") - compile("com.squareup.okhttp3:okhttp:3.9.0") + compile("org.jetbrains.kotlin:kotlin-stdlib:1.2.10") + compile("com.squareup.okhttp3:okhttp:3.9.1") } dependenciesTest { @@ -89,9 +89,7 @@ val p = project { sign = true } - versionEye { - org = "Thauvin" - team = "Owners" - pom = true + pom2xml { + } -} +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 58cd66a..155261c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 net.thauvin.erik pinboard-poster - 0.9.2 + 0.9.3 pinboard-poster Pinboard Poster for Kotlin/Java https://github.com/ethauvin/pinboard-poster @@ -30,12 +30,12 @@ org.jetbrains.kotlin kotlin-stdlib - 1.1.51 + 1.2.10 com.squareup.okhttp3 okhttp - 3.9.0 + 3.9.1 org.testng From d6b5b2c931c686bafcd6fe09a9a3d14ff12b1449 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 16 Jan 2018 14:33:13 -0800 Subject: [PATCH 004/190] Kobalt 1.0.100 update. --- .idea/kobalt.xml | 2 +- .idea/kotlinc.xml | 7 +++++ kobalt/Build.kt.iml | 24 ++++++++-------- kobalt/wrapper/kobalt-wrapper.properties | 2 +- pinboard-poster.iml | 36 ++++++++++++------------ 5 files changed, 39 insertions(+), 32 deletions(-) create mode 100644 .idea/kotlinc.xml diff --git a/.idea/kobalt.xml b/.idea/kobalt.xml index 3e8b0d0..92b669e 100644 --- a/.idea/kobalt.xml +++ b/.idea/kobalt.xml @@ -6,7 +6,7 @@ + + org.jetbrains.kotlin + kotlin-stdlib-common + 1.9.21 + compile + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + 1.9.21 + compile + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + 1.9.21 + compile + com.squareup.okhttp3 okhttp diff --git a/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java b/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java index f30b68f..91100d8 100644 --- a/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java +++ b/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java @@ -34,6 +34,7 @@ package net.thauvin.erik.pinboard; import rife.bld.BuildCommand; import rife.bld.Project; import rife.bld.extension.CompileKotlinOperation; +import rife.bld.extension.DetektOperation; import rife.bld.extension.JacocoReportOperation; import rife.bld.extension.dokka.DokkaOperation; import rife.bld.extension.dokka.LoggingLevel; @@ -66,9 +67,13 @@ public class PinboardPosterBuild extends Project { autoDownloadPurge = true; repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL); - var okHttp = version(4, 12, 0); + final var okHttp = version(4, 12, 0); + final var kotlin = version(1, 9, 21); scope(compile) - .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", version(1, 9, 21))) + .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("com.squareup.okhttp3", "okhttp", okHttp)) .include(dependency("com.squareup.okhttp3", "logging-interceptor", okHttp)); scope(test) @@ -122,6 +127,23 @@ public class PinboardPosterBuild extends Project { .execute(); } + @BuildCommand(summary = "Checks source with Detekt") + public void detekt() throws ExitStatusException, IOException, InterruptedException { + new DetektOperation() + .fromProject(this) + .baseline("config/detekt/baseline.xml") + .execute(); + } + + @BuildCommand(value = "detekt-baseline", summary = "Creates the Detekt baseline") + public void detektBaseline() throws ExitStatusException, IOException, InterruptedException { + new DetektOperation() + .fromProject(this) + .baseline("config/detekt/baseline.xml") + .createBaseline(true) + .execute(); + } + @BuildCommand(summary = "Generates JaCoCo Reports") public void jacoco() throws IOException { new JacocoReportOperation() From e7a6b3481c38d01cd6d504d49fb46b2625963fbd Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 26 Nov 2023 00:29:39 -0800 Subject: [PATCH 148/190] Version 1.1.1 --- .../java/net/thauvin/erik/pinboard/samples/ExampleBuild.java | 2 +- examples/gradle/java/build.gradle | 2 +- examples/gradle/kotlin/build.gradle.kts | 2 +- pom.xml | 2 +- src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 cebc20c..6f1eab6 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, 1, "SNAPSHOT"))); + .include(dependency("net.thauvin.erik", "pinboard-poster", version(1, 1, 1))); } public static void main(String[] args) { diff --git a/examples/gradle/java/build.gradle b/examples/gradle/java/build.gradle index 3cf126d..a9a4334 100644 --- a/examples/gradle/java/build.gradle +++ b/examples/gradle/java/build.gradle @@ -19,5 +19,5 @@ repositories { } dependencies { - implementation 'net.thauvin.erik:pinboard-poster:1.1.1-SNAPSHOT' + implementation 'net.thauvin.erik:pinboard-poster:1.1.1' } diff --git a/examples/gradle/kotlin/build.gradle.kts b/examples/gradle/kotlin/build.gradle.kts index 151e355..4359cba 100644 --- a/examples/gradle/kotlin/build.gradle.kts +++ b/examples/gradle/kotlin/build.gradle.kts @@ -14,7 +14,7 @@ repositories { } dependencies { - implementation("net.thauvin.erik:pinboard-poster:1.1.1-SNAPSHOT") + implementation("net.thauvin.erik:pinboard-poster:1.1.1") } java { diff --git a/pom.xml b/pom.xml index c36e607..666cbb6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 net.thauvin.erik pinboard-poster - 1.1.1-SNAPSHOT + 1.1.1 pinboard-poster A small library for posting to Pinboard https://github.com/ethauvin/pinboard-poster diff --git a/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java b/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java index 91100d8..e8c0149 100644 --- a/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java +++ b/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java @@ -58,7 +58,7 @@ public class PinboardPosterBuild extends Project { public PinboardPosterBuild() { pkg = "net.thauvin.erik"; name = "pinboard-poster"; - version = version(1, 1, 1, "SNAPSHOT"); + version = version(1, 1, 1); mainClass = pkg + ".PinboardPoster"; From c9d4ec46df09dfb209c490bd9f53b3c281628626 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 26 Nov 2023 00:39:53 -0800 Subject: [PATCH 149/190] Updated version in README --- README.md | 4 ++-- .../java/net/thauvin/erik/pinboard/PinboardPosterBuild.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 73561f4..eb0a67b 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,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.0")); + .include(dependency("net.thauvin.erik:pinboard-poster:1.1.1")); ``` Be sure to use the [bld Kotlin extension](https://github.com/rife2/bld-kotlin) in your project. @@ -73,7 +73,7 @@ repositories { } dependencies { - compile 'net.thauvin.erik:pinboard-poster:1.1.0' + compile 'net.thauvin.erik:pinboard-poster:1.1.1' } ``` diff --git a/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java b/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java index e8c0149..6829cc3 100644 --- a/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java +++ b/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java @@ -58,7 +58,7 @@ public class PinboardPosterBuild extends Project { public PinboardPosterBuild() { pkg = "net.thauvin.erik"; name = "pinboard-poster"; - version = version(1, 1, 1); + version = version(1, 1, 2, "SNAPSHOT"); mainClass = pkg + ".PinboardPoster"; From 42749309887f9724eee25f5fa391855bdca7aa11 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 31 Jan 2024 15:58:22 -0800 Subject: [PATCH 150/190] Bumped bld to 1.8.0 --- .idea/libraries/bld.xml | 4 ++-- .idea/misc.xml | 1 + .vscode/settings.json | 2 +- README.md | 1 + examples/bld/.idea/libraries/bld.xml | 4 ++-- examples/bld/.vscode/settings.json | 2 +- examples/bld/lib/bld/bld-wrapper.jar | Bin 27321 -> 27293 bytes examples/bld/lib/bld/bld-wrapper.properties | 2 +- .../erik/pinboard/samples/ExampleBuild.java | 2 +- lib/bld/bld-wrapper.jar | Bin 27321 -> 27293 bytes lib/bld/bld-wrapper.properties | 8 ++++---- 11 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index ca84ff0..bff4f62 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.idea/misc.xml b/.idea/misc.xml index c80528e..2adb169 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -16,6 +16,7 @@