fix(sdkVersions): fix ci issues

asamiz · asamiz · commit 32c1731b7252 · 2023-09-10T17:20:44.000+03:00
diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabug.java b/android/src/main/java/com/instabug/reactlibrary/RNInstabug.java
@@ -19,6 +19,7 @@
 public class RNInstabug {
 
     private static RNInstabug instance;
+    public static final String SDK_VERSION = "11.13.0";
     
     private RNInstabug() {}
 
@@ -111,10 +112,10 @@ public void init(
     @VisibleForTesting
     public void setCurrentPlatform() {
         try {
-            Method method = InstabugUtil.getMethod(Class.forName("com.instabug.library.Instabug"), "setCurrentPlatform", int.class);
+            Method method = InstabugUtil.getMethod(Class.forName("com.instabug.library.Instabug"), "setCurrentPlatform", int.class, String.class);
             if (method != null) {
                 Log.i("IBG-CP-Bridge", "invoking setCurrentPlatform with platform: " + Platform.RN + " and version: 11.13.0");
-                method.invoke(null, Platform.RN, "11.13.0"); // Second parameter is the version of the RN SDK
+                method.invoke(null, Platform.RN, SDK_VERSION); // Second parameter is the version of the RN SDK
             } else {
                 Log.e("IBG-CP-Bridge", "setCurrentPlatform was not found by reflection");
             }
diff --git a/android/src/test/java/com/instabug/reactlibrary/RNInstabugTest.java b/android/src/test/java/com/instabug/reactlibrary/RNInstabugTest.java
@@ -103,7 +103,7 @@ public void testInitWithoutLogLevel() {
     public void testSetCurrentPlatform() {
         sut.setCurrentPlatform();
 
-        reflected.verify(() -> MockReflected.setCurrentPlatform(Platform.RN, "11.13.0"));
+        reflected.verify(() -> MockReflected.setCurrentPlatform(Platform.RN, RNInstabug.SDK_VERSION));
     }
 
     @Test
diff --git a/android/src/test/java/com/instabug/reactlibrary/util/GlobalMocks.java b/android/src/test/java/com/instabug/reactlibrary/util/GlobalMocks.java
@@ -23,12 +23,12 @@ public static void setUp() throws NoSuchMethodException {
         reflection = mockStatic(InstabugUtil.class);
         reflected = mockStatic(MockReflected.class);
 
-        Method mSetCurrentPlatform = MockReflected.class.getDeclaredMethod("setCurrentPlatform", int.class);
+        Method mSetCurrentPlatform = MockReflected.class.getDeclaredMethod("setCurrentPlatform", int.class, String.class);
         mSetCurrentPlatform.setAccessible(true);
 
         // setCurrentPlatform mock
         reflection
-                .when(() -> InstabugUtil.getMethod(Class.forName("com.instabug.library.Instabug"), "setCurrentPlatform", int.class))
+                .when(() -> InstabugUtil.getMethod(Class.forName("com.instabug.library.Instabug"), "setCurrentPlatform", int.class, String.class))
                 .thenReturn(mSetCurrentPlatform);
 
         // setBaseUrl mock
diff --git a/ios/RNInstabug/InstabugReactBridge.m b/ios/RNInstabug/InstabugReactBridge.m
@@ -433,6 +433,7 @@ - (void) setBaseUrlForDeprecationLogs {
         [inv setTarget:[Instabug class]];
         IBGPlatform platform = IBGPlatformReactNative;
         [inv setArgument:&(platform) atIndex:2];
+        [inv setArgument:&(cpSDKVersion) atIndex:3];
         
         [inv invoke];
     }

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public void testInitWithoutLogLevel() {`
`103`	`103`	`public void testSetCurrentPlatform() {`
`104`	`104`	`sut.setCurrentPlatform();`
`105`	`105`
`106`		`- reflected.verify(() -> MockReflected.setCurrentPlatform(Platform.RN, "11.13.0"));`
	`106`	`+ reflected.verify(() -> MockReflected.setCurrentPlatform(Platform.RN, RNInstabug.SDK_VERSION));`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -433,6 +433,7 @@ - (void) setBaseUrlForDeprecationLogs {`
`433`	`433`	`[inv setTarget:[Instabug class]];`
`434`	`434`	`IBGPlatform platform = IBGPlatformReactNative;`
`435`	`435`	`[inv setArgument:&(platform) atIndex:2];`
	`436`	`+ [inv setArgument:&(cpSDKVersion) atIndex:3];`
`436`	`437`
`437`	`438`	`[inv invoke];`
`438`	`439`	`}`