diff --git a/.circleci/config.yml b/.circleci/config.yml
index d753e7d..29685bf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,19 +30,19 @@ defaults_gradle: &defaults_gradle
path: build/reports/
jobs:
- build_gradle_jdk17:
+ build_gradle_jdk18:
<<: *defaults
docker:
- - image: cimg/openjdk:17.0
+ - image: cimg/openjdk:18.0
<<: *defaults_gradle
- build_gradle_jdk8:
+ build_gradle_jdk11:
<<: *defaults
docker:
- - image: cimg/openjdk:8.0
+ - image: cimg/openjdk:11.0
<<: *defaults_gradle
@@ -50,5 +50,5 @@ workflows:
version: 2
gradle:
jobs:
- - build_gradle_jdk8
- - build_gradle_jdk17
+ - build_gradle_jdk11
+ - build_gradle_jdk18
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index a6c65b3..a444416 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
- java-version: [ 1.8, 11, 17 ]
+ java-version: [ 11, 18 ]
steps:
- uses: actions/checkout@v2
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 23f4bb5..a55e7a1 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,6 +1,5 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..dd4c951
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index dd60c24..646928b 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -36,5 +36,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 756fbd7..aad8db4 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -5,7 +5,10 @@
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/README.md b/README.md
index a79e85e..e3c34cb 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
[](https://opensource.org/licenses/BSD-3-Clause) [](https://github.com/ethauvin/pinboard-poster/releases/latest) [](https://search.maven.org/search?q=g:%22net.thauvin.erik%22%20AND%20a:%22pinboard-poster%22)
-[](https://snyk.io/test/github/ethauvin/pinboard-poster?targetFile=pom.xml) [](https://sonarcloud.io/dashboard?id=ethauvin_pinboard-poster) [](https://github.com/ethauvin/pinboard-poster/actions/workflows/gradle.yml) [](https://circleci.com/gh/ethauvin/pinboard-poster/tree/master)
+[](https://sonarcloud.io/dashboard?id=ethauvin_pinboard-poster) [](https://github.com/ethauvin/pinboard-poster/actions/workflows/gradle.yml) [](https://circleci.com/gh/ethauvin/pinboard-poster/tree/master)
A small Kotlin/Java/Android library for posting to [Pinboard](https://pinboard.in).
@@ -37,6 +37,10 @@ Your API authentication token is available on the [Pinboard settings page](https
To install and run from Gradle, add the following to the build.gradle file:
```gradle
+repositories {
+ mavenCentral()
+}
+
dependencies {
compile 'net.thauvin.erik:pinboard-poster:1.0.4'
}
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 7d98402..a9514a0 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -1,4 +1,4 @@
-image: openjdk:8
+image: maven:3-openjdk-18
pipelines:
default:
diff --git a/build.gradle.kts b/build.gradle.kts
index b4d8b84..b1fc045 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,14 +5,14 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
plugins {
id("com.github.ben-manes.versions") version "0.42.0"
- id("io.gitlab.arturbosch.detekt") version "1.20.0"
+ id("io.gitlab.arturbosch.detekt") version "1.21.0"
id("java")
id("maven-publish")
- id("org.jetbrains.dokka") version "1.6.21"
- id("org.jetbrains.kotlinx.kover") version "0.5.0"
- id("org.sonarqube") version "3.3"
+ id("org.jetbrains.dokka") version "1.7.10"
+ id("org.jetbrains.kotlinx.kover") version "0.6.0"
+ id("org.sonarqube") version "3.4.0.2513"
id("signing")
- kotlin("jvm") version "1.6.21"
+ kotlin("jvm") version "1.7.20"
}
group = "net.thauvin.erik"
@@ -27,7 +27,7 @@ var isRelease = "release" in gradle.startParameter.taskNames
val publicationName = "mavenJava"
object Versions {
- const val OKHTTP = "4.9.3"
+ const val OKHTTP = "4.10.0"
}
fun isNonStable(version: String): Boolean {
@@ -48,12 +48,12 @@ dependencies {
implementation("com.squareup.okhttp3:okhttp:${Versions.OKHTTP}")
implementation("com.squareup.okhttp3:logging-interceptor:${Versions.OKHTTP}")
- testImplementation("org.testng:testng:7.5")
+ testImplementation("org.testng:testng:7.6.1")
}
java {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
withSourcesJar()
}
@@ -68,7 +68,7 @@ sonarqube {
property("sonar.organization", "ethauvin-github")
property("sonar.host.url", "https://sonarcloud.io")
property("sonar.sourceEncoding", "UTF-8")
- property("sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/kover/report.xml")
+ property("sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/kover/xml/report.xml")
}
}
@@ -117,6 +117,7 @@ tasks {
val copyToDeploy by registering(Copy::class) {
from(configurations.runtimeClasspath) {
exclude("annotations-*.jar")
+ exclude("kotlin-*.jar")
}
from(jar)
into(deployDir)
@@ -125,7 +126,7 @@ tasks {
register("deploy") {
description = "Copies all needed files to the $deployDir directory."
group = PublishingPlugin.PUBLISH_TASK_GROUP
- dependsOn(build, jar)
+ dependsOn(clean, wrapper, build, jar)
outputs.dir(deployDir)
inputs.files(copyToDeploy)
mustRunAfter(clean)
diff --git a/deploy.sh b/deploy.sh
new file mode 100755
index 0000000..f7caf5f
--- /dev/null
+++ b/deploy.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+./gradlew deploy
+[ $? -eq 0 ] && scp deploy/*.jar nix3.thauvin.us:/opt/lib/jtalk-ee/pinboard-poster
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa991fc..ae04661 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/samples/java/build.gradle b/samples/java/build.gradle
index b09c5bb..b140459 100644
--- a/samples/java/build.gradle
+++ b/samples/java/build.gradle
@@ -11,8 +11,8 @@ defaultTasks 'run'
mainClassName = 'net.thauvin.erik.pinboard.samples.JavaExample'
java {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
}
repositories {
diff --git a/samples/java/gradle/wrapper/gradle-wrapper.properties b/samples/java/gradle/wrapper/gradle-wrapper.properties
index aa991fc..ae04661 100644
--- a/samples/java/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/samples/kotlin/build.gradle.kts b/samples/kotlin/build.gradle.kts
index 3379bfd..8f087af 100644
--- a/samples/kotlin/build.gradle.kts
+++ b/samples/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.42.0"
- kotlin("jvm") version "1.6.21"
+ kotlin("jvm") version "1.7.20"
}
// ./gradlew run
@@ -20,8 +20,8 @@ dependencies {
}
java {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
}
application {
diff --git a/samples/kotlin/gradle/wrapper/gradle-wrapper.properties b/samples/kotlin/gradle/wrapper/gradle-wrapper.properties
index aa991fc..ae04661 100644
--- a/samples/kotlin/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/kotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/net/thauvin/erik/pinboard/PinboardPoster.kt b/src/main/kotlin/net/thauvin/erik/pinboard/PinboardPoster.kt
index 92a59a6..f9a8a52 100644
--- a/src/main/kotlin/net/thauvin/erik/pinboard/PinboardPoster.kt
+++ b/src/main/kotlin/net/thauvin/erik/pinboard/PinboardPoster.kt
@@ -81,7 +81,6 @@ open class PinboardPoster() {
* @param properties The properties.
* @param key The property key.
*/
- @Suppress("unused")
@JvmOverloads
constructor(properties: Properties, key: String = Constants.ENV_API_TOKEN) : this() {
apiToken = properties.getProperty(key, apiToken)
@@ -121,7 +120,6 @@ open class PinboardPoster() {
var apiEndPoint: String = Constants.API_ENDPOINT
/** The logger instance. **/
- @Suppress("MemberVisibilityCanBePrivate")
val logger: Logger by lazy { Logger.getLogger(PinboardPoster::class.java.simpleName) }
private val client by lazy {