diff --git a/.idea/bitly-shorten.iml b/.idea/bitly-shorten.iml
deleted file mode 100644
index d6ebd48..0000000
--- a/.idea/bitly-shorten.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 6b0a35d..a1fba15 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -41,5 +41,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index edbcc81..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LICENSE.txt b/LICENSE.txt
index 15551d4..695e358 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2020-2021, Erik C. Thauvin (erik@thauvin.net)
+Copyright (c) 2020-2022, Erik C. Thauvin (erik@thauvin.net)
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/build.gradle.kts b/build.gradle.kts
index 5f92a8a..e6b9a0a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,21 +1,22 @@
+import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.gradle.api.tasks.testing.logging.TestLogEvent
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.net.URL
plugins {
- id("com.github.ben-manes.versions") version "0.39.0"
- id("io.gitlab.arturbosch.detekt") version "1.18.1"
- id("jacoco")
+ id("com.github.ben-manes.versions") version "0.40.0"
+ id("io.gitlab.arturbosch.detekt") version "1.19.0"
id("java")
id("java-library")
id("maven-publish")
id("net.thauvin.erik.gradle.semver") version "1.0.4"
- id("org.jetbrains.dokka") version "1.5.30"
+ id("org.jetbrains.dokka") version "1.6.10"
+ id("org.jetbrains.kotlinx.kover") version "0.4.4"
id("org.sonarqube") version "3.3"
id("signing")
- kotlin("jvm") version "1.5.31"
- kotlin("kapt") version "1.5.31"
+ kotlin("jvm") version "1.6.10"
+ kotlin("kapt") version "1.6.10"
}
group = "net.thauvin.erik"
@@ -31,7 +32,14 @@ var semverProcessor = "net.thauvin.erik:semver:1.2.0"
val publicationName = "mavenJava"
object Versions {
- const val OKHTTP = "4.9.1"
+ const val OKHTTP = "4.9.3"
+}
+
+fun isNonStable(version: String): Boolean {
+ val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
+ val regex = "^[0-9,.v-]+(-r)?$".toRegex()
+ val isStable = stableKeyword || regex.matches(version)
+ return isStable.not()
}
repositories {
@@ -44,7 +52,7 @@ dependencies {
implementation("com.squareup.okhttp3:okhttp:${Versions.OKHTTP}")
implementation("com.squareup.okhttp3:logging-interceptor:${Versions.OKHTTP}")
- implementation("org.json:json:20210307")
+ implementation("org.json:json:20211205")
testImplementation(kotlin("test"))
testImplementation(kotlin("test-junit"))
@@ -61,24 +69,6 @@ detekt {
baseline = project.rootDir.resolve("config/detekt/baseline.xml")
}
-kotlin {
- // Add kapt.use.worker.api=false to gradle.properties (JDK 16+)
- // See: https://youtrack.jetbrains.com/issue/KT-45545
- kotlinDaemonJvmArgs = listOf(
- "-Dfile.encoding=UTF-8",
- "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
- "--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
- "--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
- "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
- "--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED",
- "--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
- "--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
- "--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
- "--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
- "--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
- )
-}
-
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
@@ -91,6 +81,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")
}
}
@@ -107,6 +98,12 @@ tasks {
kotlinOptions.jvmTarget = java.targetCompatibility.toString()
}
+ withType {
+ rejectVersionIf {
+ isNonStable(candidate.version)
+ }
+ }
+
withType {
testLogging {
exceptionFormat = TestExceptionFormat.FULL
@@ -118,20 +115,8 @@ tasks {
destination = file("$projectDir/pom.xml")
}
- jacoco {
- toolVersion = "0.8.7"
- }
-
- jacocoTestReport {
- dependsOn(test)
- reports {
- xml.required.set(true)
- html.required.set(true)
- }
- }
-
assemble {
- dependsOn(javadocJar)
+ dependsOn(koverReport)
}
clean {
@@ -206,7 +191,7 @@ tasks {
}
"sonarqube" {
- dependsOn(jacocoTestReport)
+ dependsOn(koverReport)
}
}
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 9283487..db03d63 100644
--- a/examples/build.gradle.kts
+++ b/examples/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.39.0"
- kotlin("jvm") version "1.5.31"
+ id("com.github.ben-manes.versions") version "0.40.0"
+ kotlin("jvm") version "1.6.10"
}
// ./gradlew run --args='https://erik.thauvin.net/ https://bit.ly/2PsNMAA'
@@ -17,7 +17,7 @@ repositories {
dependencies {
implementation("net.thauvin.erik:bitly-shorten:0.9.4-SNAPSHOT")
- implementation("org.json:json:20210307")
+ implementation("org.json:json:20211205")
}
application {
diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index ffed3a2..2e6e589 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a2..2e6e589 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.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/net/thauvin/erik/bitly/Bitlinks.kt b/src/main/kotlin/net/thauvin/erik/bitly/Bitlinks.kt
index e74877a..b2197be 100644
--- a/src/main/kotlin/net/thauvin/erik/bitly/Bitlinks.kt
+++ b/src/main/kotlin/net/thauvin/erik/bitly/Bitlinks.kt
@@ -1,7 +1,7 @@
/*
* Bitlinks.kt
*
- * Copyright (c) 2020-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2022, 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/bitly/Bitly.kt b/src/main/kotlin/net/thauvin/erik/bitly/Bitly.kt
index 8c665e4..2f253bd 100644
--- a/src/main/kotlin/net/thauvin/erik/bitly/Bitly.kt
+++ b/src/main/kotlin/net/thauvin/erik/bitly/Bitly.kt
@@ -1,7 +1,7 @@
/*
* Bitly.kt
*
- * Copyright (c) 2020-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2022, 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/bitly/CallResponse.kt b/src/main/kotlin/net/thauvin/erik/bitly/CallResponse.kt
index d2b2e2d..b740875 100644
--- a/src/main/kotlin/net/thauvin/erik/bitly/CallResponse.kt
+++ b/src/main/kotlin/net/thauvin/erik/bitly/CallResponse.kt
@@ -1,7 +1,7 @@
/*
- * Response.kt
+ * CallResponse.kt
*
- * Copyright (c) 2020-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2022, 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/bitly/Constants.kt b/src/main/kotlin/net/thauvin/erik/bitly/Constants.kt
index d8e3423..5eac861 100644
--- a/src/main/kotlin/net/thauvin/erik/bitly/Constants.kt
+++ b/src/main/kotlin/net/thauvin/erik/bitly/Constants.kt
@@ -1,7 +1,7 @@
/*
* Constants.kt
*
- * Copyright (c) 2020-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2022, 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/bitly/Methods.kt b/src/main/kotlin/net/thauvin/erik/bitly/Methods.kt
index f8231d9..2c6c075 100644
--- a/src/main/kotlin/net/thauvin/erik/bitly/Methods.kt
+++ b/src/main/kotlin/net/thauvin/erik/bitly/Methods.kt
@@ -1,7 +1,7 @@
/*
* Methods.kt
*
- * Copyright (c) 2020-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2022, 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/bitly/Units.kt b/src/main/kotlin/net/thauvin/erik/bitly/Units.kt
index e61f36a..5adf34c 100644
--- a/src/main/kotlin/net/thauvin/erik/bitly/Units.kt
+++ b/src/main/kotlin/net/thauvin/erik/bitly/Units.kt
@@ -1,7 +1,7 @@
/*
* Units.kt
*
- * Copyright (c) 2020-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2022, 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/bitly/Utils.kt b/src/main/kotlin/net/thauvin/erik/bitly/Utils.kt
index 8c74770..81f0468 100644
--- a/src/main/kotlin/net/thauvin/erik/bitly/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/bitly/Utils.kt
@@ -1,7 +1,7 @@
/*
* Utils.kt
*
- * Copyright (c) 2020-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2022, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/bitly/BitlyTest.kt b/src/test/kotlin/net/thauvin/erik/bitly/BitlyTest.kt
index 454418f..2e49349 100644
--- a/src/test/kotlin/net/thauvin/erik/bitly/BitlyTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/bitly/BitlyTest.kt
@@ -1,7 +1,7 @@
/*
* BitlyTest.kt
*
- * Copyright (c) 2020-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2022, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without