Change uploadArchives task to publish jar file

removed dependency on resource value

Author: x7c1

StudyplusAndroidSDK/build.gradle

@@ -34,10 +34,11 @@ dependencies {
     forTesting.each{ instrumentTestCompile it }
 }
 
+apply from: 'gradle/build.values.gradle'
+
 if (gradle.startParameter.taskNames.contains('uploadArchives')) {
     apply from: 'gradle/build.publish.gradle'
 }
-
 android.libraryVariants.all { variant ->
     def name = variant.name
     task "javadoc-$name"(type: Javadoc) {

StudyplusAndroidSDK/gradle.properties.example

@@ -4,3 +4,5 @@ signing.secretKeyRingFile=__your_value__
 
 sonatypeUsername=__your_value__
 sonatypePassword=__your_value__
+
+debugApiEndPoint = __your_value__

StudyplusAndroidSDK/gradle/build.publish.gradle

@@ -5,6 +5,30 @@ 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
+}
+
 uploadArchives {
     repositories {
         mavenDeployer {
@@ -21,7 +45,6 @@ uploadArchives {
             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/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,17 @@ public class CertificationStore {
 	private final SharedPreferences preferences;
 
 	private static String KEY_ACCESS_TOKEN = "access_token";
-	private final String baseUrl;
+	private static final String baseUrl = BuildConfig.API_ENDPOINT;
 
 	public static CertificationStore create(Context context) {
-		String baseUrl = context.getString(R.string.studyplus_api_base_url);
 		String prefName = "Certification:" + Uri.parse(baseUrl).getHost();
 		SharedPreferences pref = context.getSharedPreferences(prefName, Context.MODE_PRIVATE);
 		return new CertificationStore(pref, baseUrl);
 	}
 	private CertificationStore(SharedPreferences preferences, String baseUrl) {
 		this.preferences = preferences;
-		this.baseUrl = baseUrl;
 	}
+
 	public void update(Intent data){
 		if (data == null){
 			return;

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>