feat: support expo updates (#1391)

kholood-ea · ahmedAlaaInstabug · web-flow · commit 69d66c5d8f54 · 2025-08-18T15:41:43.000+03:00
* feat: xcode 16 support

* feat: xcode 16 support

* feat: xcode 16 support

* feat: xcode 16 support

* feat: xcode 16 support

* feat: xcode 16 support

* feat: xcode 16 support

* feat: xcode 16 support

* feat: xcode 16 support

* feat: xcode 16 support

* feat: xcode 16 support

* chore: integrate iOS expo updates support custom build

* feat[ios]: add setOverAirVersion

* feat[ios]: test setOverAirVersion

* feat: add setOverAirVersion

* feat: test setOverAirVersion

* chore[ios]: revert old cocoapods version

* chore(example): revert old example app

* chore (example): fix lint

* chore(android): integrate with expo updates android snapshot

* feat(android): add setOverAirVersion API

* chore: add changelog item

* chore(android): remove log

* chore(iOS): fix failing CI

* chore(ios): workaround failing CI

* ci: fix ci running

* ci: fix ci running

* chore(android): add dependency

* chore(CI): fix sync_generated_files task

* chore(CI): fix sync_generated_files task

* chore(android): update snapshot

* chore(CI): fix ios sync

* chore: fix CI sync_generated_files job

* hore: fix CI sync_generated_files job

* chore(ios): update custom build

* chore: fix CI sync_generated_files job

* fix(ios): service type mismatch

* fix(ios): fix test SetOverAirVersion

* fix(ios): fix test SetOverAirVersion

* chore: fix CI job

* chore: revert old podfile.lock

* feat: add new ios custom build

* chore: add latest android snapshot

* fix: type conversion

* fix: ios test cases

* fix: migration issue

* fix: migration issue

* fix: podfile issue

---------

Co-authored-by: Ahmed alaa &lt;aalaa@instabug.com&gt;
Co-authored-by: ahmed alaa &lt;154802748+ahmedAlaaInstabug@users.noreply.github.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,8 @@
 
 ### Added
 
+- Add support for expo updates versioning ([#1391](https://github.com/Instabug/Instabug-React-Native/pull/1391))
+
 - Add support enable/disable screenshot auto masking. ([#1389](https://github.com/Instabug/Instabug-React-Native/pull/1389))
 
 - Add support for BugReporting user consents. ([#1383](https://github.com/Instabug/Instabug-React-Native/pull/1383))
diff --git a/android/src/main/java/com/instabug/reactlibrary/ArgsRegistry.java b/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 com.instabug.library.MaskingType;
 
 import java.util.ArrayList;
@@ -61,6 +62,7 @@ static Map<String, Object> getAll() {
             putAll(locales);
             putAll(placeholders);
             putAll(launchType);
+            putAll(overAirUpdateService);
             putAll(autoMaskingTypes);
             putAll(userConsentActionType);
         }};
@@ -255,6 +257,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.
diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabug.java b/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;
@@ -175,6 +176,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.
          */
@@ -235,6 +241,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 flag to override SDK screenshot security behavior.
          *
@@ -289,6 +305,17 @@ public void build() {
                     instabugBuilder.ignoreFlagSecure(ignoreFlagSecure);
                 }
 
+               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
diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java b/android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java
@@ -157,7 +157,10 @@ public void init(
             final boolean useNativeNetworkInterception,
             @Nullable final String codePushVersion,
             @Nullable final String appVariant,
-            final ReadableMap map
+            final ReadableMap map,
+            @Nullable final ReadableMap overAirVersion
+
+
     ) {
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
@@ -189,6 +192,16 @@ public void run() {
                  if (appVariant != null) {
                             builder.setAppVariant(appVariant);
                     }
+
+                if(overAirVersion != null ) {
+                    if(Instabug.isBuilt()) {
+                        Instabug.setOverAirVersion(overAirVersion.getString("version"),
+                                ArgsRegistry.overAirUpdateService.get(overAirVersion.getString("service")));
+                    } else {
+                        builder.setOverAirVersion(overAirVersion);
+                    }
+                }
+
                 builder.build();
             }
         });
@@ -208,6 +221,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
diff --git a/android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java b/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 com.instabug.library.MaskingType;
 
@@ -202,6 +203,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
diff --git a/examples/default/ios/InstabugTests/InstabugSampleTests.m b/examples/default/ios/InstabugTests/InstabugSampleTests.m
@@ -72,20 +72,29 @@ - (void)testInit {
   NSString *appVariant = @"variant 1";
 
   NSArray *invocationEvents = [NSArray arrayWithObjects:[NSNumber numberWithInteger:floatingButtonInvocationEvent], nil];
+  NSDictionary *overAirVersion = @{
+    @"service":@"expo",
+    @"version":@"D0A12345-6789-4B3C-A123-4567ABCDEF01"
+  };
   BOOL useNativeNetworkInterception = YES;
   IBGSDKDebugLogsLevel sdkDebugLogsLevel = IBGSDKDebugLogsLevelDebug;
+  IBGOverAirType service = [ArgsRegistry.overAirServices[overAirVersion[@"service"]] intValue];
 
   OCMStub([mock setCodePushVersion:codePushVersion]);
+  OCMStub([mock setOverAirVersion:overAirVersion[@"version"] withType:service]);
 
-  [self.instabugBridge init:appToken invocationEvents:invocationEvents debugLogsLevel:sdkDebugLogsLevel useNativeNetworkInterception:useNativeNetworkInterception codePushVersion:codePushVersion appVariant:appVariant  options:nil ];
+  [self.instabugBridge init:appToken invocationEvents:invocationEvents debugLogsLevel:sdkDebugLogsLevel useNativeNetworkInterception:useNativeNetworkInterception codePushVersion:codePushVersion appVariant:appVariant  options:nil  overAirVersion:overAirVersion ];
   OCMVerify([mock setCodePushVersion:codePushVersion]);
 
+  OCMVerify([mock setOverAirVersion:overAirVersion[@"version"] withType:[overAirVersion[@"service"] intValue]]);
+
+
   XCTAssertEqual(Instabug.appVariant, appVariant);
 
   OCMVerify([self.mRNInstabug initWithToken:appToken invocationEvents:floatingButtonInvocationEvent debugLogsLevel:sdkDebugLogsLevel useNativeNetworkInterception:useNativeNetworkInterception]);
 }
 
-- (void)testSetCodePushVersion {
+- (void)test {
   id mock = OCMClassMock([Instabug class]);
   NSString *codePushVersion = @"123";
 
@@ -94,6 +103,20 @@ - (void)testSetCodePushVersion {
   OCMVerify([mock setCodePushVersion:codePushVersion]);
 }
 
+- (void)testSetOverAirVersion {
+  id mock = OCMClassMock([Instabug class]);
+  NSDictionary *overAirVersion = @{
+    @"service":@"expo",
+    @"version":@"D0A12345-6789-4B3C-A123-4567ABCDEF01"
+  };
+
+  [self.instabugBridge setOverAirVersion:overAirVersion];
+
+  IBGOverAirType service = [ArgsRegistry.overAirServices[overAirVersion[@"service"]] intValue];
+
+  OCMVerify([mock setOverAirVersion:overAirVersion[@"version"] withType:[overAirVersion[@"service"] intValue]]);
+}
+
 - (void)testSetUserData {
   id mock = OCMClassMock([Instabug class]);
   NSString *userData = @"user_data";
diff --git a/examples/default/ios/InstabugTests/RNInstabugTests.m b/examples/default/ios/InstabugTests/RNInstabugTests.m
@@ -73,4 +73,26 @@ - (void) testSetCodePushVersion {
   OCMVerify([self.mInstabug setCodePushVersion:codePushVersion]);
 }
 
+- (void)testSetOverAirVersionExpo {
+  NSDictionary *overAirVersion = @{
+    @"service":@(IBGOverAirTypeExpo),
+    @"version":@"D0A12345-6789-4B3C-A123-4567ABCDEF01"
+  };
+  
+  [RNInstabug setOverAirVersion:overAirVersion];
+
+  OCMVerify([self.mInstabug setOverAirVersion:overAirVersion[@"version"] withType:[overAirVersion[@"service"] intValue]]);
+}
+
+- (void)testSetOverAirVersionCodepush {
+  NSDictionary *overAirVersion = @{
+    @"service":@(IBGOverAirTypeCodePush),
+    @"version":@"2.0.0"
+  };
+  
+  [RNInstabug setOverAirVersion:overAirVersion];
+
+  OCMVerify([self.mInstabug setOverAirVersion:overAirVersion[@"version"] withType:[overAirVersion[@"service"] intValue]]);
+}
+
 @end
diff --git a/examples/default/ios/Podfile b/examples/default/ios/Podfile
@@ -16,7 +16,7 @@ target 'InstabugExample' do
   rn_maps_path = '../node_modules/react-native-maps'
   pod 'react-native-google-maps', :path => rn_maps_path
 
-  # Flags change depending on the env values.
+  # add this line
   flags = get_default_flags()
 
   use_react_native!(
diff --git a/examples/default/ios/Podfile.lock b/examples/default/ios/Podfile.lock
@@ -2098,6 +2098,6 @@ SPEC CHECKSUMS:
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   Yoga: 055f92ad73f8c8600a93f0e25ac0b2344c3b07e6
 
-PODFILE CHECKSUM: 837b933596e1616ff02cc206bb17dee4f611fdbc
+PODFILE CHECKSUM: ac02ce223b69d8b05ac5901eaaac229f19e6d881
 
 COCOAPODS: 1.14.0
diff --git a/examples/default/src/App.tsx b/examples/default/src/App.tsx
@@ -13,6 +13,7 @@ import Instabug, {
   NetworkLogger,
   ReproStepsMode,
   SessionReplay,
+  OverAirUpdateServices,
 } from 'instabug-reactnative';
 import { NativeBaseProvider } from 'native-base';
 
@@ -50,6 +51,7 @@ export const App: React.FC = () => {
         debugLogsLevel: LogLevel.verbose,
         networkInterceptionMode: NetworkInterceptionMode.javascript,
         appVariant: 'App variant',
+        overAirVersion: { service: OverAirUpdateServices.codePush, version: '1.0.0' },
       });
 
       CrashReporting.setNDKCrashesEnabled(true);
diff --git a/examples/default/src/screens/HomeScreen.tsx b/examples/default/src/screens/HomeScreen.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 
 import type { NativeStackScreenProps } from '@react-navigation/native-stack';
-
 import { ListTile } from '../components/ListTile';
 import { Screen } from '../components/Screen';
 import type { HomeStackParamList } from '../navigation/HomeStack';
diff --git a/ios/RNInstabug/ArgsRegistry.h b/ios/RNInstabug/ArgsRegistry.h
@@ -23,6 +23,7 @@ typedef NSDictionary<NSString*, NSNumber*> ArgsDictionary;
 + (ArgsDictionary *) locales;
 + (ArgsDictionary *)nonFatalExceptionLevel;
 + (ArgsDictionary *) launchType;
++ (ArgsDictionary *) overAirServices;
 + (ArgsDictionary *) userConsentActionTypes;
 
 + (NSDictionary<NSString *, NSString *> *) placeholders;
diff --git a/ios/RNInstabug/ArgsRegistry.m b/ios/RNInstabug/ArgsRegistry.m
@@ -21,6 +21,8 @@ + (NSMutableDictionary *) getAll {
     [all addEntriesFromDictionary:ArgsRegistry.nonFatalExceptionLevel];
     [all addEntriesFromDictionary:ArgsRegistry.placeholders];
     [all addEntriesFromDictionary:ArgsRegistry.launchType];
+    [all addEntriesFromDictionary:ArgsRegistry.overAirServices];
+
     [all addEntriesFromDictionary:ArgsRegistry.autoMaskingTypes];
     [all addEntriesFromDictionary:ArgsRegistry.userConsentActionTypes];
     
@@ -256,6 +258,12 @@ + (ArgsDictionary *) launchType {
         @"unknown":@(LaunchTypeUnknown)
     };
 }
++ (ArgsDictionary *) overAirServices {
+    return @{
+        @"expo":@(IBGOverAirTypeExpo) ,
+        @"codePush":@(IBGOverAirTypeCodePush),
+    };
+}
 
 + (ArgsDictionary *)autoMaskingTypes {
     return @{
diff --git a/ios/RNInstabug/InstabugReactBridge.h b/ios/RNInstabug/InstabugReactBridge.h
@@ -26,10 +26,12 @@
 
 - (void)setEnabled:(BOOL)isEnabled;
 
-- (void)init:(NSString *)token invocationEvents:(NSArray *)invocationEventsArray debugLogsLevel:(IBGSDKDebugLogsLevel)sdkDebugLogsLevel useNativeNetworkInterception:(BOOL)useNativeNetworkInterception codePushVersion:(NSString *)codePushVersion appVariant:(NSString *)appVariant options:(nullable NSDictionary *)options;
+- (void)init:(NSString *)token invocationEvents:(NSArray *)invocationEventsArray debugLogsLevel:(IBGSDKDebugLogsLevel)sdkDebugLogsLevel useNativeNetworkInterception:(BOOL)useNativeNetworkInterception codePushVersion:(NSString *)codePushVersion appVariant:(NSString *)appVariant options:(nullable NSDictionary *)options  overAirVersion:(NSDictionary *)overAirVersion;
 
 - (void)setCodePushVersion:(NSString *)version;
 
+- (void)setOverAirVersion:(NSDictionary *)overAirVersion;
+
 - (void)setUserData:(NSString *)userData;
 
 - (void)setAppVariant:(NSString *)appVariant;
diff --git a/ios/RNInstabug/InstabugReactBridge.m b/ios/RNInstabug/InstabugReactBridge.m
@@ -44,7 +44,7 @@ - (dispatch_queue_t)methodQueue {
           codePushVersion:(NSString *)codePushVersion
           appVariant:(NSString *)appVariant
           options:(nullable NSDictionary *)options
-
+          overAirVersion :(NSDictionary *)overAirVersion
           ) {
 
            if(appVariant != nil){
@@ -59,6 +59,8 @@ - (dispatch_queue_t)methodQueue {
 
     [Instabug setCodePushVersion:codePushVersion];
 
+    [Instabug setOverAirVersion:overAirVersion[@"version"] withType:[overAirVersion[@"service"] intValue]];
+
     [RNInstabug initWithToken:token
              invocationEvents:invocationEvents
                debugLogsLevel:sdkDebugLogsLevel
@@ -69,6 +71,10 @@ - (dispatch_queue_t)methodQueue {
     [Instabug setCodePushVersion:version];
 }
 
+RCT_EXPORT_METHOD(setOverAirVersion:(NSDictionary *)overAirVersion) {
+    [Instabug setOverAirVersion:overAirVersion[@"version"] withType:[overAirVersion[@"service"] intValue]];
+}
+
 RCT_EXPORT_METHOD(setAppVariant:(NSString *)appVariant) {
     Instabug.appVariant = appVariant;
 }
diff --git a/ios/RNInstabug/RNInstabug.h b/ios/RNInstabug/RNInstabug.h
@@ -2,6 +2,7 @@
 #define RNInstabug_h
 
 #import <InstabugSDK/InstabugSDK.h>
+#import "ArgsRegistry.h"
 
 @interface RNInstabug : NSObject
 
@@ -27,6 +28,8 @@ useNativeNetworkInterception:(BOOL)useNativeNetworkInterception;
  */
 + (void)setCodePushVersion:(NSString *)codePushVersion;
 
++ (void)setOverAirVersion:(NSDictionary *)overAirVersion;
+
 @end
 
 #endif /* RNInstabug_h */
diff --git a/ios/RNInstabug/RNInstabug.m b/ios/RNInstabug/RNInstabug.m
@@ -61,6 +61,11 @@ + (void)setCodePushVersion:(NSString *)codePushVersion {
     [Instabug setCodePushVersion:codePushVersion];
 }
 
++ (void)setOverAirVersion:(NSDictionary *)overAirVersion {
+    [Instabug setOverAirVersion:overAirVersion[@"version"] withType:[overAirVersion[@"service"] intValue]];
+}
+
+
 // Note: This function is used to bridge IBGNSLog with RCTLogFunction.
 // This log function should not be used externally and is only an implementation detail.
 void RNIBGLog(IBGLogLevel logLevel, NSString *format,  ...) {
diff --git a/src/models/InstabugConfig.ts b/src/models/InstabugConfig.ts
diff --git a/src/models/OverAirUpdate.ts b/src/models/OverAirUpdate.ts
diff --git a/src/modules/Instabug.ts b/src/modules/Instabug.ts
diff --git a/src/native/NativeConstants.ts b/src/native/NativeConstants.ts
diff --git a/src/native/NativeInstabug.ts b/src/native/NativeInstabug.ts
diff --git a/src/utils/Enums.ts b/src/utils/Enums.ts
diff --git a/test/mocks/mockInstabug.ts b/test/mocks/mockInstabug.ts
diff --git a/test/modules/Instabug.spec.ts b/test/modules/Instabug.spec.ts
