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

CI 設定見直し

Author: katagiri-kazumune

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: openjdk:8-jdk
+      - image: classmethod/openjdk-with-git:8-jdk
     environment:
       _JAVA_OPTIONS: -Xmx3G
       GRADLE_OPTS: -Dorg.gradle.daemon=false
@@ -11,11 +11,11 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - v0-{{ .Branch }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "build.gradle" }}-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
-            - v0-{{ .Branch }}-{{ checksum ".circleci/config.yml" }}
-            - v0-{{ .Branch }}
-            - v0-develop
-            - v0-master
+            - spring-data-mirage-{{ .Branch }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "build.gradle" }}-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
+            - spring-data-mirage-{{ .Branch }}-{{ checksum ".circleci/config.yml" }}
+            - spring-data-mirage-{{ .Branch }}
+            - spring-data-mirage-develop
+            - spring-data-mirage-master
       - run:
           name: Show version
           command: ./gradlew -v
@@ -35,13 +35,11 @@ jobs:
       - store_test_results:
           path: build/test-results
       - deploy:
-          name: Deploy to JFrog Bintray
+          name: Deploy artifacts
           command: |
-            if [ -n "${CIRCLE_TAG}" -a -n "${BINTRAY_USER}" ]; then
-              ./gradlew bintrayUpload
-            fi
+            ./gradlew assemble publish showVersion
       - save_cache:
-          key: v0-{{ .Branch }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "build.gradle" }}-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
+          key: spring-data-mirage-{{ .Branch }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "build.gradle" }}-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
           paths:
             - "~/.gradle"
             - "~/.m2"
@@ -51,7 +49,6 @@ workflows:
   all:
     jobs:
       - build:
-          context: bintray
           filters:
             tags:
               only: /.*/

build.gradle

@@ -10,14 +10,14 @@ buildscript {
 		classpath "com.diffplug.spotless:spotless-plugin-gradle:3.18.0"
 		classpath "de.thetaphi:forbiddenapis:2.6"
 		classpath "de.aaschmid:gradle-cpd-plugin:2.0"
+		classpath "jp.classmethod.aws:gradle-aws-plugin:0.41"
 	}
 }
 
 plugins {
 	id 'java-library'
 	id 'org.springframework.boot' version '2.1.5.RELEASE'
 	id 'maven-publish'
-	id "com.jfrog.bintray" version "1.8.4"
 }
 
 // basic plugins
@@ -45,7 +45,6 @@ apply from: "${rootProject.projectDir}/gradle/quality/spotless.gradle"
 apply from: "${rootProject.projectDir}/gradle/version.gradle"
 apply from: "${rootProject.projectDir}/gradle/resolveDependencies.gradle"
 apply from: "${rootProject.projectDir}/gradle/sourceArtifact.gradle"
-apply from: "${rootProject.projectDir}/gradle/bintray.gradle"
 
 group = "jp.xet.springframework.data.mirage"
 ext.artifactId = "spring-data-mirage"
@@ -68,7 +67,8 @@ javadoc {
 repositories {
 	jcenter()
 	mavenCentral()
-	maven { url 'http://dl.bintray.com/dai0304/spar-wings' }
+	maven { url "http://maven.classmethod.info/snapshot" } // for spar-wings
+	maven { url "http://maven.classmethod.info/release" } // for spar-wings
 }
 
 configurations {
@@ -112,3 +112,52 @@ wrapper {
 	gradleVersion = '5.2.1'
 	distributionType = Wrapper.DistributionType.ALL
 }
+
+// ======== deploy ========
+apply plugin: "jp.classmethod.aws"
+aws {
+	profileName = null
+}
+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
+			artifact sourcesJar {
+				classifier "sources"
+			}
+			artifact javadocJar {
+				classifier "javadoc"
+			}
+			pom.withXml {
+				asNode().children().last() + {
+					resolveStrategy = Closure.DELEGATE_FIRST
+					name project.name
+					description project.description
+					inceptionYear "2015"
+					licenses {
+						license {
+							name "The Apache Software License, Version 2.0"
+							url "http://www.apache.org/license/LICENSE-2.0.txt"
+							distribution "repo"
+						}
+					}
+				}
+			}
+		}
+	}
+}

gradle.properties

@@ -1,4 +1,4 @@
 guavaVersion=24.1-jre
 mirageVersion=2.1.0
-sparWingsVersion=0.37
+sparWingsVersion=0.39
 springDataCommonsVersion=2.1.5.RELEASE

gradle/bintray.gradle

@@ -12,12 +12,16 @@ buildscript {
 
 ext {
 	git = org.ajoberstar.grgit.Grgit.open(dir: file('.'))
-	describedCommit = git.describe(tags: true).toString().trim()
+	revision = git.head().abbreviatedId
 }
 
-version = describedCommit +
-	(describedCommit.matches(".*-[0-9]+-g[0-9a-f]{7}") ? "-SNAPSHOT" : "") +
-	(git.status().isClean() ? "" : "+dirty")
+version = LocalDateTime.now().format("yyyyMMdd") + "-" + 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 {