[MOB-12513] Fix Mockito and Pigeon Dependency Conflict

.circleci/config.yml

@@ -9,7 +9,7 @@ commands:
   setup_flutter:
     steps:
       - flutter/install_sdk_and_pub:
-          flutter_version: 3.3.0
+          flutter_version: 3.10.5
       - run:
           name: Generate Pigeons
           command: sh ./scripts/pigeon.sh

example/lib/main.dart

@@ -162,11 +162,6 @@ class _MyHomePageState extends State<MyHomePage> {
         ReportType.feedback, [InvocationOption.emailFieldOptional]);
   }
 
-  void askQuestion() {
-    BugReporting.show(
-        ReportType.question, [InvocationOption.emailFieldOptional]);
-  }
-
   void showNpsSurvey() {
     Surveys.showSurvey('pcV_mE2ttqHxT1iqvBxL0w');
   }
@@ -333,10 +328,6 @@ class _MyHomePageState extends State<MyHomePage> {
                 onPressed: sendFeedback,
                 text: 'Send Feedback',
               ),
-              InstabugButton(
-                onPressed: askQuestion,
-                text: 'Ask a Question',
-              ),
               InstabugButton(
                 onPressed: showNpsSurvey,
                 text: 'Show NPS Survey',

ios/Classes/Modules/BugReportingApi.m

@@ -112,7 +112,7 @@ - (void)setEnabledAttachmentTypesScreenshot:(NSNumber *)screenshot extraScreensh
 
 - (void)bindOnInvokeCallbackWithError:(FlutterError *_Nullable *_Nonnull)error {
     IBGBugReporting.willInvokeHandler = ^{
-      [self->_flutterApi onSdkInvokeWithCompletion:^(NSError *_Nullable _){
+      [self->_flutterApi onSdkInvokeWithCompletion:^(FlutterError *_Nullable _){
       }];
     };
 }
@@ -141,7 +141,7 @@ - (void)bindOnDismissCallbackWithError:(FlutterError *_Nullable *_Nonnull)error
 
       [self->_flutterApi onSdkDismissDismissType:dismissTypeString
                                       reportType:reportTypeString
-                                      completion:^(NSError *_Nullable _){
+                                      completion:^(FlutterError *_Nullable _){
                                       }];
     };
 }

ios/Classes/Modules/RepliesApi.m

@@ -43,7 +43,7 @@ - (void)hasChatsWithCompletion:(nonnull void (^)(NSNumber * _Nullable, FlutterEr
 
 - (void)bindOnNewReplyCallbackWithError:(FlutterError *_Nullable *_Nonnull)error {
     IBGReplies.didReceiveReplyHandler = ^{
-      [self->_flutterApi onNewReplyWithCompletion:^(NSError *_Nullable _){
+      [self->_flutterApi onNewReplyWithCompletion:^(FlutterError *_Nullable _){
       }];
     };
 }

ios/Classes/Modules/SurveysApi.m

@@ -65,14 +65,14 @@ - (void)getAvailableSurveysWithCompletion:(void (^)(NSArray<NSString *> *_Nullab
 
 - (void)bindOnShowSurveyCallbackWithError:(FlutterError *_Nullable *_Nonnull)error {
     IBGSurveys.willShowSurveyHandler = ^{
-      [self->_flutterApi onShowSurveyWithCompletion:^(NSError *_Nullable _){
+      [self->_flutterApi onShowSurveyWithCompletion:^(FlutterError *_Nullable _){
       }];
     };
 }
 
 - (void)bindOnDismissSurveyCallbackWithError:(FlutterError *_Nullable *_Nonnull)error {
     IBGSurveys.didDismissSurveyHandler = ^{
-      [self->_flutterApi onDismissSurveyWithCompletion:^(NSError *_Nullable _){
+      [self->_flutterApi onDismissSurveyWithCompletion:^(FlutterError *_Nullable _){
       }];
     };
 }

pubspec.yaml

@@ -1,8 +1,8 @@
 name: instabug_flutter
 version: 11.13.0
 description: >-
-  Instabug empowers mobile teams to monitor, prioritize, and debug 
-  performance and stability issues throughout the app development lifecycle. 
+  Instabug empowers mobile teams to monitor, prioritize, and debug
+  performance and stability issues throughout the app development lifecycle.
 homepage: https://www.instabug.com/platforms/flutter
 repository: https://github.com/Instabug/Instabug-Flutter
 documentation: https://docs.instabug.com/docs/flutter-overview
@@ -18,9 +18,11 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   lint: ^1.0.0
-  mockito: 5.2.0
+  # mockito v5.2.0 is needed for running Flutter 2 tests on CI
+  mockito: '>=5.2.0 <=5.4.2'
   pana: ^0.21.0
-  pigeon: ^3.0.0
+  # pigeon v3.0.0 is needed for running Flutter 2 tests on CI
+  pigeon: '>=3.0.0 <=10.1.5'
 
 flutter:
   plugin: