feat: support expo updates

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [Unreleased](https://github.com/Instabug/Instabug-React-Native/compare/v14.3.0...dev)
+
+### Added
+
+- Add support for xCode 16. ([#1370](https://github.com/Instabug/Instabug-React-Native/pull/1370))
+- Add support for expo updates versioning ([#1391](https://github.com/Instabug/Instabug-React-Native/pull/1391))
+
 ## [14.3.0](https://github.com/Instabug/Instabug-React-Native/compare/v14.1.0...14.3.0)
 
 ### Added

RNInstabug.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.homepage     = package["homepage"]
   s.source       = { :git => "https://github.com/Instabug/Instabug-React-Native.git", :tag => 'v' + package["version"] }
 
-  s.platform     = :ios, "9.0"
+  s.platform     = :ios, "13.0"
   s.source_files = "ios/**/*.{h,m,mm}"
 
   s.dependency 'React-Core'

android/native.gradle

@@ -1,5 +1,5 @@
 project.ext.instabug = [
-    version: '14.3.0'
+    version: '14.3.0.6745894-SNAPSHOT'
 ]
 
 dependencies {

android/src/main/java/com/instabug/reactlibrary/ArgsRegistry.java

@@ -17,6 +17,7 @@
 import com.instabug.library.invocation.util.InstabugVideoRecordingButtonPosition;
 import com.instabug.library.sessionreplay.model.SessionMetadata;
 import com.instabug.library.ui.onboarding.WelcomeMessage;
+import com.instabug.library.util.overairversion.OverAirVersionType;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -60,6 +61,7 @@ static Map<String, Object> getAll() {
             putAll(locales);
             putAll(placeholders);
             putAll(launchType);
+            putAll(overAirUpdateService);
         }};
     }
 
@@ -246,6 +248,11 @@ static Map<String, Object> getAll() {
         put("warm",SessionMetadata.LaunchType.WARM );
         put("unknown","unknown");
     }};
+
+    public static ArgsMap<Integer> overAirUpdateService = new ArgsMap<Integer>() {{
+        put("expo", OverAirVersionType.EXPO);
+        put("codePush",OverAirVersionType.CODE_PUSH );
+    }};
 
 // Temporary workaround to be removed in future release
 // This is used for mapping native `LaunchType` values into React Native enum values.

android/src/main/java/com/instabug/reactlibrary/RNInstabug.java

@@ -6,6 +6,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
+import com.facebook.react.bridge.ReadableMap;
 import com.instabug.apm.APM;
 import com.instabug.library.Instabug;
 import com.instabug.library.LogLevel;
@@ -156,6 +157,11 @@ public static class Builder {
          */
         private String codePushVersion;
 
+        /**
+         * The overAirUpdate Version to be used for all reports.
+         */
+       private ReadableMap overAirVersion;
+
         /**
          * The events that trigger the SDK's user interface.
          */
@@ -210,6 +216,16 @@ public Builder setCodePushVersion(String codePushVersion) {
             return this;
         }
 
+       /**
+        * Sets over air update version to be used for all reports.
+        *
+        * @param overAirVersion the over air update version and service map.
+        */
+       public Builder setOverAirVersion(ReadableMap overAirVersion) {
+           this.overAirVersion = overAirVersion;
+           return this;
+       }
+
         /**
          * Sets the invocation triggering events for the SDK's user interface
          *
@@ -237,6 +253,17 @@ public void build() {
                     instabugBuilder.setCodePushVersion(codePushVersion);
                 }
 
+               if (overAirVersion != null ) {
+                   if (overAirVersion.hasKey("service") && overAirVersion.hasKey("version"))
+                   {
+                       if (overAirVersion.getString("service")!=null && overAirVersion.getString("version")!=null)
+                       {
+                           instabugBuilder.setOverAirVersion(overAirVersion.getString("version"),
+                               ArgsRegistry.overAirUpdateService.get(overAirVersion.getString("service")));
+                       }
+                   }
+               }
+
                 instabugBuilder.build();
 
                 // Temporarily disabling APM hot launches

android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java

@@ -144,7 +144,8 @@ public void init(
             final ReadableArray invocationEventValues,
             final String logLevel,
             final boolean useNativeNetworkInterception,
-            @Nullable final String codePushVersion
+            @Nullable final String codePushVersion,
+            @Nullable final ReadableMap overAirVersion
     ) {
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
@@ -169,6 +170,16 @@ public void run() {
                         builder.setCodePushVersion(codePushVersion);
                     }
                 }
+
+                if(overAirVersion != null ) {
+                    if(Instabug.isBuilt()) {
+                        Instabug.setOverAirVersion(overAirVersion.getString("version"),
+                                ArgsRegistry.overAirUpdateService.get(overAirVersion.getString("service")));
+                    } else {
+                        builder.setOverAirVersion(overAirVersion);
+                    }
+                }
+
                 builder.build();
             }
         });
@@ -188,6 +199,22 @@ public void run() {
         });
     }
 
+    @ReactMethod
+    public void setOverAirVersion(@Nullable final ReadableMap overAirVersion) {
+        MainThreadHandler.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Instabug.setOverAirVersion(overAirVersion.getString("version"),
+                            ArgsRegistry.overAirUpdateService.get(overAirVersion.getString("service")));
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
 
     /**
      * Adds tag(s) to issues before sending them

android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java

@@ -24,6 +24,7 @@
 import com.instabug.library.featuresflags.model.IBGFeatureFlag;
 import com.instabug.library.internal.module.InstabugLocale;
 import com.instabug.library.ui.onboarding.WelcomeMessage;
+import com.instabug.library.util.overairversion.OverAirVersionType;
 import com.instabug.reactlibrary.utils.MainThreadHandler;
 
 import org.junit.After;
@@ -213,6 +214,21 @@ public void testSetCodePushVersion() {
         mockInstabug.verify(() -> Instabug.setCodePushVersion(codePushVersion));
     }
 
+    @Test
+    public void testSetOverAirVersion() {
+        WritableMap mockMap = mock(WritableMap.class);
+
+        String version="D0A12345-6789-4B3C-A123-4567ABCDEF0";
+
+        when(mockMap.getString("version")).thenReturn(version);
+        when(mockMap.getString("service")).thenReturn("expo");
+
+        rnModule.setOverAirVersion(mockMap);
+
+        mockInstabug.verify(() -> Instabug.setOverAirVersion(
+                version, OverAirVersionType.EXPO));
+    }
+
     @Test
     public void testIdentifyUserWithNoId() {
         // given
@@ -663,18 +679,18 @@ public void testW3CCaughtHeaderFlag(){
         verify(promise).resolve(expected);
     }
 
-   
+
     @Test
     public void testSetNetworkLogBodyEnabled() {
         rnModule.setNetworkLogBodyEnabled(true);
-    
+
         mockInstabug.verify(() -> Instabug.setNetworkLogBodyEnabled(true));
     }
 
     @Test
     public void testSetNetworkLogBodyDisabled() {
         rnModule.setNetworkLogBodyEnabled(false);
-    
+
         mockInstabug.verify(() -> Instabug.setNetworkLogBodyEnabled(false));
     }
 }

examples/default/ios/InstabugTests/InstabugAPMTests.m

@@ -9,9 +9,9 @@
 #import <XCTest/XCTest.h>
 #import "OCMock/OCMock.h"
 #import "InstabugAPMBridge.h"
-#import <Instabug/IBGTypes.h>
-#import <Instabug/IBGAPM.h>
-#import "Instabug/Instabug.h"
+#import <InstabugSDK/IBGTypes.h>
+#import <InstabugSDK/IBGAPM.h>
+#import "InstabugSDK/InstabugSDK.h"
 #import "IBGConstants.h"
 #import "RNInstabug/IBGAPM+PrivateAPIs.h"
 

examples/default/ios/InstabugTests/InstabugBugReportingTests.m

@@ -9,8 +9,8 @@
 #import <XCTest/XCTest.h>
 #import "OCMock/OCMock.h"
 #import "InstabugBugReportingBridge.h"
-#import <Instabug/IBGTypes.h>
-#import "Instabug/Instabug.h"
+#import <InstabugSDK/IBGTypes.h>
+#import "InstabugSDK/InstabugSDK.h"
 #import "IBGConstants.h"
 
 @interface InstabugBugReportingTests : XCTestCase
@@ -39,7 +39,7 @@ - (void) testgivenBoolean$setBugReportingEnabled_whenQuery_thenShouldCallNativeA
 - (void) testgivenInvocationEvent$setInvocationEvents_whenQuery_thenShouldCallNativeApiWithArgs {
   NSArray *invocationEventsArr;
   invocationEventsArr = [NSArray arrayWithObjects:  @(IBGInvocationEventScreenshot), nil];
-  
+
   [self.instabugBridge setInvocationEvents:invocationEventsArr];
   IBGInvocationEvent invocationEvents = 0;
   for (NSNumber *boxedValue in invocationEventsArr) {
@@ -76,7 +76,7 @@ - (void) testgivenHandlerSUBMIT$setOnSDKDismissedHandler_whenQuery_thenShouldCal
   RCTResponseSenderBlock callback = ^(NSArray *response) {};
   [partialMock setOnSDKDismissedHandler:callback];
   XCTAssertNotNil(IBGBugReporting.didDismissHandler);
-  
+
   NSDictionary *result = @{ @"dismissType": @"SUBMIT",
                             @"reportType": @"feedback"};
   OCMStub([partialMock sendEventWithName:@"IBGpostInvocationHandler" body:result]);
@@ -137,14 +137,14 @@ - (void) testgivenArgs$showBugReportingWithReportTypeAndOptions_whenQuery_thenSh
   }
   OCMStub([mock showWithReportType:reportType options:parsedOptions]);
   [self.instabugBridge show:reportType options:options];
-  
+
   XCTestExpectation *expectation = [self expectationWithDescription:@"Test ME PLX"];
-  
+
   [[NSRunLoop mainRunLoop] performBlock:^{
     OCMVerify([mock showWithReportType:reportType options:parsedOptions]);
     [expectation fulfill];
   }];
-  
+
   [self waitForExpectationsWithTimeout:EXPECTATION_TIMEOUT handler:nil];
 }
 

examples/default/ios/InstabugTests/InstabugCrashReportingTests.m

@@ -1,5 +1,5 @@
 #import <XCTest/XCTest.h>
-#import "Instabug/Instabug.h"
+#import "InstabugSDK/InstabugSDK.h"
 #import "InstabugCrashReportingBridge.h"
 #import "OCMock/OCMock.h"
 #import "Util/IBGCrashReporting+CP.h"
@@ -19,10 +19,10 @@ - (void)setUp {
 }
 
 - (void)testSetEnabled {
- 
+
   [self.bridge setEnabled:NO];
   XCTAssertFalse(IBGCrashReporting.enabled);
-  
+
   [self.bridge setEnabled:YES];
   XCTAssertTrue(IBGCrashReporting.enabled);
 
@@ -37,7 +37,7 @@ - (void)testSendJSCrash {
     [expectation fulfill];
   };
   RCTPromiseRejectBlock reject = ^(NSString *code, NSString *message, NSError *error) {};
-  
+
   [self.bridge sendJSCrash:stackTrace resolver:resolve rejecter:reject];
 
   [self waitForExpectations:@[expectation] timeout:1];
@@ -52,9 +52,9 @@ - (void)testSendNonFatalErrorJsonCrash {
   NSDictionary *userAttributes = @{ @"key" : @"value",  };
   IBGNonFatalLevel ibgNonFatalLevel = IBGNonFatalLevelInfo;
 
-  
+
   [self.bridge sendHandledJSCrash:jsonCrash userAttributes:userAttributes  fingerprint:fingerPrint nonFatalExceptionLevel:ibgNonFatalLevel resolver:resolve rejecter:reject];
-    
+
     OCMVerify([self.mCrashReporting cp_reportNonFatalCrashWithStackTrace:jsonCrash
            level:IBGNonFatalLevelInfo
          groupingString:fingerPrint

examples/default/ios/InstabugTests/InstabugFeatureRequestsTests.m

@@ -9,8 +9,8 @@
 #import <XCTest/XCTest.h>
 #import "OCMock/OCMock.h"
 #import "InstabugFeatureRequestsBridge.h"
-#import <Instabug/IBGTypes.h>
-#import "Instabug/Instabug.h"
+#import <InstabugSDK/IBGTypes.h>
+#import "InstabugSDK/InstabugSDK.h"
 #import "IBGConstants.h"
 
 @interface InstabugFeatureRequestsTests : XCTestCase
@@ -48,12 +48,12 @@ - (void) testgive$show_whenQuery_thenShouldCallNativeApi {
   OCMStub([mock show]);
   [self.instabugBridge show];
   XCTestExpectation *expectation = [self expectationWithDescription:@"Test ME PLX"];
-  
+
   [[NSRunLoop mainRunLoop] performBlock:^{
     OCMVerify([mock show]);
     [expectation fulfill];
   }];
-  
+
   [self waitForExpectationsWithTimeout:EXPECTATION_TIMEOUT handler:nil];
 }
 

examples/default/ios/InstabugTests/InstabugRepliesTests.m

@@ -9,8 +9,8 @@
 #import <XCTest/XCTest.h>
 #import "OCMock/OCMock.h"
 #import "InstabugRepliesBridge.h"
-#import <Instabug/IBGTypes.h>
-#import "Instabug/Instabug.h"
+#import <InstabugSDK/IBGTypes.h>
+#import "InstabugSDK/InstabugSDK.h"
 #import "IBGConstants.h"
 
 @interface InstabugRepliesTests : XCTestCase
@@ -53,12 +53,12 @@ - (void) testgiven$show_whenQuery_thenShouldCallNativeApi {
   OCMStub([mock show]);
   [self.instabugBridge show];
   XCTestExpectation *expectation = [self expectationWithDescription:@"Test ME PLX"];
-  
+
   [[NSRunLoop mainRunLoop] performBlock:^{
     OCMVerify([mock show]);
     [expectation fulfill];
   }];
-  
+
   [self waitForExpectationsWithTimeout:EXPECTATION_TIMEOUT handler:nil];
 }
 
@@ -67,7 +67,7 @@ - (void) testgivenOnNewReplyReceivedHandler$setOnNewReplyReceivedCallback_whenQu
   RCTResponseSenderBlock callback = ^(NSArray *response) {};
   [partialMock setOnNewReplyReceivedHandler:callback];
   XCTAssertNotNil(IBGReplies.didReceiveReplyHandler);
-  
+
   OCMStub([partialMock sendEventWithName:@"IBGOnNewReplyReceivedCallback" body:nil]);
   IBGReplies.didReceiveReplyHandler();
   OCMVerify([partialMock sendEventWithName:@"IBGOnNewReplyReceivedCallback" body:nil]);
@@ -90,7 +90,7 @@ - (void) testgivenBoolean$setInAppNotificationEnabled_whenQuery_thenShouldCallNa
 - (void)testSetPushNotificationsEnabled {
   id mock = OCMClassMock([IBGReplies class]);
   BOOL isPushNotificationEnabled = true;
-  
+
   OCMStub([mock setPushNotificationsEnabled:isPushNotificationEnabled]);
   [self.instabugBridge setPushNotificationsEnabled:isPushNotificationEnabled];
   OCMVerify([mock setPushNotificationsEnabled:isPushNotificationEnabled]);