Merge pull request #3 from asarkar/maven-central

Publish to Maven Central

Author: asarkar

.github/workflows/ci.yml

@@ -12,8 +12,9 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: 8
 
       - name: Build and test

.github/workflows/publish.yml

@@ -29,9 +29,15 @@ jobs:
           exit 1
 
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: 8
 
-      - name: Publish to Bintray
-        run: ./gradlew -P bintrayUser=${{ secrets.BINTRAY_USER }} -P bintrayKey=${{ secrets.BINTRAY_KEY }} bintrayUpload
+      - name: Publish to Maven Central
+        run: |
+          ./gradlew -P signingKey=${{ secrets.SIGNING_KEY }} \
+            -P signingPassword=${{ secrets.SIGNING_PASSWORD }} \
+            -P sonatypeUsername=${{ secrets.SONATYPE_USERNAME }} \
+            -P sonatypePassword=${{ secrets.SONATYPE_PASSWORD }} \
+            publishToSonatype closeAndReleaseSonatypeStagingRepository

README.md

@@ -7,9 +7,7 @@ Requires Java 8 or later. Uses [embedded-redis](https://github.com/ozimov/embedd
 
 ## Installation
 
-You can find the latest version on Bintray. [ ![Download](https://api.bintray.com/packages/asarkar/mvn/com.asarkar.spring%3Aembedded-redis-spring/images/download.svg) ](https://bintray.com/asarkar/mvn/com.asarkar.spring%3Aembedded-redis-spring/_latestVersion)
-
-It is also on Maven Central and jcenter.
+You can find the latest version on [Maven Central](https://search.maven.org/search?q=g:com.asarkar.spring%20AND%20a:embedded-redis-spring).
 
 ## Usage
 
@@ -54,8 +52,8 @@ See KDoc for more details.
 ## Contribute
 
 This project is a volunteer effort. You are welcome to send pull requests, ask questions, or create issues.
-If you like it, you can help by spreading the word!
+you can help by spreading the word and "Starring" the GitHub repo!
 
 ## License
 
-Copyright 2020 Abhijit Sarkar - Released under [Apache License v2.0](LICENSE).
+Copyright 2021 Abhijit Sarkar - Released under [Apache License v2.0](LICENSE).

build.gradle.kts

@@ -1,9 +1,14 @@
+import java.util.Base64
+
 plugins {
     kotlin("jvm")
+    id("org.springframework.boot") apply false
     `maven-publish`
     id("org.jetbrains.dokka")
     id("org.jlleitschuh.gradle.ktlint")
-    id("com.jfrog.bintray")
+    id("io.github.gradle-nexus.publish-plugin")
+    id("org.jetbrains.kotlin.plugin.spring")
+    signing
 }
 
 val projectGroup: String by project
@@ -14,21 +19,31 @@ version = projectVersion
 description = projectDescription
 
 repositories {
+    mavenCentral()
     jcenter()
 }
 
+apply(plugin = "io.spring.dependency-management")
+
 val jUnitVersion: String by project
-val springBootVersion: String by project
+the<io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension>().apply {
+    imports {
+        mavenBom(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)
+        mavenBom("org.junit:junit-bom:$jUnitVersion")
+    }
+}
+
 val embeddedRedisVersion: String by project
 val lettuceVersion: String by project
+val springBootVersion: String by project
 dependencies {
-    implementation(platform("org.springframework.boot:spring-boot-dependencies:$springBootVersion"))
-    implementation("org.springframework.boot:spring-boot-starter-test") {
+    implementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion") {
         exclude(group = "com.vaadin.external.google")
     }
-    implementation("it.ozimov:embedded-redis:$embeddedRedisVersion")
-    testImplementation("org.springframework.boot:spring-boot-starter")
-    testImplementation(platform("org.junit:junit-bom:$jUnitVersion"))
+    implementation("it.ozimov:embedded-redis:$embeddedRedisVersion") {
+        exclude(group = "org.slf4j", module = "slf4j-simple")
+    }
+    testImplementation("org.springframework.boot:spring-boot-starter:$springBootVersion")
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.junit.jupiter:junit-jupiter")
     testImplementation("io.lettuce:lettuce-core:$lettuceVersion")
@@ -122,33 +137,22 @@ publishing {
     }
 }
 
-val bintrayRepo: String by project
-val projectLabels: String by project
-bintray {
-    user = (findProperty("bintrayUser") ?: System.getenv("BINTRAY_USER"))?.toString()
-    key = (findProperty("bintrayKey") ?: System.getenv("BINTRAY_KEY"))?.toString()
-    setPublications(*publishing.publications.names.toTypedArray())
-    with(pkg) {
-        repo = bintrayRepo
-        name = "${project.group}:${project.name}"
-        desc = project.description
-        websiteUrl = "https://$gitHubUrl"
-        vcsUrl = "https://$gitHubUrl.git"
-        setLabels(*projectLabels.split(",".toRegex()).map { it.trim() }.toTypedArray())
-        setLicenses(licenseName)
-        with(version) {
-            name = project.version.toString()
-            with(gpg) {
-                sign = true
-            }
-            with(mavenCentralSync) {
-                sync = true
-                user = (findProperty("sonatypeUser") ?: System.getenv("SONATYPE_USER"))?.toString()
-                password = (findProperty("sonatypePwd") ?: System.getenv("SONATYPE_PWD"))?.toString()
-            }
+fun base64Decode(prop: String): String? {
+    return project.findProperty(prop)?.let {
+        String(Base64.getDecoder().decode(it.toString())).trim()
+    }
+}
+
+signing {
+    useInMemoryPgpKeys(base64Decode("signingKey"), base64Decode("signingPassword"))
+    sign(*publishing.publications.toTypedArray())
+}
+
+nexusPublishing {
+    repositories {
+        sonatype {
+            username.set(base64Decode("sonatypeUsername"))
+            password.set(base64Decode("sonatypePassword"))
         }
     }
-    publish = true
-    override = false
-    dryRun = false
 }

gradle.properties

@@ -1,21 +1,21 @@
 kotlin.code.style=official
+org.gradle.warning.mode=all
+org.gradle.jvmargs=-XX:MaxMetaspaceSize=2G
 
-springBootVersion=2.3.4.RELEASE
+springBootVersion=2.5.2
 embeddedRedisVersion=0.7.3
-lettuceVersion=6.0.1.RELEASE
+lettuceVersion=6.1.4.RELEASE
 jUnitVersion=5.7.0
-kotlinVersion=1.4.10
+kotlin.version=1.5.20
 dokkaPluginVersion=1.4.10.2
 ktlintVersion=9.4.0
-bintrayPluginVersion=1.8.5
+nexusPluginVersion=1.0.0
 
 projectGroup=com.asarkar.spring
-projectVersion=1.1.0
+projectVersion=1.1.1
 projectDescription=Starts a Redis server and makes the port available as Spring Boot environment property
-projectLabels=spring, spring-boot, redis, embedded-redis, test, integration-test
 licenseName=Apache-2.0
 licenseUrl=http://www.apache.org/licenses/LICENSE-2.0.txt
 developerName=Abhijit Sarkar
 developerEmail=contact@asarkar.com
 gitHubUsername=asarkar
-bintrayRepo=mvn

settings.gradle.kts

@@ -4,16 +4,19 @@ pluginManagement {
         jcenter()
     }
 
-    val kotlinVersion: String by settings
+    val kotlinVersion = settings.extra["kotlin.version"].toString()
     val dokkaPluginVersion: String by settings
     val ktlintVersion: String by settings
-    val bintrayPluginVersion: String by settings
+    val nexusPluginVersion: String by settings
+    val springBootVersion: String by settings
     plugins {
         kotlin("jvm") version kotlinVersion
         `maven-publish`
         id("org.jetbrains.dokka") version dokkaPluginVersion
         id("org.jlleitschuh.gradle.ktlint") version ktlintVersion
-        id("com.jfrog.bintray") version bintrayPluginVersion
+        id("io.github.gradle-nexus.publish-plugin") version nexusPluginVersion
+        id("org.springframework.boot") version springBootVersion
+        id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
     }
 }