Merge pull request #5 from studyplus/jar-publishing

Add archive type to publish of .jar other than current .aar

Author: ichigotake

README.md

@@ -14,10 +14,10 @@ Graddle Project
 
 ```groovy
 repositories {
-    maven { url 'http://raw.github.com/studyplus/Studyplus-Android-SDK/master/repository' }
+    mavenCentral()
 }
 dependencies {
-    compile 'jp.studyplus.android.sdk:studyplus-android-sdk:1.0.0'
+    compile 'jp.studyplus.android.sdk:studyplus-android-sdk:1.0.2'
 }
 ```
 

StudyplusAndroidSDK/build.gradle

@@ -34,17 +34,6 @@ dependencies {
     forTesting.each{ instrumentTestCompile it }
 }
 
-if (gradle.startParameter.taskNames.contains('uploadArchives')) {
-    apply from: 'gradle/build.publish.gradle'
-}
+apply from: 'gradle/build.values.gradle'
 
-android.libraryVariants.all { variant ->
-    def name = variant.name
-    task "javadoc-$name"(type: Javadoc) {
-        description = "Generates javadoc for build $name"
-        destinationDir = new File(destinationDir, variant.baseName)
-        source = files(variant.javaCompile.source)
-        classpath = files(android.plugin.runtimeJarList, variant.javaCompile.classpath)
-        exclude '**/R.java'
-    }
-}
+apply from: 'gradle/build.publish.gradle'

StudyplusAndroidSDK/gradle.properties.example

@@ -2,5 +2,4 @@ signing.keyId=__your_value__
 signing.password=__your_value__
 signing.secretKeyRingFile=__your_value__
 
-sonatypeUsername=__your_value__
-sonatypePassword=__your_value__
+debugApiEndpoint = __your_value__

StudyplusAndroidSDK/gradle/build.publish.gradle

@@ -5,6 +5,43 @@ signing {
     sign configurations.archives
 }
 
+task sdkJar(type: Jar) {
+    from fileTree(dir: 'build/classes/release').matching { include 'jp/studyplus/android/sdk/**' }
+}
+
+task androidJavadocs(type: Javadoc) {
+    source = android.sourceSets.main.allJava
+}
+
+task androidJavadocsJar(type: Jar) {
+    classifier = 'javadoc'
+    from androidJavadocs.destinationDir
+}
+
+task androidSourcesJar(type: Jar) {
+    classifier = 'sources'
+    from android.sourceSets.main.allSource
+}
+
+artifacts {
+    archives sdkJar
+    archives androidSourcesJar
+    archives androidJavadocsJar
+}
+
+if (!gradle.startParameter.taskNames.contains('uploadArchives')) {
+    return
+}
+
+// gradle --daemon option makes System.console() null.
+// you must turn --daemon off when executing uploadArchives.
+def requireInput = { message ->
+    if (System.console() == null){
+        throw new IllegalStateException("try turning --daemon off")
+    }
+    "${System.console().readPassword(message)}"
+}
+
 uploadArchives {
     repositories {
         mavenDeployer {
@@ -13,15 +50,14 @@ uploadArchives {
             }
             repository(url: 'https://oss.sonatype.org/service/local/staging/deploy/maven2/') {
                 authentication(
-                    userName: project.properties.sonatypeUsername,
-                    password: project.properties.sonatypePassword)
+                    userName: requireInput("\nsonatype-username:"),
+                    password: requireInput("sonatype-password:") )
             }
             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 {

StudyplusAndroidSDK/gradle/build.values.gradle

@@ -0,0 +1,30 @@
+
+def apiEndpoint = {
+    def debugTasks = [
+        ':SDKExample:assembleDevelopmentDebug',
+    ]
+    def isCurrentTaskForDebug = {
+        debugTasks.any {
+            gradle.startParameter.taskNames.contains it
+        }
+    }
+    if (isCurrentTaskForDebug()){
+        project.properties.debugApiEndpoint
+    } else {
+        "https://external-api.studyplus.jp"
+    }
+}
+
+android{
+    def quote = { '"' + it + '"' }
+    release {
+        buildConfigField "String", "API_ENDPOINT", quote(apiEndpoint())
+    }
+    /**
+     * CAUTION: this debug `buildConfigField` does NOT work!
+     * rf. https://code.google.com/p/android/issues/detail?id=52962
+     */
+    debug {
+        buildConfigField "String", "API_ENDPOINT", quote(project.properties.debugApiEndpoint)
+    }
+}

StudyplusAndroidSDK/src/main/java/jp/studyplus/android/sdk/service/api/ApiCertification.java

@@ -6,6 +6,4 @@
 public interface ApiCertification {
 
 	public String getAccessToken();
-
-	public String getBaseUrl();
 }

StudyplusAndroidSDK/src/main/java/jp/studyplus/android/sdk/service/api/ApiRequester.java

@@ -4,6 +4,7 @@
 
 import java.io.IOException;
 
+import jp.studyplus.android.sdk.BuildConfig;
 import jp.studyplus.android.sdk.internal.api.ApiAccess;
 import jp.studyplus.android.sdk.internal.api.ApiResponse;
 
@@ -15,7 +16,7 @@ class ApiRequester {
 	public ApiRequester(ApiRequest request, ApiCertification certification) {
 		this.request = request;
 		this.access = new ApiAccess(
-			certification.getBaseUrl() + request.getScriptPath(),
+			BuildConfig.API_ENDPOINT + request.getScriptPath(),
 			certification.getAccessToken());
 	}
 	public ApiEither request() throws IOException {

StudyplusAndroidSDK/src/main/java/jp/studyplus/android/sdk/service/auth/CertificationStore.java

@@ -7,7 +7,7 @@
 
 import com.google.common.base.Optional;
 
-import jp.studyplus.android.sdk.R;
+import jp.studyplus.android.sdk.BuildConfig;
 import jp.studyplus.android.sdk.service.api.ApiCertification;
 
 import static android.content.SharedPreferences.Editor;
@@ -19,18 +19,16 @@ public class CertificationStore {
 	private final SharedPreferences preferences;
 
 	private static String KEY_ACCESS_TOKEN = "access_token";
-	private final String baseUrl;
 
 	public static CertificationStore create(Context context) {
-		String baseUrl = context.getString(R.string.studyplus_api_base_url);
-		String prefName = "Certification:" + Uri.parse(baseUrl).getHost();
+		String prefName = "Certification:" + Uri.parse(BuildConfig.API_ENDPOINT).getHost();
 		SharedPreferences pref = context.getSharedPreferences(prefName, Context.MODE_PRIVATE);
-		return new CertificationStore(pref, baseUrl);
+		return new CertificationStore(pref);
 	}
-	private CertificationStore(SharedPreferences preferences, String baseUrl) {
+	private CertificationStore(SharedPreferences preferences) {
 		this.preferences = preferences;
-		this.baseUrl = baseUrl;
 	}
+
 	public void update(Intent data){
 		if (data == null){
 			return;
@@ -57,26 +55,19 @@ public ApiCertification getDefault() {
 		if (!token.isPresent()){
 			throw new AccessTokenNotFound();
 		}
-		return new ApiCertificationImpl(token.get(), baseUrl);
+		return new ApiCertificationImpl(token.get());
 	}
 
 	private static class ApiCertificationImpl implements ApiCertification{
 		private final String accessToken;
-		private final String baseUrl;
 
-		private ApiCertificationImpl(String accessToken, String baseUrl) {
+		private ApiCertificationImpl(String accessToken) {
 			this.accessToken = accessToken;
-			this.baseUrl = baseUrl;
 		}
 
 		@Override
 		public String getAccessToken() {
 			return accessToken;
 		}
-
-		@Override
-		public String getBaseUrl() {
-			return baseUrl;
-		}
 	}
 }

StudyplusAndroidSDK/src/main/res/values/strings.xml

@@ -1,4 +1,3 @@
 <resources>
     <string name="app_name">StudyplusAndroidSDK</string>
-    <string name="studyplus_api_base_url">https://external-api.studyplus.jp</string>
 </resources>