Merge pull request #80 from RocketChat/feature/ci-build-prepare

Preparing new build

.gitignore

@@ -33,3 +33,9 @@ proguard/
 
 # MacOS
 .DS_Store
+
+# Auth files
+*.jks
+app/rocket-chat.json
+app/src/release/google-services.json
+app/src/release/res/values/api_key_strings.xml

app/build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'me.tatarka.retrolambda'
 apply plugin: 'realm-android'
 apply plugin: 'com.jakewharton.hugo'
+apply plugin: 'com.github.triplet.play'
 apply from: '../config/quality/quality.gradle'
 
 buildscript {
@@ -19,6 +20,7 @@ buildscript {
     classpath rootProject.ext.realmPlugin
     classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1'
     classpath 'com.google.gms:google-services:3.0.0'
+    classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
   }
 
   // Exclude the version that the android plugin depends on.
@@ -59,6 +61,14 @@ android {
       signingConfig signingConfigs.release
     }
   }
+  productFlavors {
+    qa {
+      // something - qa builds will have some extra stuff for alpha testers
+    }
+    prod {
+      // another
+    }
+  }
   packagingOptions {
     exclude 'META-INF/LICENSE.txt'
     exclude 'META-INF/NOTICE.txt'
@@ -72,6 +82,10 @@ android {
     lintConfig file("lint.xml")
   }
 }
+play {
+  jsonFile = file('rocket-chat.json')
+  track = "${track}"
+}
 
 repositories {
   mavenCentral()
@@ -89,7 +103,7 @@ dependencies {
   compile rootProject.ext.supportAppCompat
   compile rootProject.ext.supportDesign
 
-  compile('com.instabug.library:instabug:3.1.0') {
+  qaCompile('com.instabug.library:instabug:3.1.0') {
     exclude group: 'io.reactivex'
   }
   compile 'com.android.support:multidex:1.0.1'

app/src/main/java/chat/rocket/android/RocketChatApplication.java

@@ -4,13 +4,11 @@ import android.support.multidex.MultiDexApplication;
 import chat.rocket.android.model.ServerConfig;
 import chat.rocket.android.realm_helper.RealmStore;
 import com.facebook.stetho.Stetho;
-import com.instabug.library.Feature;
-import com.instabug.library.Instabug;
-import com.instabug.library.invocation.InstabugInvocationEvent;
 import com.uphyca.stetho_realm.RealmInspectorModulesProvider;
 import io.realm.Realm;
 import io.realm.RealmConfiguration;
 import java.util.List;
+import chat.rocket.android.wrappers.InstabugWrapper;
 
 /**
  * Customized Application-class for Rocket.Chat
@@ -34,10 +32,7 @@ public class RocketChatApplication extends MultiDexApplication {
         .enableWebKitInspector(RealmInspectorModulesProvider.builder(this).build())
         .build());
 
-    new Instabug.Builder(this, getString(R.string.instabug_api_key))
-        .setInvocationEvent(InstabugInvocationEvent.FLOATING_BUTTON)
-        .setInAppMessagingState(Feature.State.DISABLED) //not available in Free plan...
-        .build();
+    InstabugWrapper.build(this, getString(R.string.instabug_api_key));
 
     //TODO: add periodic trigger for RocketChatService.keepalive(this) here!
   }

app/src/main/java/chat/rocket/android/activity/AbstractFragmentActivity.java

@@ -6,29 +6,37 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.view.MotionEvent;
+
 import chat.rocket.android.helper.OnBackPressListener;
 import chat.rocket.android.log.RCLog;
-import com.instabug.library.InstabugTrackingDelegate;
+
 import com.trello.rxlifecycle.components.support.RxAppCompatActivity;
+
+import chat.rocket.android.wrappers.InstabugWrapper;
 import icepick.Icepick;
 
 abstract class AbstractFragmentActivity extends RxAppCompatActivity {
 
-  @Override protected void onCreate(@Nullable Bundle savedInstanceState) {
+  @Override
+  protected void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     Icepick.restoreInstanceState(this, savedInstanceState);
   }
 
-  @Override protected void onSaveInstanceState(Bundle outState) {
+  @Override
+  protected void onSaveInstanceState(Bundle outState) {
     super.onSaveInstanceState(outState);
     Icepick.saveInstanceState(this, outState);
   }
 
-  protected abstract @IdRes int getLayoutContainerForFragment();
+  protected abstract
+  @IdRes
+  int getLayoutContainerForFragment();
 
-  @Override public final void onBackPressed() {
+  @Override
+  public final void onBackPressed() {
     if (!onBackPress()) {
-      onBackPresseNotHandled();
+      onBackPressedNotHandled();
     }
   }
 
@@ -49,7 +57,7 @@ abstract class AbstractFragmentActivity extends RxAppCompatActivity {
     return false;
   }
 
-  protected void onBackPresseNotHandled() {
+  protected void onBackPressedNotHandled() {
     super.onBackPressed();
   }
 
@@ -66,9 +74,10 @@ abstract class AbstractFragmentActivity extends RxAppCompatActivity {
         .commit();
   }
 
-  @Override public boolean dispatchTouchEvent(MotionEvent event) {
+  @Override
+  public boolean dispatchTouchEvent(MotionEvent event) {
     try {
-      InstabugTrackingDelegate.notifyActivityGotTouchEvent(event, this);
+      InstabugWrapper.wrap(event, this);
     } catch (IllegalStateException exception) {
       RCLog.w(exception, "Instabug error (ignored)");
     }

app/src/main/java/chat/rocket/android/activity/AddServerActivity.java

@@ -101,7 +101,7 @@ public class AddServerActivity extends AbstractFragmentActivity {
     fragment.setArguments(args);
   }
 
-  @Override protected void onBackPresseNotHandled() {
+  @Override protected void onBackPressedNotHandled() {
     moveTaskToBack(true);
   }
 }

app/src/main/java/chat/rocket/android/activity/ServerConfigActivity.java

@@ -104,7 +104,7 @@ public class ServerConfigActivity extends AbstractFragmentActivity {
     fragment.setArguments(args);
   }
 
-  @Override protected void onBackPresseNotHandled() {
+  @Override protected void onBackPressedNotHandled() {
     moveTaskToBack(true);
   }
 }

app/src/prod/java/chat/rocket/android/wrappers/InstabugWrapper.java

+package chat.rocket.android.wrappers;
+
+import android.app.Activity;
+import android.app.Application;
+import android.view.MotionEvent;
+
+public class InstabugWrapper {
+
+  public static void build(Application application, String apiKey) {
+    // stub
+  }
+
+  public static void wrap(MotionEvent event, Activity activity) {
+    // stub
+  }
+}

app/src/qa/java/chat/rocket/android/wrappers/InstabugWrapper.java

+package chat.rocket.android.wrappers;
+
+import android.app.Activity;
+import android.app.Application;
+import android.view.MotionEvent;
+import com.instabug.library.Feature;
+import com.instabug.library.Instabug;
+import com.instabug.library.InstabugTrackingDelegate;
+import com.instabug.library.invocation.InstabugInvocationEvent;
+
+public class InstabugWrapper {
+
+  public static void build(Application application, String apiKey) {
+    new Instabug.Builder(application, apiKey)
+        .setInvocationEvent(InstabugInvocationEvent.FLOATING_BUTTON)
+        .setInAppMessagingState(Feature.State.DISABLED) //not available in Free plan...
+        .build();
+  }
+
+  public static void wrap(MotionEvent event, Activity activity) {
+    InstabugTrackingDelegate.notifyActivityGotTouchEvent(event, activity);
+  }
+}

circle.yml

@@ -7,12 +7,14 @@
 machine:
   environment:
     ANDROID_HOME: /usr/local/android-sdk-linux
+    GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
 
 dependencies:
   pre:
     - echo "sdk.dir="$ANDROID_HOME > local.properties
 
     - echo $ROCKET_JKS_BASE64 | base64 --decode > Rocket.jks
+    - echo $ROCKET_PLAY_JSON | base64 --decode > app/rocket-chat.json
 
     - mkdir -p app/src/release/res/values
     - echo $GOOGLE_SERVICES_BASE64 | base64 --decode > app/src/release/google-services.json

config/quality/quality.gradle

@@ -40,7 +40,7 @@ task checkstyle(type: Checkstyle, group: 'Verification', description: 'Runs code
 task findbugs(type: FindBugs,
     group: 'Verification',
     description: 'Inspect java bytecode for bugs',
-    dependsOn: ['compileDebugSources', 'compileReleaseSources']) {
+    dependsOn: ['compileQaDebugSources']) {
 
   ignoreFailures = false
   effort = "max"

dependencies.gradle

@@ -19,6 +19,8 @@ ext {
   okhttp3 = 'com.squareup.okhttp3:okhttp:3.4.1'
   picasso = 'com.squareup.picasso:picasso:2.5.2'
   picasso2Okhttp3Downloader = 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
+
+  preDexLibs = !"true".equals(System.getenv("CI"))
 }
 
 subprojects { project ->
@@ -32,4 +34,14 @@ subprojects { project ->
       }
     }
   }
+}
+
+subprojects {
+  project.plugins.whenPluginAdded { plugin ->
+    if ("com.android.build.gradle.AppPlugin".equals(plugin.class.name)) {
+      project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
+    } else if ("com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) {
+      project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
+    }
+  }
 }
\ No newline at end of file