Merge pull request #204 from Instabug/release/10.9.0

[MOB-5988] Release/10.9.0

Author: ymabdallah

.circleci/config.yml

@@ -60,7 +60,7 @@ jobs:
 
    flutter_tests:
     docker:
-      - image: cirrusci/flutter:2.2.3
+      - image: cirrusci/flutter
     steps:
       - checkout
       - run: sudo gem install bundler:1.16.1
@@ -73,6 +73,18 @@ jobs:
       - run: dartanalyzer --options analysis_options.yaml --fatal-warnings lib
       - run: flutter pub publish --dry-run
 
+   flutter_tests_2.2.3:
+    docker:
+      - image: cirrusci/flutter:2.2.3
+    steps:
+      - checkout
+      - run: sudo gem install bundler:1.16.1
+      - run: bundle check || sudo bundle install        
+      - run: bundle exec danger
+      - run: flutter doctor
+      - run: flutter packages get
+      - run: flutter test --coverage
+
    ios_tests:
     macos:
       xcode: "12.3.0"
@@ -128,12 +140,14 @@ workflows:
   build-test-and-approval-deploy:
     jobs:
       - flutter_tests
+      - flutter_tests_2.2.3
       - android_tests
       - ios_tests
       - hold_pub_release:
           type: approval
           requires:
             - flutter_tests
+            - flutter_tests_2.2.3
             - android_tests
             - ios_tests
           filters:
@@ -149,6 +163,7 @@ workflows:
           type: approval
           requires:
             - flutter_tests
+            - flutter_tests_2.2.3
             - android_tests
             - ios_tests
           filters:

.gitignore

@@ -36,8 +36,8 @@ coverage/
 **/android/**/gradle-wrapper.jar
 **/android/.gradle
 **/android/captures/
-**/android/gradlew
-**/android/gradlew.bat
+android/gradlew
+android/gradlew.bat
 **/android/local.properties
 **/android/**/GeneratedPluginRegistrant.java
 
@@ -74,4 +74,4 @@ coverage/
 !**/ios/**/default.mode2v3
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

CHANGELOG.md

@@ -1,8 +1,12 @@
+## v10.9.0 (2021-09-28)
+
+* Migrates to Flutter Android embedding v2
+* Bumps Instabug native SDKs to v10.9
+
 ## v10.8.0 (2021-09-13)
 
 * Introduces Instabug's new App Performance Monitoring (APM)
 
-
 ## v10.0.1 (2021-08-25)
 
 * Fixes an issue with http client logger.

android/src/main/java/com/instabug/instabugflutter/InstabugFlutterPlugin.java

@@ -7,6 +7,8 @@
 import android.os.Looper;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import com.instabug.apm.APM;
 import com.instabug.apm.model.ExecutionTrace;
 import com.instabug.apm.networking.APMNetworkLogger;
@@ -48,6 +50,8 @@
 import java.util.Map;
 import com.instabug.library.Platform;
 
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
+import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
@@ -58,7 +62,7 @@
 /**
  * InstabugFlutterPlugin
  */
-public class InstabugFlutterPlugin implements MethodCallHandler {
+public class InstabugFlutterPlugin implements MethodCallHandler, FlutterPlugin {
 
     final public static String INVOCATION_EVENT_NONE = "InvocationEvent.none";
     final public static String INVOCATION_EVENT_SCREENSHOT = "InvocationEvent.screenshot";
@@ -75,7 +79,21 @@ public class InstabugFlutterPlugin implements MethodCallHandler {
      * Plugin registration.
      */
     public static void registerWith(Registrar registrar) {
-        channel = new MethodChannel(registrar.messenger(), "instabug_flutter");
+        register(registrar.messenger());
+    }
+
+    @Override
+    public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
+        register(binding.getBinaryMessenger());
+    }
+
+    @Override
+    public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
+
+    }
+
+    private static void register(BinaryMessenger messenger){
+        channel = new MethodChannel(messenger, "instabug_flutter");
         channel.setMethodCallHandler(new InstabugFlutterPlugin());
     }
 
@@ -1216,4 +1234,5 @@ public void disable() {
         Instabug.disable();
     }
 
+
 }

example/ios/Podfile.lock

@@ -1,9 +1,9 @@
 PODS:
   - Flutter (1.0.0)
-  - Instabug (10.8.1)
+  - Instabug (10.9.2)
   - instabug_flutter (0.0.1):
     - Flutter
-    - Instabug (= 10.8.1)
+    - Instabug (= 10.9.2)
   - OCMock (3.6)
 
 DEPENDENCIES:
@@ -23,11 +23,11 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/instabug_flutter/ios"
 
 SPEC CHECKSUMS:
-  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
-  Instabug: 5f79efa78dddb8dcbf105d9ca3bd2cfab4079fe3
-  instabug_flutter: ce6f7e43005678ceb3c9685f61e8d760ee784def
+  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  Instabug: 0162662ec77995286850cce17080752fab4417f2
+  instabug_flutter: 6b5832241dd506faa404d02569369ce69b6d6c68
   OCMock: 5ea90566be239f179ba766fd9fbae5885040b992
 
 PODFILE CHECKSUM: 082ec096394aa5e2e9254f7b7845847607911bda
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.2

ios/instabug_flutter.podspec

@@ -15,7 +15,7 @@ A new flutter plugin project.
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
-  s.dependency 'Instabug', '10.8.1'
+  s.dependency 'Instabug', '10.9.2'
 
   s.ios.deployment_target = '10.0'
   s.pod_target_xcconfig = { 'OTHER_LDFLAGS' => '-framework "Flutter" -framework "Instabug"'}

lib/instabug_custom_http_client.dart

@@ -56,16 +56,14 @@ class InstabugCustomHttpClient extends HttpClientLogger implements HttpClient {
       client.addProxyCredentials(host, port, realm, credentials);
 
   @override
-  set authenticate(
-          Future<bool> Function(Uri url, String scheme, String realm)? f) =>
-      client.authenticate = f;
+  set authenticate(f) {
+    client.authenticate = f;
+  }
 
   @override
-  set authenticateProxy(
-          Future<bool> Function(
-                  String host, int port, String scheme, String realm)?
-              f) =>
-      client.authenticateProxy = f;
+  set authenticateProxy(f) {
+    client.authenticateProxy = f;
+  }
 
   @override
   set badCertificateCallback(
@@ -145,8 +143,7 @@ class InstabugCustomHttpClient extends HttpClientLogger implements HttpClient {
   Future<InstabugCustomHttpClientRequest> _finish(
       HttpClientRequest request) async {
     logger.onRequest(request);
-    final customRequest =
-        InstabugCustomHttpClientRequest(request, logger);
+    final customRequest = InstabugCustomHttpClientRequest(request, logger);
     return customRequest;
   }
 }

pubspec.yaml

@@ -1,5 +1,5 @@
 name: instabug_flutter
-version: 10.8.0
+version: 10.9.0
 description: >-
   Deliver the best user experience through a comprehensive platform that will 
   help you uncover, analyze and fix any app performance, quality or stability issues.

test/instabug_flutter_test.dart

@@ -16,11 +16,10 @@ import 'package:instabug_flutter/InstabugLog.dart';
 import 'package:instabug_flutter/NetworkLogger.dart';
 import 'package:instabug_flutter/Replies.dart';
 import 'package:instabug_flutter/Surveys.dart';
-import 'package:instabug_flutter/instabug_custom_http_client.dart';
 import 'package:instabug_flutter/models/crash_data.dart';
 import 'package:instabug_flutter/models/exception_data.dart';
-import 'package:instabug_flutter/models/trace.dart' as execution_trace;
 import 'package:instabug_flutter/models/network_data.dart';
+import 'package:instabug_flutter/models/trace.dart' as execution_trace;
 import 'package:instabug_flutter/utils/platform_manager.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
@@ -32,6 +31,7 @@ import 'instabug_flutter_test.mocks.dart';
   PlatformManager,
 ])
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   WidgetsFlutterBinding.ensureInitialized();
   final List<MethodCall> log = <MethodCall>[];
   const appToken = '068ba9a8c3615035e163dc5f829c73be';
@@ -996,16 +996,6 @@ void main() {
     expect(newNetworkData.status, statusCopy);
   });
 
-  test('Test Http client logger', () async {
-    final InstabugCustomHttpClient client = InstabugCustomHttpClient();
-    final HttpClientRequest request = await client
-        .getUrl(Uri.parse('https://jsonplaceholder.typicode.com/posts'));
-    client.logger.onRequest(request);
-    final HttpClientResponse response = await request.close();
-    client.logger.onResponse(response, request);
-    expect(client.requests.length, 0);
-  });
-
   test('setAPMEnabled: Test', () async {
     bool isEnabled = false;
     final List<dynamic> args = <dynamic>[isEnabled];

test/network_logger_test.dart

@@ -20,6 +20,7 @@ import 'network_logger_test.mocks.dart';
   HttpClientCredentials,
 ])
 void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
   WidgetsFlutterBinding.ensureInitialized();
 
   final List<MethodCall> log = <MethodCall>[];
@@ -53,8 +54,9 @@ void main() {
     when(mockRequest.followRedirects).thenAnswer((_) => true);
     when(mockRequest.maxRedirects).thenAnswer((_) => 5);
     when(mockRequest.persistentConnection).thenAnswer((_) => true);
-    
-    instabugCustomHttpClientRequest = InstabugCustomHttpClientRequest(mockRequest, instabugCustomHttpClient.logger);
+
+    instabugCustomHttpClientRequest = InstabugCustomHttpClientRequest(
+        mockRequest, instabugCustomHttpClient.logger);
 
     expect(mockRequest, isInstanceOf<HttpClientRequest>());
     expect(mockResponse, isInstanceOf<HttpClientResponse>());
@@ -393,8 +395,10 @@ void main() {
   test('expect instabug custom http client to set client authenticate',
       () async {
     final Future<bool> Function(Uri url, String scheme, String realm) f =
-        (Uri url, String scheme, String realm) async => true;
-    instabugCustomHttpClient.authenticate = f;
+        (Uri url, String scheme, String? realm) async => true;
+
+    instabugCustomHttpClient.authenticate =
+        f as Future<bool> Function(Uri url, String scheme, String? realm);
     verify((instabugCustomHttpClient.client as MockHttpClient).authenticate = f)
         .called(1);
   });
@@ -403,8 +407,9 @@ void main() {
       () async {
     final Future<bool> Function(
             String host, int port, String scheme, String realm) f =
-        (String host, int port, String scheme, String realm) async => true;
-    instabugCustomHttpClient.authenticateProxy = f;
+        (String host, int port, String scheme, String? realm) async => true;
+    instabugCustomHttpClient.authenticateProxy = f as Future<bool> Function(
+        String host, int port, String scheme, String? realm);
     verify((instabugCustomHttpClient.client as MockHttpClient)
             .authenticateProxy = f)
         .called(1);