Make AppCenter only included in debug builds.

Moves Flipper initialization to the same place as AppCenter.
2021-05-02 00:45:23 -07:00
parent e8e19d5371
commit dc9066daca
8 changed files with 32 additions and 94 deletions
--- a/Android/app/build.gradle
+++ b/Android/app/build.gradle
@@ -12,7 +12,12 @@ def appCenterLocalSecret = properties.getProperty('appCenter.localSecret')
 def appCenterEnvSecret = System.getenv('APPCENTER_SECRET')
 def appCenterSecret = appCenterLocalSecret != null ? appCenterLocalSecret : appCenterEnvSecret != null ? appCenterEnvSecret : ""
 def appCenterSdkVersion = '3.3.0'
-def nav_version = "2.3.0"
+def nav_version = '2.3.5'
+def room_version = '2.3.0'
+def rxjava_version = '3.0.0'
+def flipper_version = '0.87.0'
+def soloader_version = '0.10.1'
+def gson_version = '2.8.6'

 android {
    compileSdkVersion 30
@@ -58,39 +63,40 @@ android {
 }

 dependencies {
-    implementation "com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}"
-    implementation "com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}"
-
+    // Included libs
    implementation fileTree(dir: "libs", include: ["*.jar"])
+
+    // Google
    implementation 'androidx.appcompat:appcompat:1.2.0'
    implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
    implementation "androidx.navigation:navigation-fragment:$nav_version"
    implementation "androidx.navigation:navigation-ui:$nav_version"
    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'com.atlassian.commonmark:commonmark:0.15.2'
-    testImplementation 'junit:junit:4.12'
+
+    // Testing
+    testImplementation 'junit:junit:4.13.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

-    def room_version = "2.3.0-rc01"
-    def rxjava_version = "3.0.0"
-
+    // Room DB
    implementation "io.reactivex.rxjava3:rxjava:$rxjava_version"
    implementation "io.reactivex.rxjava3:rxandroid:$rxjava_version"
    implementation "androidx.room:room-runtime:$room_version"
    annotationProcessor "androidx.room:room-compiler:$room_version"
-
-    // optional - RxJava3 support for Room
    implementation "androidx.room:room-rxjava3:$room_version"
-
-    // optional - Test helpers
    //testImplementation "androidx.room:room-testing:$room_version"

-    implementation 'com.google.code.gson:gson:2.8.6'
+    // AppCenter
+    debugImplementation "com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}"
+    debugImplementation "com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}"

    // Flipper
-    debugImplementation 'com.facebook.flipper:flipper:0.87.0'
-    debugImplementation 'com.facebook.soloader:soloader:0.10.1'
-    releaseImplementation 'com.facebook.flipper:flipper-noop:0.87.0'
+    debugImplementation "com.facebook.flipper:flipper:$flipper_version"
+    debugImplementation "com.facebook.soloader:soloader:$soloader_version"
+    releaseImplementation "com.facebook.flipper:flipper-noop:$flipper_version"
+
+    // Other 3rd Party
+    implementation 'com.atlassian.commonmark:commonmark:0.15.2'
+    implementation "com.google.code.gson:gson:$gson_version"
 }
--- a/Android/app/src/debug/java/com/majinnaibu/monstercards/init/FlipperInitializer.java
+++ b/Android/app/src/debug/java/com/majinnaibu/monstercards/init/FlipperInitializer.java
@@ -2,10 +2,6 @@ package com.majinnaibu.monstercards.init;


 import android.content.Context;
-import android.os.Bundle;
-
-import androidx.navigation.NavController;
-import androidx.navigation.NavDestination;

 import com.facebook.flipper.android.AndroidFlipperClient;
 import com.facebook.flipper.android.utils.FlipperUtils;
@@ -14,9 +10,7 @@ import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
 import com.facebook.flipper.plugins.inspector.DescriptorMapping;
 import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
 import com.facebook.flipper.plugins.navigation.NavigationFlipperPlugin;
-import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
 import com.facebook.soloader.SoLoader;
-import com.google.gson.Gson;
 import com.majinnaibu.monstercards.BuildConfig;

 public class FlipperInitializer {
@@ -28,15 +22,10 @@ public class FlipperInitializer {
            final FlipperClient client = AndroidFlipperClient.getInstance(ctx);
            client.addPlugin(new InspectorFlipperPlugin(ctx, DescriptorMapping.withDefaults()));
            client.addPlugin(new DatabasesFlipperPlugin(ctx));
-            client.addPlugin(new SharedPreferencesFlipperPlugin(ctx));
            client.addPlugin(NavigationFlipperPlugin.getInstance());
            client.start();
        }
+
    }

-    public static void sendNavigationEvent(NavController controller, NavDestination destination, Bundle arguments) {
-        Gson gson = new Gson();
-        String json = gson.toJson(arguments != null ? arguments : new Bundle());
-        NavigationFlipperPlugin.getInstance().sendNavigationEvent(String.format("%s:%s", destination.getLabel(), json), null, null);
-    }
 }
--- a/Android/app/src/debug/java/com/majinnaibu/monstercards/utils/FlipperInitializer.java
+++ b/Android/app/src/debug/java/com/majinnaibu/monstercards/utils/FlipperInitializer.java
@@ -1,31 +0,0 @@
-package com.majinnaibu.monstercards.utils;
-
-
-import android.content.Context;
-
-import com.facebook.flipper.android.AndroidFlipperClient;
-import com.facebook.flipper.android.utils.FlipperUtils;
-import com.facebook.flipper.core.FlipperClient;
-import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
-import com.facebook.flipper.plugins.inspector.DescriptorMapping;
-import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
-import com.facebook.flipper.plugins.navigation.NavigationFlipperPlugin;
-import com.facebook.soloader.SoLoader;
-import com.majinnaibu.monstercards.BuildConfig;
-
-public class FlipperInitializer {
-
-    public static void init(Context ctx) {
-        SoLoader.init(ctx, false);
-
-        if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(ctx)) {
-            final FlipperClient client = AndroidFlipperClient.getInstance(ctx);
-            client.addPlugin(new InspectorFlipperPlugin(ctx, DescriptorMapping.withDefaults()));
-            client.addPlugin(new DatabasesFlipperPlugin(ctx));
-            client.addPlugin(NavigationFlipperPlugin.getInstance());
-            client.start();
-        }
-
-    }
-
-}
--- a/Android/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java
@@ -9,9 +9,7 @@ import androidx.navigation.ui.AppBarConfiguration;
 import androidx.navigation.ui.NavigationUI;

 import com.google.android.material.bottomnavigation.BottomNavigationView;
-import com.microsoft.appcenter.AppCenter;
-import com.microsoft.appcenter.analytics.Analytics;
-import com.microsoft.appcenter.crashes.Crashes;
+import com.majinnaibu.monstercards.init.AppCenterInitializer;

 public class MainActivity extends AppCompatActivity {

@@ -25,14 +23,7 @@ public class MainActivity extends AppCompatActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        if (BuildConfig.APPCENTER_SECRET != null && !"".equals(BuildConfig.APPCENTER_SECRET)) {
-            AppCenter.start(
-                    getApplication(),
-                    BuildConfig.APPCENTER_SECRET,
-                    Analytics.class,
-                    Crashes.class
-            );
-        }
+        AppCenterInitializer.init(getApplication());
        setContentView(R.layout.activity_main);
        BottomNavigationView navView = findViewById(R.id.nav_view);
        // Passing each menu ID as a set of Ids because each
--- a/Android/app/src/main/java/com/majinnaibu/monstercards/MonsterCardsApplication.java
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/MonsterCardsApplication.java
@@ -10,7 +10,7 @@ import androidx.room.migration.Migration;
 import androidx.sqlite.db.SupportSQLiteDatabase;

 import com.majinnaibu.monstercards.data.MonsterRepository;
-import com.majinnaibu.monstercards.utils.FlipperInitializer;
+import com.majinnaibu.monstercards.init.FlipperInitializer;

 public class MonsterCardsApplication extends Application {

--- a/Android/app/src/release/java/com/majinnaibu/monstercards/init/FlipperInitializer.java
+++ b/Android/app/src/release/java/com/majinnaibu/monstercards/init/FlipperInitializer.java
@@ -1,17 +1,9 @@
 package com.majinnaibu.monstercards.init;

 import android.content.Context;
-import android.os.Bundle;

-import androidx.navigation.NavController;
-import androidx.navigation.NavDestination;
-
-@SuppressWarnings("unused")
 public class FlipperInitializer {

-    public static void init(Context ctx) {
-    }
+    public static void init(Context ctx) {}

-    public static void sendNavigationEvent(NavController controller, NavDestination destination, Bundle arguments) {
-    }
-}
+}
--- a/Android/app/src/release/java/com/majinnaibu/monstercards/utils/FlipperInitializer.java
+++ b/Android/app/src/release/java/com/majinnaibu/monstercards/utils/FlipperInitializer.java
@@ -1,9 +0,0 @@
-package com.majinnaibu.monstercards.utils;
-
-import android.content.Context;
-
-public class FlipperInitializer {
-
-    public static void init(Context ctx) {}
-
-}
--- a/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Apr 18 00:39:47 PDT 2021
+#Sat May 01 23:00:30 PDT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip