publish する際のファイル名を変更

Author: katagiri-kazumune

.circleci/config.yml

@@ -181,7 +181,7 @@ jobs:
           path: spar-wings-thymeleaf-s3/build/test-results/
 
       - deploy:
-          name: Deploy bintray
+          name: Deploy artifacts
           command: ./gradlew assemble publish showVersion
       - save_cache:
           key: barista-{{ .Branch }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "build.gradle" }}-{{ checksum "gradle.properties" }}-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}

build.gradle

@@ -150,13 +150,6 @@ subprojects {
 								distribution "repo"
 							}
 						}
-						developers {
-							developer {
-								id "dai0304"
-								name "MIYAMOTO Daisuke"
-								email "dai.0304@gmail.com"
-							}
-						}
 					}
 				}
 			}

gradle.properties

@@ -4,7 +4,7 @@ springSecurityOauth2Version = 2.2.1.RELEASE
 awsJavaSdkVersion = 1.11.233
 
 lombokVersion = 1.18.2
-baseunitsVersion = 20200313-13b46a0-SNAPSHOT
+baseunitsVersion = 20200313-9a35d4d-SNAPSHOT
 
 junitVersion = 4.12
 hamcrestVersion = 1.3

gradle/version.gradle

@@ -12,11 +12,13 @@ buildscript {
 
 ext {
 	git = org.ajoberstar.grgit.Grgit.open(file('.'))
-	describedCommit = git.describe().toString().trim()
+	revision = git.head().abbreviatedId
 }
 
-version = describedCommit +
-	(describedCommit.matches(".*-[0-9]+-g[0-9a-f]{7}") ? "-SNAPSHOT" : "") +
+import java.text.SimpleDateFormat
+// LocalDateTime.now().format("yyyyMMdd") は参照できないと言われる...
+version = new SimpleDateFormat('yyyyMMdd').format(new Date()) + "-" + revision +
+	(git.branch.current.name != "master" ? "-SNAPSHOT" : "") +
 	(git.status().isClean() ? "" : "+dirty")
 
 task showVersion {