Moved from jCenter to Maven Central.

Updated dependencies.

.gitignore

@@ -1,22 +1,7 @@
-.vscode/*
 !.vscode/extensions.json
 !.vscode/launch.json
 !.vscode/settings.json
 !.vscode/tasks.json
-
-__pycache__
-.classpath
-.DS_Store
-.gradle
-.history
-.kobalt
-.mtj.tmp/
-.mvn/timing.properties
-.mvn/wrapper/maven-wrapper.jar
-.nb-gradle
-.project
-.scannerwork
-.settings
 *.class
 *.code-workspace
 *.ctxt
@@ -27,7 +12,21 @@ __pycache__
 *.sublime-*
 *.tar.gz
 *.zip
-/**/.idea_modules/
+.DS_Store
+.classpath
+.gradle
+.history
+.kobalt
+.mtj.tmp/
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+.nb-gradle
+.project
+.scannerwork
+.settings
+.vscode/*
+/**/.idea/$CACHE_FILE$
+/**/.idea/$PRODUCT_WORKSPACE_FILE$
 /**/.idea/**/caches/build_file_checksums.ser
 /**/.idea/**/contentModel.xml
 /**/.idea/**/dataSources.ids
@@ -48,8 +47,9 @@ __pycache__
 /**/.idea/**/uiDesigner.xml
 /**/.idea/**/usage.statistics.xml
 /**/.idea/**/workspace.xml
-/**/.idea/$CACHE_FILE$
+/**/.idea_modules/
-/**/.idea/$PRODUCT_WORKSPACE_FILE$
+Thumbs.db
+__pycache__
 atlassian-ide-plugin.xml
 bin/
 build/
@@ -71,6 +71,7 @@ lib/kotlin*
 libs/
 local.properties
 out/
+pom.xml.asc
 pom.xml.next
 pom.xml.releaseBackup
 pom.xml.tag
@@ -80,5 +81,4 @@ project.properties
 release.properties
 target/
 test-output
-Thumbs.db
 venv

build.gradle.kts

@@ -1,4 +1,3 @@
-import com.jfrog.bintray.gradle.tasks.BintrayUploadTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.FileInputStream
 import java.util.*
@@ -7,14 +6,14 @@ plugins {
     jacoco
     `java-library`
     `maven-publish`
-    id("com.github.ben-manes.versions") version "0.29.0"
+    signing
-    id("com.jfrog.bintray") version "1.8.5"
+    id("com.github.ben-manes.versions") version "0.38.0"
-    id("io.gitlab.arturbosch.detekt") version "1.11.0"
+    id("io.gitlab.arturbosch.detekt") version "1.16.0"
     id("net.thauvin.erik.gradle.semver") version "1.0.4"
-    id("org.jetbrains.dokka") version "1.4.0-rc"
+    id("org.jetbrains.dokka") version "1.4.30"
-    id("org.jetbrains.kotlin.jvm") version "1.4.0"
+    id("org.jetbrains.kotlin.jvm") version "1.4.30"
-    id("org.jetbrains.kotlin.kapt") version "1.4.0"
+    id("org.jetbrains.kotlin.kapt") version "1.4.30"
-    id("org.sonarqube") version "3.0"
+    id("org.sonarqube") version "3.1.1"
 }
 
 group = "net.thauvin.erik"
@@ -44,6 +43,7 @@ File("local.properties").apply {
 }
 
 repositories {
+    mavenCentral()
     jcenter()
 }
 
@@ -61,16 +61,13 @@ kapt {
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
+    withSourcesJar()
 }
 
 detekt {
     baseline = project.rootDir.resolve("config/detekt/baseline.xml")
 }
 
-jacoco {
-    toolVersion = "0.8.5"
-}
-
 sonarqube {
     properties {
         property("sonar.projectKey", "ethauvin_$name")
@@ -78,11 +75,6 @@ sonarqube {
     }
 }
 
-val sourcesJar by tasks.creating(Jar::class) {
-    archiveClassifier.set("sources")
-    from(sourceSets.getByName("main").allSource)
-}
-
 val javadocJar by tasks.creating(Jar::class) {
     dependsOn(tasks.dokkaJavadoc)
     from(tasks.dokkaJavadoc)
@@ -108,7 +100,7 @@ tasks {
     }
 
     assemble {
-        dependsOn(sourcesJar, javadocJar)
+        dependsOn(javadocJar)
     }
 
     clean {
@@ -140,16 +132,6 @@ tasks {
         }
     }
 
-    val bintrayUpload by existing(BintrayUploadTask::class) {
-        dependsOn(publishToMavenLocal, gitTag)
-        doFirst {
-            versionName = "${project.version}"
-            versionDesc = "${project.name} ${project.version}"
-            versionVcsTag = "${project.version}"
-            versionReleased = Date().toString()
-        }
-    }
-
     register("deploy") {
         description = "Copies all needed files to the $deployDir directory."
         group = PublishingPlugin.PUBLISH_TASK_GROUP
@@ -160,9 +142,9 @@ tasks {
     }
 
     register("release") {
-        description = "Publishes version ${project.version} to Bintray."
+        description = "Publishes version ${project.version} to local repository."
         group = PublishingPlugin.PUBLISH_TASK_GROUP
-        dependsOn("wrapper", bintrayUpload)
+        dependsOn("wrapper", "deploy", "gitTag", "publishToMavenLocal")
     }
 
     "sonarqube" {
@@ -170,83 +152,51 @@ tasks {
     }
 }
 
-fun findProperty(s: String) = project.findProperty(s) as String?
-bintray {
-    user = findProperty("bintray.user")
-    key = findProperty("bintray.apikey")
-    publish = isRelease
-    setPublications(publicationName)
-    pkg.apply {
-        repo = "maven"
-        name = project.name
-        desc = description
-        websiteUrl = mavenUrl
-        issueTrackerUrl = "$mavenUrl/issues"
-        githubRepo = gitHub
-        githubReleaseNotesFile = "README.md"
-        vcsUrl = "$mavenUrl.git"
-        setLabels(
-            "android",
-            "is.gd",
-            "v.gd",
-            "java",
-            "kotlin",
-            "shorten",
-            "shorten-urls",
-            "shortener",
-            "shortener-service",
-            "shortens-links",
-            "shorturl",
-            "url-shortener"
-        )
-        setLicenses("BSD 3-Clause")
-        publicDownloadNumbers = true
-        version.apply {
-            name = project.version as String
-            desc = description
-            vcsTag = project.version as String
-            gpg.apply {
-                sign = true
-            }
-        }
-    }
-}
-
 publishing {
     publications {
         create<MavenPublication>(publicationName) {
             from(components["java"])
-            artifact(sourcesJar)
             artifact(javadocJar)
-            pom.withXml {
+            pom {
-                asNode().apply {
+                name.set(project.name)
-                    appendNode("name", project.name)
+                description.set(project.description)
-                    appendNode("description", project.description)
+                url.set(mavenUrl)
-                    appendNode("url", mavenUrl)
+                licenses {
-
+                    license {
-                    appendNode("licenses").appendNode("license").apply {
+                        name.set("BSD 3-Clause")
-                        appendNode("name", "BSD 3-Clause")
+                        url.set("https://opensource.org/licenses/BSD-3-Clause")
-                        appendNode("url", "https://opensource.org/licenses/BSD-3-Clause")
                     }
-
+                }
-                    appendNode("developers").appendNode("developer").apply {
+                developers {
-                        appendNode("id", "ethauvin")
+                    developer {
-                        appendNode("name", "Erik C. Thauvin")
+                        id.set("ethauvin")
-                        appendNode("email", "erik@thauvin.net")
+                        name.set("Erik C. Thauvin")
-                    }
+                        email.set("erik@thauvin.net")
-
+                        url.set("https://erik.thauvin.net/")
-                    appendNode("scm").apply {
-                        appendNode("connection", "scm:git:$mavenUrl.git")
-                        appendNode("developerConnection", "scm:git:git@github.com:$gitHub.git")
-                        appendNode("url", mavenUrl)
-                    }
-
-                    appendNode("issueManagement").apply {
-                        appendNode("system", "GitHub")
-                        appendNode("url", "$mavenUrl/issues")
                     }
                 }
+                scm {
+                    connection.set("scm:git:git://github.com/$gitHub.git")
+                    developerConnection.set("scm:git:git@github.com:$gitHub.git")
+                    url.set("$mavenUrl")
+                }
+                issueManagement {
+                    system.set("GitHub")
+                    url.set("$mavenUrl/issues")
+                }
             }
         }
     }
+    repositories {
+        maven {
+            name = "ossrh"
+            url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+            credentials(PasswordCredentials::class)
+        }
+    }
+}
+
+signing {
+    useGpgCmd()
+    sign(publishing.publications[publicationName])
 }

examples/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.4.0"
+    id("org.jetbrains.kotlin.jvm") version "1.4.30"
-    id("com.github.ben-manes.versions") version "0.29.0"
+    id("com.github.ben-manes.versions") version "0.38.0"
     application
 }
 
@@ -9,7 +9,7 @@ plugins {
 
 repositories {
     mavenLocal()
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {

examples/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

pom.xml

@@ -8,26 +8,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.thauvin.erik</groupId>
   <artifactId>isgd-shorten</artifactId>
-  <version>0.9.1</version>
+  <version>0.9.2</version>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-bom</artifactId>
-        <version>1.3.72</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>1.3.72</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
   <name>isgd-shorten</name>
   <description>is.gd Shortener for Kotlin/Java</description>
   <url>https://github.com/ethauvin/isgd-shorten</url>
@@ -42,10 +23,11 @@
       <id>ethauvin</id>
       <name>Erik C. Thauvin</name>
       <email>erik@thauvin.net</email>
+      <url>https://erik.thauvin.net/</url>
     </developer>
   </developers>
   <scm>
-    <connection>scm:git:https://github.com/ethauvin/isgd-shorten.git</connection>
+    <connection>scm:git:git://github.com/ethauvin/isgd-shorten.git</connection>
     <developerConnection>scm:git:git@github.com:ethauvin/isgd-shorten.git</developerConnection>
     <url>https://github.com/ethauvin/isgd-shorten</url>
   </scm>
@@ -53,4 +35,12 @@
     <system>GitHub</system>
     <url>https://github.com/ethauvin/isgd-shorten/issues</url>
   </issueManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <version>1.4.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
 </project>

version.properties

@@ -1,8 +1,8 @@
 #Generated by the Semver Plugin for Gradle
-#Sat Mar 21 16:36:23 PDT 2020
+#Sun Mar 21 11:28:11 PDT 2021
 version.buildmeta=
 version.major=0
 version.minor=9
-version.patch=1
+version.patch=2
 version.prerelease=
-version.semver=0.9.1
+version.semver=0.9.2