Merge develop to master for release 5.0.1 (#1026)

* fix Crashes typing * Fix CVE-2017-16137 (#1018) * Add dataResidencyRegion option for sending to portal (#1013) * Add data-residency-region parameter * Update TestApp and DemoApp * Update versions and prepare TestApp for testing * Fix versions --------- Co-authored-by: Dmitriy Kirakosyan <v-dmkira@microsoft.com> * Fix crash in TestApp on clicking a modal selector (#1020) * [CI] Migrate Maven-Release to ESRP-Release task (#1022) * Migrate AppCenterReactNativeShared to MavenPublication * Update URL * Correct numeration --------- Co-authored-by: Dmitriy Kirakosyan <v-dmkira@microsoft.com> * Bump SDK versions (#1023) * Update CHANGELOG.md (#1025) --------- Co-authored-by: Mikhail Suendukov <v-msuendukov@microsoft.com> Co-authored-by: Dima <v-dmkira@microsoft.com>
microsoft · Jan 12, 2024 · 0ee0754 · 0ee0754
1 parent b9778f8
commit 0ee0754
Show file tree

Hide file tree

Showing 35 changed files with 247 additions and 156 deletions.
diff --git a/AppCenterReactNativeShared/Products/AppCenterReactNativeShared.podspec b/AppCenterReactNativeShared/Products/AppCenterReactNativeShared.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'AppCenterReactNativeShared'
-  s.version           = '5.0.0'
+  s.version           = '5.0.1'
   s.summary           = 'React Native plugin for Visual Studio App Center'
   s.license           = { :type => 'MIT',  :file => 'AppCenterReactNativeShared/LICENSE' }
   s.homepage          = 'https://github.com/microsoft/appcenter-sdk-react-native'
@@ -10,5 +10,5 @@ Pod::Spec.new do |s|
   s.platform          = :ios, '11.0'
   s.requires_arc      = true
   s.vendored_frameworks = 'AppCenterReactNativeShared/AppCenterReactNativeShared.xcframework'
-  s.dependency 'AppCenter/Core', '5.0.3'
+  s.dependency 'AppCenter/Core', '5.0.4'
 end
diff --git a/AppCenterReactNativeShared/Products/local.podspec b/AppCenterReactNativeShared/Products/local.podspec
@@ -3,7 +3,7 @@
 
 Pod::Spec.new do |s|
   s.name              = 'AppCenterReactNativeShared'
-  s.version           = '5.0.0'
+  s.version           = '5.0.1'
   s.summary           = 'React Native plugin for Visual Studio App Center'
   s.license           = { :type => 'MIT',  :file => 'AppCenterReactNativeShared/LICENSE' }
   s.homepage          = 'https://github.com/microsoft/appcenter-sdk-react-native'
@@ -14,5 +14,5 @@ Pod::Spec.new do |s|
   s.platform          = :ios, '11.0'
   s.requires_arc      = true
   s.vendored_frameworks = 'AppCenterReactNativeShared/AppCenterReactNativeShared.xcframework'
-  s.dependency 'AppCenter/Core', '5.0.3'
+  s.dependency 'AppCenter/Core', '5.0.4'
 end
diff --git a/AppCenterReactNativeShared/android/build.gradle b/AppCenterReactNativeShared/android/build.gradle
@@ -5,89 +5,74 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:4.2.1'
     }
 }
 
+repositories {
+    google()
+    mavenCentral()
+}
+
 apply from: 'publish.gradle'
+apply from: 'version.gradle'
 
-apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
-apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.android.library'
 
 def wasSigned = false
 
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        jcenter {
-            content {
-                // https://youtrack.jetbrains.com/issue/IDEA-261387
-                includeModule("org.jetbrains.trove4j", "trove4j")
-            }
+def ext = rootProject.ext
+
+// Setup signing values.
+ext."signing.keyId" = ext.mavenSigningKeyId
+ext."signing.secretKeyRingFile" = ext.mavenSecretKeyPath
+ext."signing.password" = ext.mavenPublicKeyPassword
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 29
+        versionCode 67
+        versionName '5.0.1'
+        group groupId
+        version versionName
+        buildConfigField 'String', "SDK_NAME", "\"appcenter.react-native\""
+        buildConfigField 'String', 'VERSION_NAME', "\"${ext.versionName}\""
+
+        ndk {
+            abiFilters "armeabi-v7a", "x86"
         }
+        consumerProguardFiles 'proguard-rules.pro'
     }
+}
 
-    def ext = rootProject.ext
-
-    // Setup signing values.
-    ext."signing.keyId" = ext.mavenSigningKeyId
-    ext."signing.secretKeyRingFile" = ext.mavenSecretKeyPath
-    ext."signing.password" = ext.mavenPublicKeyPassword
-
-    android {
-        compileSdkVersion 29
-        buildToolsVersion '29.0.2'
-
-        defaultConfig {
-            minSdkVersion 21
-            targetSdkVersion 29
-            versionCode 65
-            versionName '5.0.0'
-            group groupId
-            version versionName
-            buildConfigField 'String', "SDK_NAME", "\"appcenter.react-native\""
-
-            ndk {
-                abiFilters "armeabi-v7a", "x86"
-            }
-            consumerProguardFiles 'proguard-rules.pro'
-        }
+task sourcesJar(type: Jar) {
+    afterEvaluate {
+        from android.sourceSets.main.java.srcDirs
+        classifier = 'sources'
     }
+}
 
-    task sourcesJar(type: Jar) {
-        afterEvaluate {
-            from android.sourceSets.main.java.srcDirs
-            classifier = 'sources'
+publishing {
+    repositories {
+        maven {
+            url = uri("${System.env.BUILD_DIR}")
         }
     }
 
-
-    afterEvaluate {
-        uploadArchives {
-            repositories.mavenDeployer {
-                beforeDeployment { MavenDeployment deployment -> 
-                    // workaround to prevent the script from failing because of double uploading of pom files
-                    // related issue: https://github.com/gradle/gradle/issues/3003
-                    if (!wasSigned) {
-                        signing.signPom(deployment)
-                        wasSigned = true
-                    }
-                }
-
-                repository(url: ext.mavenRepoUrl) {
-                    authentication(userName: ext.mavenUser, password: ext.mavenKey)
-                }
+    afterEvaluate { project ->
+        publications {
+            maven(MavenPublication) {
+                from components.release
 
-                pom.project {
+                artifact sourcesJar
 
-                    // Set base information about assemble.
+                pom {
                     packaging = 'aar'
                     name = project.name
                     description = sdkDescription
@@ -127,14 +112,14 @@ allprojects {
 }
 
 dependencies {
-    api 'com.microsoft.appcenter:appcenter:5.0.2'
+    api 'com.microsoft.appcenter:appcenter:5.0.4'
 }
 
 artifacts {
     archives sourcesJar
 }
 
 signing {
-    required { gradle.taskGraph.hasTask("uploadArchives") }
-    sign configurations.archives
-}
+    required { gradle.taskGraph.hasTask("publish") }
+    sign publishing.publications
+}
diff --git a/AppCenterReactNativeShared/android/gradle/wrapper/gradle-wrapper.properties b/AppCenterReactNativeShared/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/AppCenterReactNativeShared/android/version.gradle b/AppCenterReactNativeShared/android/version.gradle
@@ -0,0 +1,5 @@
+// Bintray constants
+
+ext {
+    versionName = '5.0.1'
+}
diff --git a/AppCenterReactNativeShared/ios/AppCenterReactNativeShared/AppCenterReactNativeShared.m b/AppCenterReactNativeShared/ios/AppCenterReactNativeShared/AppCenterReactNativeShared.m
@@ -39,7 +39,7 @@ + (NSString *)getAppSecret {
 
 + (void)configureAppCenter {
   if (!wrapperSdk) {
-    MSACWrapperSdk *wrapperSdk = [[MSACWrapperSdk alloc] initWithWrapperSdkVersion:@"5.0.0"
+    MSACWrapperSdk *wrapperSdk = [[MSACWrapperSdk alloc] initWithWrapperSdkVersion:@"5.0.1"
                                                                 wrapperSdkName:@"appcenter.react-native"
                                                          wrapperRuntimeVersion:nil
                                                         liveUpdateReleaseLabel:nil

diff --git a/AppCenterReactNativeShared/ios/Podfile b/AppCenterReactNativeShared/ios/Podfile
@@ -3,6 +3,6 @@ target 'AppCenterReactNativeShared' do
   use_frameworks!
 
   # Pods for AppCenterReactNativeShared
-  pod 'AppCenter', '5.0.3'
+  pod 'AppCenter', '5.0.4'
 
 end
diff --git a/AppCenterReactNativeShared/ios/Podfile.lock b/AppCenterReactNativeShared/ios/Podfile.lock
@@ -1,23 +1,23 @@
 PODS:
-  - AppCenter (5.0.3):
-    - AppCenter/Analytics (= 5.0.3)
-    - AppCenter/Crashes (= 5.0.3)
-  - AppCenter/Analytics (5.0.3):
+  - AppCenter (5.0.4):
+    - AppCenter/Analytics (= 5.0.4)
+    - AppCenter/Crashes (= 5.0.4)
+  - AppCenter/Analytics (5.0.4):
     - AppCenter/Core
-  - AppCenter/Core (5.0.3)
-  - AppCenter/Crashes (5.0.3):
+  - AppCenter/Core (5.0.4)
+  - AppCenter/Crashes (5.0.4):
     - AppCenter/Core
 
 DEPENDENCIES:
-  - AppCenter (= 5.0.3)
+  - AppCenter (= 5.0.4)
 
 SPEC REPOS:
   trunk:
     - AppCenter
 
 SPEC CHECKSUMS:
-  AppCenter: a4070ec3d4418b5539067a51f57155012e486ebd
+  AppCenter: 85c92db0759d2792a65eb61d6842d2e86611a49a
 
-PODFILE CHECKSUM: 98b2521b82f9ee3dca6f88b635ef371216c02b85
+PODFILE CHECKSUM: 69989a70468a0621e600e50ec2d32be4b77147d0
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.11.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # App Center SDK for React Native Change Log
 
+## Version 5.0.1
+
+### App Center
+
+* **[Fix]** Fix Regular Expression Denial of Service in debug vulnerability issue (https://github.com/advisories/GHSA-gxpj-cx7g-858c).
+
+### App Center Crashes
+
+* **[Fix]** Fix the typing contract for the Crashes class.
+
+#### Android/iOS
+
+* **[Internal] Add dataResidencyRegion option.
+ ___
+
 ## Version 5.0.0
 
 #### Android

diff --git a/DemoApp/app/screens/AppCenterScreen.js b/DemoApp/app/screens/AppCenterScreen.js
@@ -11,6 +11,7 @@ import SharedStyles from '../SharedStyles';
 import DialsTabBarIcon from '../assets/dials.png';
 
 const USER_ID_KEY = 'USER_ID_KEY';
+const DATA_RESIDENCY_KEY = 'DATA_RESIDENCY_KEY';
 
 const SecretStrings = {
   ios: {
@@ -71,7 +72,8 @@ export default class AppCenterScreen extends Component {
     installId: '',
     sdkVersion: AppCenter.getSdkVersion(),
     startupMode: StartupModes[0],
-    userId: ''
+    userId: '',
+    dataResidencyRegion: ''
   }
 
   async componentDidMount() {
@@ -94,6 +96,15 @@ export default class AppCenterScreen extends Component {
       refreshAppCenterScreen: this.refreshUI.bind(this)
     });
 
+    const dataResidencyRegion = await AsyncStorage.getItem(DATA_RESIDENCY_KEY);
+    if (dataResidencyRegion !== null) {
+      this.state.dataResidencyRegion = dataResidencyRegion;
+      await AppCenter.setDataResidencyRegion(dataResidencyRegion);
+    }
+    this.props.navigation.setParams({
+      refreshAppCenterScreen: this.refreshUI.bind(this)
+    });
+
     await AppCenter.setLogLevel(AppCenter.LogLevel.VERBOSE);
   }
 
@@ -233,6 +244,23 @@ export default class AppCenterScreen extends Component {
                     }
                     await AppCenter.setUserId(userId);
                   }
+                },
+                {
+                  title: 'Data Residency Region',
+                  value: 'dataResidencyRegion',
+                  onChange: async (dataResidencyRegion) => {
+                    this.setState({ dataResidencyRegion });
+                  },
+                  onSubmit: async () => {
+                    // We use empty text in UI to delete Data Residency Region (null for AppCenter API).
+                    const dataResidencyRegion = this.state.dataResidencyRegion.length === 0 ? null : this.state.dataResidencyRegion;
+                    if (dataResidencyRegion !== null) {
+                      await AsyncStorage.setItem(DATA_RESIDENCY_KEY, dataResidencyRegion);
+                    } else {
+                      await AsyncStorage.removeItem(DATA_RESIDENCY_KEY);
+                    }
+                    await AppCenter.setDataResidencyRegion(dataResidencyRegion);
+                  }
                 }
               ],
               renderItem: valueRenderItem

diff --git a/DemoApp/app/screens/CrashesScreen.js b/DemoApp/app/screens/CrashesScreen.js
@@ -31,7 +31,8 @@ export default class CrashesScreen extends Component {
     memoryWarning: '',
     textAttachment: '',
     binaryAttachment: '',
-    userId: ''
+    userId: '',
+    dataResidencyRegion: ''
   }
 
   async componentDidMount() {

diff --git a/TestApp/android/app/build.gradle b/TestApp/android/app/build.gradle
@@ -72,7 +72,7 @@ import com.android.build.OutputFile
 
 project.ext.react = [
     entryFile: "index.js",
-    enableHermes: false,  // clean and rebuild if changing
+    enableHermes: true,  // clean and rebuild if changing
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"

diff --git a/TestApp/android/build.gradle b/TestApp/android/build.gradle
@@ -30,15 +30,23 @@ def readFromLocalProperties(propertyName) {
     return null
 }
 
+def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs').readFileSync(require.resolve('react-native/package.json'), 'utf-8')).version"].execute(null, rootDir).text.trim())
+
 allprojects {
-    repositories {
-        maven {
-            credentials {
-                username = readFromLocalProperties('AZURE_USERNAME')
-                password = readFromLocalProperties('AZURE_PASSWORD')
-            }
-            url "https://msmobilecenter.pkgs.visualstudio.com/_packaging/AppCenter/maven/v1/"
+    configurations.all {
+        resolutionStrategy {
+            // Remove this override in 0.66, as a proper fix is included in react-native itself.
+            force "com.facebook.react:react-native:" + REACT_NATIVE_VERSION
         }
+    }
+    repositories {
+        // maven {
+        //     credentials {
+        //         username = readFromLocalProperties('AZURE_USERNAME')
+        //         password = readFromLocalProperties('AZURE_PASSWORD')
+        //     }
+        //     url "https://msmobilecenter.pkgs.visualstudio.com/_packaging/AppCenter/maven/v1/"
+        // }
         mavenLocal()
         google()
         jcenter()