Merge pull request #16 from devatherock/generic-publish

chore: Made publish.gradle generic

Author: devatherock

.circleci/config.yml

@@ -4,9 +4,6 @@ slack_image: &slack_image
       auth:
         username: $DOCKER_USERNAME
         password: $DOCKER_PASSWORD
-       
-orbs:
-  gradle: circleci/gradle@2.2.0
 
 work_directory: &work_directory
   working_directory: ~/jul-jsonformatter
@@ -43,6 +40,51 @@ jobs:
     steps:
       - checkout
       - run: sh /scripts/entry-point.sh
+      
+  test:
+    executor: jdk-executor
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/jul-jsonformatter
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "build.gradle" }}
+            - v1-dependencies
+      - run: |
+          ./gradlew check coveralls -x test
+      - store_test_results:
+          path: build/test-results
+  build:
+    executor: jdk-executor
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/jul-jsonformatter
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "build.gradle" }}
+            - v1-dependencies
+      - run: |
+          ./gradlew build publishToSonatype coveralls sonarqube -Dsnapshot=true -Dsonar.login=$SONAR_TOKEN -x test
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: v1-dependencies-{{ checksum "build.gradle" }}
+      - store_test_results:
+          path: build/test-results
+  publish:
+    executor: jdk-executor
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/jul-jsonformatter
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "build.gradle" }}
+            - v1-dependencies
+      - run: |
+          ./gradlew build publishToSonatype -x test
 
   notify:
     <<: *slack_image
@@ -58,17 +100,14 @@ workflows:
   version: 2.1
   build_test:
     jobs:
-      - gradle/run:
-          name: build
-          executor: jdk-executor
+      - build:
           context:
             - docker-credentials
             - sonatype-credentials
             - sonar-credentials
           filters:
             branches:
               only: master
-          command: build publishToSonatype coveralls sonarqube -Dsnapshot=true -Dsonar.login=$SONAR_TOKEN -x test
       - notify:
           context:
             - docker-credentials
@@ -77,9 +116,7 @@ workflows:
             - build
   publish_artifacts:
     jobs:
-      - gradle/run:
-          name: publish
-          executor: jdk-executor
+      - publish:
           context:
             - docker-credentials
             - sonatype-credentials
@@ -88,7 +125,6 @@ workflows:
               only: non-existent-branch
             tags:
               only: /^v[0-9\.]+$/
-          command: build publishToSonatype -x test
       - notify:
           context:
             - docker-credentials
@@ -102,12 +138,9 @@ workflows:
             - docker-credentials
             - changelog-updater-credentials
           <<: *pr_filter
-      - gradle/test:
-          name: test
-          executor: jdk-executor
+      - test:
           context:
             - docker-credentials
           <<: *pr_filter
-          test_command: check coveralls -x test
           requires:
             - changelog_updater

CHANGELOG.md

@@ -7,6 +7,8 @@
 ### Changed
 - Publication of artifacts to Sonatype Nexus due to bintray sunset
 - Upgraded dependency versions
+- Made `publish.gradle` generic so that it can be moved to `gradle-includes`
+- Refactored CI pipeline with proper gradle caching
 
 ## [1.1.0] - 2020-10-06
 ### Added

build.gradle

@@ -12,16 +12,24 @@ plugins {
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
-group = "io.github.devatherock"
-version = '1.2.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "")
+group = 'io.github.devatherock'
+description = 'java.util.logging.Formatter to log messages as JSON, compatible with Logstash'
+version = (System.env.CIRCLE_TAG ? System.env.CIRCLE_TAG.substring(1): '1.2.0') +
+        (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "")
 
 repositories {
     mavenCentral()
 }
 
-project.ext.jsonSimpleVersion = '1.1.1'
-project.ext.gsonVersion = '2.9.0'
-project.ext.jacksonVersion = '2.13.2.2'
+ext {
+    jsonSimpleVersion = '1.1.1'
+    gsonVersion = '2.9.0'
+    jacksonVersion = '2.13.2.2'
+    
+    // Properties for publishing
+    licenseUrl = 'https://github.com/devatherock/jul-jsonformatter/blob/master/LICENSE.txt'
+    scmUrl = 'https://github.com/devatherock/jul-jsonformatter/'
+}
 
 dependencies {
     compileOnly group: 'com.googlecode.json-simple', name: 'json-simple', version: jsonSimpleVersion

publish.gradle

@@ -17,8 +17,8 @@ artifacts {
 def pomConfig = {
     licenses {
         license {
-            name 'MIT License'
-            url 'https://github.com/devatherock/jul-jsonformatter/blob/master/LICENSE.txt'
+            name (project.ext.has('licenseType') ? project['licenseType'] : 'MIT License')
+            url (project.ext.has('licenseUrl') ? project['licenseUrl'] : 'https://mit-license.org/')
         }
     }
 
@@ -31,11 +31,10 @@ def pomConfig = {
     }
 
     scm {
-        url 'https://github.com/devatherock/jul-jsonformatter/'
+        url project['scmUrl']
     }
 }
 
-def projectDescription = 'java.util.logging.Formatter to log messages as JSON, compatible with Logstash'
 project.afterEvaluate {
 	publishing {
 		publications {
@@ -52,9 +51,9 @@ project.afterEvaluate {
 				version "${project.version}"
 				pom.withXml {
 					def root = asNode()
-					root.appendNode('description', projectDescription)
-					root.appendNode('name', "${project.name}")
-					root.appendNode('url', 'https://github.com/devatherock/jul-jsonformatter')
+					root.appendNode('description', project.description)
+					root.appendNode('name', project.name)
+					root.appendNode('url', project['scmUrl'])
 					root.children().last() + pomConfig
 				}
 			}