From 57206cc36a73da4834be6d36586c1be2244b6069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Tue, 12 Dec 2017 17:26:10 +0100 Subject: [PATCH] [RN] Build react-native-locale-detector Upstream lacked a CocoaPods podspec file, PR: https://github.com/DylanVann/react-native-locale-detector/pull/3 --- android/sdk/build.gradle | 1 + .../src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java | 1 + android/settings.gradle | 2 ++ ios/Podfile | 2 ++ ios/Podfile.lock | 8 +++++++- package-lock.json | 4 +--- package.json | 2 +- 7 files changed, 15 insertions(+), 5 deletions(-) diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle index e250c9db5..c560cc336 100644 --- a/android/sdk/build.gradle +++ b/android/sdk/build.gradle @@ -28,6 +28,7 @@ dependencies { compile project(':react-native-fetch-blob') compile project(':react-native-immersive') compile project(':react-native-keep-awake') + compile project(':react-native-locale-detector') compile project(':react-native-vector-icons') compile project(':react-native-webrtc') } diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java index 52e9ad1c8..6eac1106d 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java @@ -97,6 +97,7 @@ public class JitsiMeetView extends FrameLayout { .setJSMainModulePath("index.android") .addPackage(new com.corbt.keepawake.KCKeepAwakePackage()) .addPackage(new com.facebook.react.shell.MainReactPackage()) + .addPackage(new com.i18n.reactnativei18n.ReactNativeI18n()) .addPackage(new com.oblador.vectoricons.VectorIconsPackage()) .addPackage(new com.ocetnik.timer.BackgroundTimerPackage()) .addPackage(new com.oney.WebRTCModule.WebRTCModulePackage()) diff --git a/android/settings.gradle b/android/settings.gradle index 2684040b5..317e6f9f1 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -9,6 +9,8 @@ include ':react-native-immersive' project(':react-native-immersive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive/android') include ':react-native-keep-awake' project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android') +include ':react-native-locale-detector' +project(':react-native-locale-detector').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-locale-detector/android') include ':react-native-vector-icons' project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android') include ':react-native-webrtc' diff --git a/ios/Podfile b/ios/Podfile index da1a0c644..2a29b163b 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -25,6 +25,8 @@ target 'JitsiMeet' do :path => '../node_modules/react-native-fetch-blob' pod 'react-native-keep-awake', :path => '../node_modules/react-native-keep-awake' + pod 'react-native-locale-detector', + :path => '../node_modules/react-native-locale-detector' pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc' pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons' end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index b45112e66..54a137c23 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -7,6 +7,8 @@ PODS: - React/Core - react-native-keep-awake (2.0.6): - React + - react-native-locale-detector (1.0.0): + - React - react-native-webrtc (1.58.2) - React/BatchedBridge (0.50.4): - React/Core @@ -47,6 +49,7 @@ DEPENDENCIES: - react-native-background-timer (from `../node_modules/react-native-background-timer`) - react-native-fetch-blob (from `../node_modules/react-native-fetch-blob`) - react-native-keep-awake (from `../node_modules/react-native-keep-awake`) + - react-native-locale-detector (from `../node_modules/react-native-locale-detector`) - react-native-webrtc (from `../node_modules/react-native-webrtc`) - React/BatchedBridge (from `../node_modules/react-native`) - React/Core (from `../node_modules/react-native`) @@ -70,6 +73,8 @@ EXTERNAL SOURCES: :path: ../node_modules/react-native-fetch-blob react-native-keep-awake: :path: ../node_modules/react-native-keep-awake + react-native-locale-detector: + :path: ../node_modules/react-native-locale-detector react-native-webrtc: :path: ../node_modules/react-native-webrtc RNVectorIcons: @@ -82,10 +87,11 @@ SPEC CHECKSUMS: react-native-background-timer: 10063c04bf85d7f8811dff8c74399f0aa715245f react-native-fetch-blob: 2bef9be702de8726f4d7bf58d2345579aaaee60d react-native-keep-awake: bb4dbb6fd21a7879432f9538b0b7d71398fe9f81 + react-native-locale-detector: bb60716189d4c69c459355d0a4804c9b13f65e84 react-native-webrtc: 6fd0b3aa890d7a9b9b4d01d30f958d17ae88a785 RNVectorIcons: c1821d56c775cc5a3bca66c77dfc8cb4a90d27e2 yoga: b9aebf996711e50fc31f5608c10aa108a5a0c29e -PODFILE CHECKSUM: a7cb8c7365f8cf9a01ee4eb78325139933776faf +PODFILE CHECKSUM: fabd6b6c27f8e1849f0668db3f403bf536ac8903 COCOAPODS: 1.3.1 diff --git a/package-lock.json b/package-lock.json index b28a8c161..103897025 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9514,9 +9514,7 @@ "integrity": "sha512-ketZKC6G49W4iblKYCnIA5Tcx78Yu48n/K5XzZUnMm69wAnZxs1054Re2V5xpSwX5VZasOBjW1iI1cTjtB/H5g==" }, "react-native-locale-detector": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/react-native-locale-detector/-/react-native-locale-detector-1.0.1.tgz", - "integrity": "sha1-wAImHstgYZ5ZUiV8jH+jHCwV7TA=" + "version": "github:jitsi/react-native-locale-detector#cc76092fc4335488a28a9529c8b50afae2c3ecdc" }, "react-native-prompt": { "version": "1.0.0", diff --git a/package.json b/package.json index 8d06394fa..2f9455964 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "react-native-img-cache": "1.5.2", "react-native-immersive": "1.1.0", "react-native-keep-awake": "2.0.6", - "react-native-locale-detector": "1.0.1", + "react-native-locale-detector": "github:jitsi/react-native-locale-detector#cc76092", "react-native-prompt": "1.0.0", "react-native-vector-icons": "4.4.2", "react-native-webrtc": "github:jitsi/react-native-webrtc#7c6b167120d2224f62222037ff71deb8ff93bd38",