Merge pull request #47 from Simperium/kitkat-init-failure

Kitkat init cmd failure
Simperium · Nov 1, 2013 · 8651704 · 8651704
2 parents 4663f25 + 20af95a
commit 8651704
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/Simperium/build.gradle b/Simperium/build.gradle
@@ -24,12 +24,12 @@ dependencies {
 
 android {
 
-    compileSdkVersion 18
+    compileSdkVersion 19
     buildToolsVersion "18.1.1"
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 18
+        targetSdkVersion 19
     }
 
     sourceSets {
@@ -117,9 +117,12 @@ public final class Version {
 tasks.preBuild.dependsOn versionConfig
 
 task writePom << {
+    // if there's some trailing version cruft replace with SNAPSHOT
+    def artifactVersion = (project.version =~ /[^\d]$/) ? "$project.version-SNAPSHOT" : project.version
     ["simperium-android", "simperium-android-support"].each() { artifact ->
         pom {
             project {
+                version artifactVersion
                 artifactId artifact
                 packaging "aar"
             }

diff --git a/Simperium/src/main/java/com/simperium/client/Channel.java b/Simperium/src/main/java/com/simperium/client/Channel.java
@@ -395,7 +395,7 @@ public void start(){
         init.put(FIELD_APP_ID, appId);
         init.put(FIELD_AUTH_TOKEN, bucket.getUser().getAccessToken());
         init.put(FIELD_BUCKET_NAME, bucket.getRemoteName());
-        init.put(FIELD_COMMAND, initialCommand);
+        init.put(FIELD_COMMAND, initialCommand.toString());
         init.put(FIELD_LIBRARY_VERSION, LIBRARY_VERSION);
         init.put(FIELD_LIBRARY, LIBRARY_NAME);
         String initParams = new JSONObject(init).toString();
@@ -1228,4 +1228,4 @@ public static JSONArray serializeJSON(List<Object>list){
         return json;
     }
 
-}
+}