Merge pull request #2 from studyplus/abolish-local-maven

Abolish local maven

Author: ichigotake

SDKExample/src/main/java/jp/studyplus/android/sdk/example/ExampleActivity.java

@@ -68,7 +68,7 @@ public void onClick(View v) {
 			}
 		}
 
-		@Subscribe
+		@Subscribe @SuppressWarnings("unused")
 		public void showMessage(SuccessfulResponse response){
 			Toast.makeText(context, "投稿完了！", Toast.LENGTH_SHORT).show();
 		}

StudyplusAndroidSDK/build.gradle

@@ -34,17 +34,8 @@ dependencies {
     forTesting.each{ instrumentTestCompile it }
 }
 
-apply plugin: 'maven'
-
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            repository(url: "file://" + new File(rootDir, "repository"))
-            pom.version = "1.0.0"
-            pom.groupId = 'jp.studyplus.android.sdk'
-            pom.artifactId = "studyplus-android-sdk"
-        }
-    }
+if (gradle.startParameter.taskNames.contains('uploadArchives')) {
+    apply from: 'gradle/build.publish.gradle'
 }
 
 android.libraryVariants.all { variant ->

StudyplusAndroidSDK/gradle.properties.example

@@ -0,0 +1,6 @@
+signing.keyId=__your_value__
+signing.password=__your_value__
+signing.secretKeyRingFile=__your_value__
+
+sonatypeUsername=__your_value__
+sonatypePassword=__your_value__

StudyplusAndroidSDK/gradle/build.publish.gradle

@@ -0,0 +1,49 @@
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+signing {
+    sign configurations.archives
+}
+
+uploadArchives {
+    repositories {
+        mavenDeployer {
+            beforeDeployment {
+                MavenDeployment deployment -> signing.signPom(deployment)
+            }
+            repository(url: 'https://oss.sonatype.org/service/local/staging/deploy/maven2/') {
+                authentication(
+                    userName: project.properties.sonatypeUsername,
+                    password: project.properties.sonatypePassword)
+            }
+            pom.version = "1.0.2"
+            pom.groupId = 'jp.studyplus.android.sdk'
+            pom.artifactId = "studyplus-android-sdk"
+            pom.project {
+                name 'Studyplus Android SDK'
+                packaging 'aar'
+                description 'Studyplus SDK for Android'
+                url 'https://github.com/studyplus/Studyplus-Android-SDK'
+                scm {
+                    def location = 'scm:[email protected]:studyplus/Studyplus-Android-SDK.git'
+                    url location
+                    connection location
+                    developerConnection location
+                }
+                licenses {
+                    license {
+                        name 'MIT License'
+                        url 'http://opensource.org/licenses/MIT'
+                        distribution 'repo'
+                    }
+                }
+                developers {
+                    developer {
+                        id 'x7c1'
+                        name 'haco'
+                    }
+                }
+            }
+        }
+    }
+}

StudyplusAndroidSDK/src/main/java/jp/studyplus/android/sdk/service/studyrecord/StudyRecordBuilder.java

@@ -4,6 +4,7 @@
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 public class StudyRecordBuilder {
 
@@ -33,7 +34,7 @@ public StudyRecordBuilder setDurationSeconds(int seconds){
 	}
 
 	public StudyRecordBuilder setRecordedTime(Date date){
-		String time = new SimpleDateFormat("yyyy'-'MM'-'dd' 'HH':'mm':'ss").format(date);
+		String time = new SimpleDateFormat("yyyy'-'MM'-'dd' 'HH':'mm':'ss", Locale.US).format(date);
 		this.recordedTime = Optional.of(time);
 		return this;
 	}

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.8.+'
+        classpath 'com.android.tools.build:gradle:0.8.3'
         classpath 'com.squareup.gradle:gradle-android-test-plugin:0.9.1-SNAPSHOT'
     }
 }

settings.gradle

@@ -1 +1,14 @@
 include ':StudyplusAndroidSDK', ':SDKExample'
+
+def setupDefaultProperties = { project ->
+    String dir = project.projectDir.absolutePath
+    def properties = new File(dir, "gradle.properties")
+    def example = new File(properties.getAbsolutePath() + ".example")
+    def notFound = !properties.exists() && example.exists()
+    if (notFound){
+        properties << example.readBytes()
+    }
+}
+[':StudyplusAndroidSDK', ':SDKExample'].each{
+    setupDefaultProperties project(it)
+}