From a358f0cd210f9c3faa0b8dbb85707ff08333f527 Mon Sep 17 00:00:00 2001
From: Arthas <luxuhui@agora.io>
Date: Thu, 19 Oct 2023 18:29:24 +0800
Subject: [PATCH] fix: can not upload to app store because of
 `CFBundleShortVersionString` not correct (#716)

---
 android/build.gradle       |  6 ++---
 example/ios/Podfile        |  2 +-
 example/ios/Podfile.lock   | 48 ++++++++++++++++++++++++++++++--------
 react-native-agora.podspec |  4 ++--
 4 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 56eb21b90..d83ab83b3 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -160,9 +160,9 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
-  api 'io.agora.rtc:agora-full-preview:4.2.3-build.1'
-  implementation 'io.agora.rtc:full-screen-sharing-special:4.2.3-build.1'
-  implementation 'io.agora.rtc:iris-rtc:4.2.3-build.1'
+  api 'io.agora.rtc:full-sdk:4.2.3'
+  implementation 'io.agora.rtc:full-screen-sharing:4.2.3'
+  implementation 'io.agora.rtc:iris-rtc:4.2.3-build.4'
 }
 
 if (isNewArchitectureEnabled()) {
diff --git a/example/ios/Podfile b/example/ios/Podfile
index bd3d4d229..f33faca4b 100644
--- a/example/ios/Podfile
+++ b/example/ios/Podfile
@@ -62,5 +62,5 @@ target 'AgoraRtcNgExample' do
 end
 
 target 'ScreenShare' do
-  pod 'AgoraRtcEngine_iOS_Preview', '4.2.3-build.1'
+  pod 'AgoraRtcEngine_iOS', '4.2.3'
 end
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index e07d3f6ed..1062dd821 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -1,6 +1,34 @@
 PODS:
-  - AgoraIrisRTC_iOS (4.2.3-build.1)
-  - AgoraRtcEngine_iOS_Preview (4.2.3-build.1)
+  - AgoraIrisRTC_iOS (4.2.3-build.4)
+  - AgoraRtcEngine_iOS (4.2.3):
+    - AgoraRtcEngine_iOS/AIAEC (= 4.2.3)
+    - AgoraRtcEngine_iOS/AINS (= 4.2.3)
+    - AgoraRtcEngine_iOS/AudioBeauty (= 4.2.3)
+    - AgoraRtcEngine_iOS/ClearVision (= 4.2.3)
+    - AgoraRtcEngine_iOS/ContentInspect (= 4.2.3)
+    - AgoraRtcEngine_iOS/DRM (= 4.2.3)
+    - AgoraRtcEngine_iOS/FaceDetection (= 4.2.3)
+    - AgoraRtcEngine_iOS/ReplayKit (= 4.2.3)
+    - AgoraRtcEngine_iOS/RtcBasic (= 4.2.3)
+    - AgoraRtcEngine_iOS/SpatialAudio (= 4.2.3)
+    - AgoraRtcEngine_iOS/VideoCodecDec (= 4.2.3)
+    - AgoraRtcEngine_iOS/VideoCodecEnc (= 4.2.3)
+    - AgoraRtcEngine_iOS/VirtualBackground (= 4.2.3)
+    - AgoraRtcEngine_iOS/VQA (= 4.2.3)
+  - AgoraRtcEngine_iOS/AIAEC (4.2.3)
+  - AgoraRtcEngine_iOS/AINS (4.2.3)
+  - AgoraRtcEngine_iOS/AudioBeauty (4.2.3)
+  - AgoraRtcEngine_iOS/ClearVision (4.2.3)
+  - AgoraRtcEngine_iOS/ContentInspect (4.2.3)
+  - AgoraRtcEngine_iOS/DRM (4.2.3)
+  - AgoraRtcEngine_iOS/FaceDetection (4.2.3)
+  - AgoraRtcEngine_iOS/ReplayKit (4.2.3)
+  - AgoraRtcEngine_iOS/RtcBasic (4.2.3)
+  - AgoraRtcEngine_iOS/SpatialAudio (4.2.3)
+  - AgoraRtcEngine_iOS/VideoCodecDec (4.2.3)
+  - AgoraRtcEngine_iOS/VideoCodecEnc (4.2.3)
+  - AgoraRtcEngine_iOS/VirtualBackground (4.2.3)
+  - AgoraRtcEngine_iOS/VQA (4.2.3)
   - boost (1.76.0)
   - CocoaAsyncSocket (7.6.5)
   - DoubleConversion (1.1.6)
@@ -378,8 +406,8 @@ PODS:
   - React-logger (0.72.5):
     - glog
   - react-native-agora (4.2.3):
-    - AgoraIrisRTC_iOS (= 4.2.3-build.1)
-    - AgoraRtcEngine_iOS_Preview (= 4.2.3-build.1)
+    - AgoraIrisRTC_iOS (= 4.2.3-build.4)
+    - AgoraRtcEngine_iOS (= 4.2.3)
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - react-native-agora-rawdata (0.1.0):
@@ -519,7 +547,7 @@ PODS:
     - Yoga (~> 1.14)
 
 DEPENDENCIES:
-  - AgoraRtcEngine_iOS_Preview (= 4.2.3-build.1)
+  - AgoraRtcEngine_iOS (= 4.2.3)
   - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
@@ -598,7 +626,7 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - AgoraIrisRTC_iOS
-    - AgoraRtcEngine_iOS_Preview
+    - AgoraRtcEngine_iOS
     - CocoaAsyncSocket
     - Flipper
     - Flipper-Boost-iOSX
@@ -718,8 +746,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  AgoraIrisRTC_iOS: 37cb575715e598aa8e7d698cc414e6b133d6f54e
-  AgoraRtcEngine_iOS_Preview: 6edd1558d60c290ffd46e1c7155b74491b031b27
+  AgoraIrisRTC_iOS: 84ae4f5824d68480d1215cbdd8db261549a7c94e
+  AgoraRtcEngine_iOS: eb0a7e87dbc9e818b267d413b48f76a57959e6f4
   boost: 57d2868c099736d80fcd648bf211b4431e51a558
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
@@ -753,7 +781,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: ff70a72027dea5cc7d71cfcc6fad7f599f63987a
   React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba
   React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4
-  react-native-agora: 44e1871e2b69dd0086461d14430e9e458b9e2001
+  react-native-agora: b59d2656b3c5b7a05dade5c86fa91ec7616ccf7d
   react-native-agora-rawdata: 097895cdccd8fcf3cff5dffe23372f5d3c89fd31
   react-native-image-tools: 88218449791389bbf550a2c475a3b564c8233c8b
   react-native-safe-area-context: 7aa8e6d9d0f3100a820efb1a98af68aa747f9284
@@ -785,6 +813,6 @@ SPEC CHECKSUMS:
   Yoga: 86fed2e4d425ee4c6eab3813ba1791101ee153c6
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 5c7ba70a042a1724b9b7a2a2a921bd36c7d8511c
+PODFILE CHECKSUM: 3933d6cb9d233a740943b1ee0fa22084b6fdc7e0
 
 COCOAPODS: 1.13.0
diff --git a/react-native-agora.podspec b/react-native-agora.podspec
index 40f828533..ab9f8e4d4 100644
--- a/react-native-agora.podspec
+++ b/react-native-agora.podspec
@@ -40,8 +40,8 @@ Pod::Spec.new do |s|
    end
   end
 
-  s.dependency 'AgoraRtcEngine_iOS_Preview', '4.2.3-build.1'
-  s.dependency 'AgoraIrisRTC_iOS', '4.2.3-build.1'
+  s.dependency 'AgoraRtcEngine_iOS', '4.2.3'
+  s.dependency 'AgoraIrisRTC_iOS', '4.2.3-build.4'
   s.libraries = 'stdc++'
   s.framework = 'ReplayKit'
 end