fix(libre-build) update react-native-device-info to 8.0.0

Fixes a dependency on GMS.
fix(libre-build) skip spurious Firebase and GCM dependencies
2025-12-31 03:42:29 +00:00 · 2021-01-10 22:44:01 +01:00 · 2021-01-08 23:27:21 +01:00 · 2021-01-08 23:27:09 +01:00 · 2021-01-07 11:59:22 +01:00 · 2021-01-07 11:49:34 +01:00
10 changed files with 35 additions and 30 deletions
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -47,7 +47,14 @@ dependencies {
    implementation 'com.jakewharton.timber:timber:4.7.1'
    implementation 'com.squareup.duktape:duktape-android:1.3.0'

-    if (!rootProject.ext.libreBuild) {
+    if (rootProject.ext.libreBuild) {
+        implementation(project(':react-native-device-info')) {
+            exclude group: 'com.google.firebase'
+            exclude group: 'com.google.android.gms'
+            exclude group: 'com.android.installreferrer'
+        }
+    } else {
+        implementation project(':react-native-device-info')
        implementation(project(":react-native-google-signin")) {
            exclude group: 'com.google.android.gms'
            exclude group: 'androidx'
@@ -59,7 +66,6 @@ dependencies {
    implementation project(':react-native-calendar-events')
    implementation project(':react-native-community_netinfo')
    implementation project(':react-native-default-preference')
-    implementation project(':react-native-device-info')
    implementation project(':react-native-immersive')
    implementation project(':react-native-keep-awake')
    implementation project(':react-native-linear-gradient')
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -354,7 +354,7 @@ PODS:
    - React
  - RNDefaultPreference (1.4.2):
    - React
-  - RNDeviceInfo (7.3.1):
+  - RNDeviceInfo (8.0.0):
    - React-Core
  - RNGoogleSignin (3.0.1):
    - GoogleSignIn (~> 5.0.0)
@@ -364,7 +364,7 @@ PODS:
    - RNSound/Core (= 0.11.0)
  - RNSound/Core (0.11.0):
    - React
-  - RNSVG (10.1.0):
+  - RNSVG (12.1.0):
    - React
  - RNWatch (0.4.3):
    - React
@@ -577,10 +577,10 @@ SPEC CHECKSUMS:
  ReactCommon: 18014e1d98dbeb9141e935cfe35fc93bd511ffb6
  RNCAsyncStorage: bc2f81cc1df90c267ce9ed30bb2dbc93b945a8ee
  RNDefaultPreference: 56a405ce61033ac77b95004dccd7ac54c2eb50d1
-  RNDeviceInfo: 57bb2806fb7bd982a1434e9f0b4e6a6ab1f6702e
+  RNDeviceInfo: 72ded653ce636b3f03571e90bed99309a714944e
  RNGoogleSignin: 39336070b35fc4cea6a98cf111e00480317be0ae
  RNSound: c980916b596cc15c8dcd2f6ecd3b13c4881dbe20
-  RNSVG: 069864be08c9fe065a2cf7e63656a34c78653c99
+  RNSVG: ce9d996113475209013317e48b05c21ee988d42e
  RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3
  Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c

--- a/ios/app/app.xcodeproj/project.pbxproj
+++ b/ios/app/app.xcodeproj/project.pbxproj
@@ -715,6 +715,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 609CB2080B75F75A89923F3D /* Pods-JitsiMeet.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug;
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -744,6 +745,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = FC040BBED70876444D89E91C /* Pods-JitsiMeet.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconRelease;
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
--- a/ios/app/src/Info.plist
+++ b/ios/app/src/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>20.6.0</string>
+	<string>20.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
--- a/ios/app/watchos/app/Info.plist
+++ b/ios/app/watchos/app/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>20.6.0</string>
+	<string>20.6.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>UISupportedInterfaceOrientations</key>
--- a/ios/app/watchos/extension/Info.plist
+++ b/ios/app/watchos/extension/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>20.6.0</string>
+	<string>20.6.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CLKComplicationPrincipalClass</key>
--- a/package-lock.json
+++ b/package-lock.json
@@ -7198,18 +7198,18 @@
      }
    },
    "css-tree": {
-      "version": "1.0.0-alpha.39",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
-      "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.2.tgz",
+      "integrity": "sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==",
      "requires": {
-        "mdn-data": "2.0.6",
+        "mdn-data": "2.0.14",
        "source-map": "^0.6.1"
      },
      "dependencies": {
        "mdn-data": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
-          "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA=="
+          "version": "2.0.14",
+          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+          "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
        },
        "source-map": {
          "version": "0.6.1",
@@ -14199,9 +14199,9 @@
      "integrity": "sha512-kNhBLv8s6kO2gJJFEKM7qew7oRvJnygjgG1CU2ZEY6SlG5qsRX8z1Ms7z1Oo/XB7fVfyXrAoZDGhIvy+uiByrg=="
    },
    "react-native-device-info": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/react-native-device-info/-/react-native-device-info-7.3.1.tgz",
-      "integrity": "sha512-RQP3etbmXsOlcaxHeHNug68nRli02S9iGC7TbaXpkvyyevIuRogfnrI71sWtqmlT91kdpYAOYKmNfRL9LOSKVw=="
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/react-native-device-info/-/react-native-device-info-8.0.0.tgz",
+      "integrity": "sha512-7/DOEhg8GtyW1hpVtWf8F6RvGLaFaOGmex+IkmiBWQC2uW4NFDcfXm+lMMZnduFavTyUTX7AF6lAM3y286cEfA=="
    },
    "react-native-immersive": {
      "version": "2.0.0",
@@ -14228,9 +14228,9 @@
      "integrity": "sha512-Ls9qiNZzW/OLFoI25wfjjAcrf2DZ975hn2vr6U9gyuxi2nooVbzQeFoQS5vQcbCt9QX5NY8ASEEAtlLdIa6KVg=="
    },
    "react-native-svg": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-10.1.0.tgz",
-      "integrity": "sha512-mgo6CshQIQrDDBVUPqJK/iOsJEdlagk7N4q8fyo1sqCiSUP2efpt+AQ1IRXZtHXut210/7TliAamvM59NV0Bzg==",
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-12.1.0.tgz",
+      "integrity": "sha512-1g9qBRci7man8QsHoXn6tP3DhCDiypGgc6+AOWq+Sy+PmP6yiyf8VmvKuoqrPam/tf5x+ZaBT2KI0gl7bptZ7w==",
      "requires": {
        "css-select": "^2.1.0",
        "css-tree": "^1.0.0-alpha.39"
--- a/package.json
+++ b/package.json
@@ -75,13 +75,13 @@
    "react-native-callstats": "3.61.0",
    "react-native-collapsible": "1.5.1",
    "react-native-default-preference": "1.4.2",
-    "react-native-device-info": "7.3.1",
+    "react-native-device-info": "8.0.0",
    "react-native-immersive": "2.0.0",
    "react-native-keep-awake": "4.0.0",
    "react-native-linear-gradient": "2.5.6",
    "react-native-sound": "github:jitsi/react-native-sound#3fe5480fce935e888d5089d94a191c7c7e3aa190",
    "react-native-splash-screen": "3.2.0",
-    "react-native-svg": "10.1.0",
+    "react-native-svg": "12.1.0",
    "react-native-svg-transformer": "0.14.3",
    "react-native-url-polyfill": "1.2.0",
    "react-native-watch-connectivity": "0.4.3",
--- a/react/features/base/dialog/components/native/styles.js
+++ b/react/features/base/dialog/components/native/styles.js
@@ -171,10 +171,6 @@ ColorSchemeRegistry.register('BottomSheet', {
        underlayColor: ColorPalette.overflowMenuItemUnderlay
    },

-    expandIcon: {
-        color: schemeColor('icon')
-    },
-
    /**
     * Bottom sheet's base style.
     */
--- a/react/features/toolbox/components/native/OverflowMenu.js
+++ b/react/features/toolbox/components/native/OverflowMenu.js
@@ -166,8 +166,9 @@ class OverflowMenu extends PureComponent<Props, State> {
                    styles.expandMenuContainer
                ] }>
                <TouchableOpacity onPress = { this._onToggleMenu }>
-                    { /* $FlowFixMeProps */ }
-                    <IconDragHandle style = { this.props._bottomSheetStyles.expandIcon } />
+                    { /* $FlowFixMe */ }
+                    <IconDragHandle
+                        fill = { this.props._bottomSheetStyles.buttons.iconStyle.color } />
                </TouchableOpacity>
            </View>
        );
Author	SHA1	Message	Date
Saúl Ibarra Corretgé	4212e76b92	fix(libre-build) update react-native-device-info to 8.0.0 Fixes a dependency on GMS.	2021-01-10 22:44:01 +01:00
Saúl Ibarra Corretgé	1338bafb15	fix(libre-build) skip spurious Firebase and GCM dependencies Fixes: https://github.com/jitsi/jitsi-meet/issues/8353	2021-01-08 23:27:21 +01:00
Saúl Ibarra Corretgé	100dbf410e	fix(libre-build) update react-native-device-info to 7.4.0 Will now work even if installreferrer is missing.	2021-01-08 23:27:09 +01:00
Saúl Ibarra Corretgé	570fda5d8a	feat(ios) 20.6.1	2021-01-07 11:59:22 +01:00
Saúl Ibarra Corretgé	38e264ced2	fix(ios) fix drag handle not rendering with latest react-native-svg Fill must be properly specified.	2021-01-07 11:49:34 +01:00
Saúl Ibarra Corretgé	db87959141	chore(deps) update react-native-svg to latest Fixes icons not rendering on iOS 11.	2021-01-07 11:49:20 +01:00
Saúl Ibarra Corretgé	53cfac3f67	fix(ios) fix crash on startup on iOS 11	2021-01-07 11:49:20 +01:00