Merge pull request #3 from classmethod/feature/fix-issue-1-ci

CI 設定見直し

Author: katagiri-kazumune

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: /app
     docker:
-      - image: java:openjdk-8-jdk
+      - image: classmethod/openjdk-with-git:8-jdk
       - image: redis:2.8.23
     environment:
       _JAVA_OPTIONS: -Xmx3G
@@ -181,10 +181,19 @@ jobs:
           path: spar-wings-thymeleaf-s3/build/test-results/
 
       - deploy:
-          name: Deploy bintray
-          command: ./gradlew assemble bintrayUpload
+          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" }}
           paths:
             - "~/.gradle"
             - "~/.m2"
+
+workflows:
+  version: 2
+  all:
+    jobs:
+      - build:
+          filters:
+            tags:
+              only: /.*/

build.gradle

@@ -11,6 +11,7 @@ buildscript {
 		classpath "de.thetaphi:forbiddenapis:2.2"
 		classpath "de.aaschmid:gradle-cpd-plugin:1.0"
 		classpath "io.spring.gradle:dependency-management-plugin:1.0.4.RELEASE"
+		classpath "jp.classmethod.aws:gradle-aws-plugin:0.41"
 	}
 }
 
@@ -90,7 +91,8 @@ subprojects {
 	repositories {
 		jcenter()
 		mavenCentral()
-		maven { url "http://maven.xet.jp/release" } // for baseunits
+		maven { url "http://maven.classmethod.info/snapshot" } // for baseunits
+		maven { url "http://maven.classmethod.info/release" } // for baseunits
 	}
 
 	dependencies {
@@ -104,9 +106,28 @@ subprojects {
 		testCompile "org.mockito:mockito-core"
 	}
 
+	apply plugin: "jp.classmethod.aws"
+	aws {
+		profileName = null
+	}
 
 	// ======== Publishing =======
 	publishing {
+		repositories {
+			maven {
+				def releasesRepoUrl = "${System.getenv("PUBLISH_REPOSITORY")}/release"
+				def snapshotsRepoUrl = "${System.getenv("PUBLISH_REPOSITORY")}/snapshot"
+				url version.endsWith("SNAPSHOT") ? snapshotsRepoUrl : releasesRepoUrl
+
+				credentials(AwsCredentials) {
+					def profileName = project.hasProperty("awsProfileForMetropolisRepo") ? project.awsProfileForMetropolisRepo : null
+					def cred = aws.newCredentialsProvider(profileName).credentials
+					accessKey cred.getAWSAccessKeyId()
+					secretKey cred.getAWSSecretKey()
+				}
+			}
+		}
+
 		publications {
 			mavenJava(MavenPublication) {
 				from components.java
@@ -129,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 = 2.14
+baseunitsVersion = 2.17
 
 junitVersion = 4.12
 hamcrestVersion = 1.3

gradle/version.gradle

@@ -12,13 +12,19 @@ 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")
 
+if (System.getenv('CIRCLE_TAG') != null) {
+	version = System.getenv('CIRCLE_TAG')
+}
+
 task showVersion {
 	doLast {
 		println version