Upgrade flipper to 0.36.0

Author: lijy91

.gitignore

@@ -3,11 +3,5 @@
 
 .packages
 .pub/
-pubspec.lock
 
-build/
-.idea/
-.metadata
-.settings/
-.classpath
-.project
+build/

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.5.0'
     }
 }
 
@@ -33,8 +33,8 @@ android {
     }
     dependencies {
         releaseImplementation project(':flipper-no-op')
-        debugImplementation 'com.facebook.flipper:flipper:0.26.0'
-        debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.26.0'
-        debugImplementation 'com.facebook.soloader:soloader:0.5.1'
+        debugImplementation 'com.facebook.flipper:flipper:0.36.0'
+        debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.36.0'
+        debugImplementation 'com.facebook.soloader:soloader:0.8.2'
     }
 }

android/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
-
+android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true

android/src/main/java/org/blankapp/flutterplugins/flutter_flipperkit/FlutterFlipperkitPlugin.java

@@ -1,8 +1,9 @@
 package org.blankapp.flutterplugins.flutter_flipperkit;
 
-import android.app.Activity;
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.flipper.android.AndroidFlipperClient;
 import com.facebook.flipper.android.utils.FlipperUtils;
 import com.facebook.flipper.core.FlipperClient;
@@ -22,6 +23,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
+import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.EventChannel;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
@@ -32,44 +35,44 @@
 /**
  * FlutterFlipperkitPlugin
  */
-public class FlutterFlipperkitPlugin implements MethodCallHandler, EventChannel.StreamHandler {
-    private EventChannel.EventSink eventSink;
+public class FlutterFlipperkitPlugin implements FlutterPlugin, MethodCallHandler, EventChannel.StreamHandler {
+    private static final String CHANNEL_NAME = "flutter_flipperkit";
+    private static final String EVENT_CHANNEL_NAME = "flutter_flipperkit/event_channel";
 
     private Context context;
+    private MethodChannel channel;
+    private EventChannel eventChannel;
+
+    private EventChannel.EventSink eventSink;
+
     private FlipperClient flipperClient;
     private NetworkFlipperPlugin networkFlipperPlugin;
     private SharedPreferencesFlipperPlugin sharedPreferencesFlipperPlugin;
 
     private FlipperDatabaseBrowserPlugin flipperDatabaseBrowserPlugin;
     private FlipperReduxInspectorPlugin flipperReduxInspectorPlugin;
 
-    public FlutterFlipperkitPlugin(Context context) {
-        this.context = context;
-        SoLoader.init(context.getApplicationContext(), false);
-        if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(context)) {
-            flipperClient = AndroidFlipperClient.getInstance(context);
-            networkFlipperPlugin = new NetworkFlipperPlugin();
-            sharedPreferencesFlipperPlugin = new SharedPreferencesFlipperPlugin(context, "FlutterSharedPreferences");
-
-            flipperDatabaseBrowserPlugin = new FlipperDatabaseBrowserPlugin();
-            flipperReduxInspectorPlugin = new FlipperReduxInspectorPlugin();
-        }
+    @Override
+    public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
+        this.setupChannel(flutterPluginBinding.getBinaryMessenger(), flutterPluginBinding.getApplicationContext());
     }
 
-    /**
-     * Plugin registration.
-     */
+    // This static function is optional and equivalent to onAttachedToEngine. It supports the old
+    // pre-Flutter-1.12 Android projects. You are encouraged to continue supporting
+    // plugin registration via this function while apps migrate to use the new Android APIs
+    // post-flutter-1.12 via https://flutter.dev/go/android-project-migration.
+    //
+    // It is encouraged to share logic between onAttachedToEngine and registerWith to keep
+    // them functionally equivalent. Only one of onAttachedToEngine or registerWith will be called
+    // depending on the user's project. onAttachedToEngine or registerWith must both be defined
+    // in the same class.
     public static void registerWith(Registrar registrar) {
-        final FlutterFlipperkitPlugin flipperkitPlugin = new FlutterFlipperkitPlugin(registrar.activeContext());
-        final MethodChannel channel = new MethodChannel(registrar.messenger(), "flutter_flipperkit");
-        channel.setMethodCallHandler(flipperkitPlugin);
-
-        final EventChannel eventChannel = new EventChannel(registrar.messenger(), "flutter_flipperkit/event_channel");
-        eventChannel.setStreamHandler(flipperkitPlugin);
+        final FlutterFlipperkitPlugin plugin = new FlutterFlipperkitPlugin();
+        plugin.setupChannel(registrar.messenger(), registrar.activeContext());
     }
 
     @Override
-    public void onMethodCall(MethodCall call, Result result) {
+    public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
         if (!FlipperUtils.shouldEnableFlipper(context)) {
             result.success(true);
             return;
@@ -200,15 +203,17 @@ private byte[] convertBody(MethodCall call) {
 
                 if (argBody instanceof HashMap) {
                     bodyString = new JSONObject((HashMap) argBody).toString();
-                } else if (argBody instanceof  ArrayList) {
+                } else if (argBody instanceof ArrayList) {
                     bodyString = new JSONArray((ArrayList) argBody).toString();
                 }
-            } catch (ClassCastException e) { }
+            } catch (ClassCastException e) {
+            }
 
             if (bodyString == null) {
                 try {
                     bodyString = call.argument("body");
-                } catch (NullPointerException e) { }
+                } catch (NullPointerException e) {
+                }
             }
         }
 
@@ -217,7 +222,7 @@ private byte[] convertBody(MethodCall call) {
 
     private List<NetworkReporter.Header> convertHeader(MethodCall call) {
         Map<String, Object> argHeaders = call.argument("headers");
-        List<NetworkReporter.Header> list = new ArrayList<>();;
+        List<NetworkReporter.Header> list = new ArrayList<>();
 
         if (argHeaders != null) {
             Set<String> keys = argHeaders.keySet();
@@ -228,7 +233,7 @@ private List<NetworkReporter.Header> convertHeader(MethodCall call) {
                 if (value instanceof ArrayList) {
                     List values = (ArrayList) value;
                     StringBuilder builder = new StringBuilder();
-                    for(Object obj : values) {
+                    for (Object obj : values) {
                         builder.append(obj);
                     }
                     valueString = builder.toString();
@@ -244,11 +249,42 @@ private List<NetworkReporter.Header> convertHeader(MethodCall call) {
     @Override
     public void onListen(Object args, EventChannel.EventSink eventSink) {
         this.eventSink = eventSink;
-        flipperDatabaseBrowserPlugin.setEventSink(eventSink);
+        flipperDatabaseBrowserPlugin.setEventSink(this.eventSink);
     }
 
     @Override
     public void onCancel(Object args) {
         this.eventSink = null;
     }
+
+    @Override
+    public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
+        this.teardownChannel();
+    }
+
+    private void setupChannel(BinaryMessenger messenger, Context context) {
+        this.context = context;
+        SoLoader.init(context.getApplicationContext(), false);
+        if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(context)) {
+            flipperClient = AndroidFlipperClient.getInstance(context);
+            networkFlipperPlugin = new NetworkFlipperPlugin();
+            sharedPreferencesFlipperPlugin = new SharedPreferencesFlipperPlugin(context, "FlutterSharedPreferences");
+
+            flipperDatabaseBrowserPlugin = new FlipperDatabaseBrowserPlugin();
+            flipperReduxInspectorPlugin = new FlipperReduxInspectorPlugin();
+        }
+
+        this.channel = new MethodChannel(messenger, CHANNEL_NAME);
+        this.channel.setMethodCallHandler(this);
+
+        this.eventChannel = new EventChannel(messenger, EVENT_CHANNEL_NAME);
+        this.eventChannel.setStreamHandler(this);
+    }
+
+    private void teardownChannel() {
+        this.channel.setMethodCallHandler(null);
+        this.channel = null;
+        this.eventChannel.setStreamHandler(null);
+        this.eventChannel = null;
+    }
 }

flutter_flipperkit.iml

@@ -34,3 +34,4 @@ Icon?
 .tags*
 
 /Flutter/Generated.xcconfig
+/Flutter/flutter_export_environment.sh

ios/.gitignore

@@ -1,11 +1,11 @@
-flipperkit_version = '0.26.0'
+flipperkit_version = '0.36.0'
 
 #
 # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
 #
 Pod::Spec.new do |s|
   s.name             = 'flutter_flipperkit'
-  s.version          = '0.0.6'
+  s.version          = '0.0.22'
   s.summary          = 'Flipper (Extensible mobile app debugger) for flutter.'
   s.description      = <<-DESC
   Flipper (Extensible mobile app debugger) for flutter.
@@ -25,5 +25,4 @@ Pod::Spec.new do |s|
 
   s.xcconfig = {'OTHER_CFLAGS' => '-DFB_SONARKIT_ENABLED=1'}
   s.ios.deployment_target = '9.0'
-  s.static_framework = true
 end