Browse Source

deps: update React Native to version 0.59

This new version comes with an updated JSC runtime, so we no longer need to
depend on the updated version ourselves.
master
Saúl Ibarra Corretgé 6 years ago
parent
commit
b53a034aaf

+ 1
- 2
.flowconfig View File

@@ -33,7 +33,6 @@
33 33
 [libs]
34 34
 node_modules/react-native/Libraries/react-native/react-native-interface.js
35 35
 node_modules/react-native/flow/
36
-node_modules/react-native/flow-github/
37 36
 
38 37
 [options]
39 38
 emoji=true
@@ -83,4 +82,4 @@ module.file_ext=.jsx
83 82
 module.file_ext=.json
84 83
 
85 84
 [version]
86
-^0.78.0
85
+^0.92.0

+ 0
- 4
android/README.md View File

@@ -69,10 +69,6 @@ To copy React Native to your local Maven repository, you can simply copy part of
69 69
 
70 70
     $ cp -r ../node_modules/react-native/android/com /tmp/repo/
71 71
 
72
-In the same way, copy the JavaScriptCore dependency:
73
-
74
-    $ cp -r ../node_modules/jsc-android/dist/org /tmp/repo/
75
-
76 72
 Alternatively, you can use the scripts located in the android/scripts directory to publish these dependencies to your Maven repo.
77 73
 
78 74
 Third-party React Native _modules_, which Jitsi Meet SDK for Android depends on, are download by NPM in source code form. These need to be assembled into Maven artifacts, and then published to your local Maven repository. The SDK project facilitates this.

+ 0
- 7
android/build.gradle View File

@@ -25,7 +25,6 @@ allprojects {
25 25
     repositories {
26 26
         google()
27 27
         jcenter()
28
-        maven { url "$rootDir/../node_modules/jsc-android/dist" }
29 28
         // React Native (JS, Obj-C sources, Android binaries) is installed from
30 29
         // npm.
31 30
         maven { url "$rootDir/../node_modules/react-native/android" }
@@ -42,12 +41,6 @@ allprojects {
42 41
                     def version = new JsonSlurper().parseText(file.text).version
43 42
                     details.useVersion version
44 43
                 }
45
-                if (details.requested.group == 'org.webkit'
46
-                        && details.requested.name == 'android-jsc') {
47
-                    def file = new File("$rootDir/../node_modules/jsc-android/package.json")
48
-                    def version = new JsonSlurper().parseText(file.text).version
49
-                    details.useVersion "r${version.tokenize('.')[0]}"
50
-                }
51 44
             }
52 45
         }
53 46
     }

+ 0
- 17
android/scripts/publish-android-jsc.sh View File

@@ -1,17 +0,0 @@
1
-#!/bin/bash
2
-
3
-CWD=$(dirname $0)
4
-MVN_REPO=$(realpath $1)
5
-JSC_VERSION="r"$(jq -r '.dependencies."jsc-android"' ${CWD}/../../package.json | cut -d . -f 1)
6
-
7
-pushd ${CWD}/../../node_modules/jsc-android/dist/org/webkit/android-jsc/${JSC_VERSION}
8
-
9
-mvn \
10
-    deploy:deploy-file \
11
-    -Durl=file://${MVN_REPO} \
12
-    -Dfile=android-jsc-${JSC_VERSION}.aar \
13
-    -Dpackaging=aar \
14
-    -DgeneratePom=false \
15
-    -DpomFile=android-jsc-${JSC_VERSION}.pom
16
-
17
-popd

+ 0
- 1
android/sdk/build.gradle View File

@@ -24,7 +24,6 @@ dependencies {
24 24
     implementation "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
25 25
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
26 26
 
27
-    implementation 'org.webkit:android-jsc:+'
28 27
     implementation 'com.amplitude:android-sdk:2.14.1'
29 28
     implementation 'com.dropbox.core:dropbox-core-sdk:3.0.8'
30 29
     api 'com.facebook.react:react-native:+'

+ 5
- 1
android/sdk/src/main/java/org/jitsi/meet/sdk/AndroidSettingsModule.java View File

@@ -15,17 +15,21 @@ import com.facebook.react.bridge.Promise;
15 15
 import com.facebook.react.bridge.ReactApplicationContext;
16 16
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
17 17
 import com.facebook.react.bridge.ReactMethod;
18
+import com.facebook.react.module.annotations.ReactModule;
18 19
 
20
+@ReactModule(name = AndroidSettingsModule.NAME)
19 21
 class AndroidSettingsModule
20 22
     extends ReactContextBaseJavaModule {
21 23
 
24
+    public static final String NAME = "AndroidSettings";
25
+
22 26
     public AndroidSettingsModule(ReactApplicationContext reactContext) {
23 27
         super(reactContext);
24 28
     }
25 29
 
26 30
     @Override
27 31
     public String getName() {
28
-        return "AndroidSettings";
32
+        return NAME;
29 33
     }
30 34
 
31 35
     @ReactMethod

+ 5
- 1
android/sdk/src/main/java/org/jitsi/meet/sdk/AppInfoModule.java View File

@@ -23,13 +23,17 @@ import android.content.pm.PackageManager;
23 23
 
24 24
 import com.facebook.react.bridge.ReactApplicationContext;
25 25
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
26
+import com.facebook.react.module.annotations.ReactModule;
26 27
 
27 28
 import java.util.HashMap;
28 29
 import java.util.Map;
29 30
 
31
+@ReactModule(name = AppInfoModule.NAME)
30 32
 class AppInfoModule
31 33
     extends ReactContextBaseJavaModule {
32 34
 
35
+    public static final String NAME = "AppInfo";
36
+
33 37
     public AppInfoModule(ReactApplicationContext reactContext) {
34 38
         super(reactContext);
35 39
     }
@@ -74,6 +78,6 @@ class AppInfoModule
74 78
 
75 79
     @Override
76 80
     public String getName() {
77
-        return "AppInfo";
81
+        return NAME;
78 82
     }
79 83
 }

+ 6
- 8
android/sdk/src/main/java/org/jitsi/meet/sdk/AudioModeModule.java View File

@@ -35,6 +35,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
35 35
 import com.facebook.react.bridge.ReactMethod;
36 36
 import com.facebook.react.bridge.WritableArray;
37 37
 import com.facebook.react.bridge.WritableMap;
38
+import com.facebook.react.module.annotations.ReactModule;
38 39
 
39 40
 import java.util.HashMap;
40 41
 import java.util.HashSet;
@@ -58,9 +59,12 @@ import java.util.concurrent.Executors;
58 59
  * Before a call has started and after it has ended the
59 60
  * {@code AudioModeModule.DEFAULT} mode should be used.
60 61
  */
62
+@ReactModule(name = AudioModeModule.NAME)
61 63
 class AudioModeModule extends ReactContextBaseJavaModule
62 64
     implements AudioManager.OnAudioFocusChangeListener {
63 65
 
66
+    public static final String NAME = "AudioMode";
67
+
64 68
     /**
65 69
      * Constants representing the audio mode.
66 70
      * - DEFAULT: Used before and after every call. It represents the default
@@ -89,16 +93,10 @@ class AudioModeModule extends ReactContextBaseJavaModule
89 93
      */
90 94
     private static final int TYPE_USB_HEADSET = 22;
91 95
 
92
-    /**
93
-     * The name of {@code AudioModeModule} to be used in the React Native
94
-     * bridge.
95
-     */
96
-    private static final String MODULE_NAME = "AudioMode";
97
-
98 96
     /**
99 97
      * The {@code Log} tag {@code AudioModeModule} is to log messages with.
100 98
      */
101
-    static final String TAG = MODULE_NAME;
99
+    static final String TAG = NAME;
102 100
 
103 101
     /**
104 102
      * Converts any of the "DEVICE_" constants into the corresponding
@@ -373,7 +371,7 @@ class AudioModeModule extends ReactContextBaseJavaModule
373 371
      */
374 372
     @Override
375 373
     public String getName() {
376
-        return MODULE_NAME;
374
+        return NAME;
377 375
     }
378 376
 
379 377
     /**

+ 6
- 2
android/sdk/src/main/java/org/jitsi/meet/sdk/ExternalAPIModule.java View File

@@ -22,14 +22,18 @@ import com.facebook.react.bridge.ReactApplicationContext;
22 22
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
23 23
 import com.facebook.react.bridge.ReactMethod;
24 24
 import com.facebook.react.bridge.ReadableMap;
25
+import com.facebook.react.module.annotations.ReactModule;
25 26
 
26 27
 /**
27 28
  * Module implementing an API for sending events from JavaScript to native code.
28 29
  */
30
+@ReactModule(name = ExternalAPIModule.NAME)
29 31
 class ExternalAPIModule
30 32
     extends ReactContextBaseJavaModule {
31 33
 
32
-    private static final String TAG = ExternalAPIModule.class.getSimpleName();
34
+    public static final String NAME = "ExternalAPI";
35
+
36
+    private static final String TAG = NAME;
33 37
 
34 38
     /**
35 39
      * Initializes a new module instance. There shall be a single instance of
@@ -49,7 +53,7 @@ class ExternalAPIModule
49 53
      */
50 54
     @Override
51 55
     public String getName() {
52
-        return "ExternalAPI";
56
+        return NAME;
53 57
     }
54 58
 
55 59
     /**

+ 6
- 2
android/sdk/src/main/java/org/jitsi/meet/sdk/PictureInPictureModule.java View File

@@ -27,11 +27,15 @@ import com.facebook.react.bridge.Promise;
27 27
 import com.facebook.react.bridge.ReactApplicationContext;
28 28
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
29 29
 import com.facebook.react.bridge.ReactMethod;
30
+import com.facebook.react.module.annotations.ReactModule;
30 31
 
32
+@ReactModule(name = PictureInPictureModule.NAME)
31 33
 class PictureInPictureModule
32 34
     extends ReactContextBaseJavaModule {
33 35
 
34
-    private final static String TAG = "PictureInPicture";
36
+    public static final String NAME = "PictureInPicture";
37
+
38
+    private static final String TAG = NAME;
35 39
 
36 40
     static boolean isPictureInPictureSupported() {
37 41
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
@@ -101,6 +105,6 @@ class PictureInPictureModule
101 105
 
102 106
     @Override
103 107
     public String getName() {
104
-        return TAG;
108
+        return NAME;
105 109
     }
106 110
 }

+ 5
- 7
android/sdk/src/main/java/org/jitsi/meet/sdk/ProximityModule.java View File

@@ -24,6 +24,7 @@ import com.facebook.react.bridge.ReactApplicationContext;
24 24
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
25 25
 import com.facebook.react.bridge.ReactMethod;
26 26
 import com.facebook.react.bridge.UiThreadUtil;
27
+import com.facebook.react.module.annotations.ReactModule;
27 28
 
28 29
 /**
29 30
  * Module implementing a simple API to enable a proximity sensor-controlled
@@ -31,14 +32,11 @@ import com.facebook.react.bridge.UiThreadUtil;
31 32
  * object it will dim the screen and disable touch controls. The functionality
32 33
  * is used with the conference audio-only mode.
33 34
  */
35
+@ReactModule(name = ProximityModule.NAME)
34 36
 class ProximityModule
35 37
     extends ReactContextBaseJavaModule {
36 38
 
37
-    /**
38
-     * The name of {@code ProximityModule} to be used in the React Native
39
-     * bridge.
40
-     */
41
-    private static final String MODULE_NAME = "Proximity";
39
+    public static final String NAME = "Proximity";
42 40
 
43 41
     /**
44 42
      * This type of wake lock (the one activated by the proximity sensor) has
@@ -74,7 +72,7 @@ class ProximityModule
74 72
             wakeLock
75 73
                 = powerManager.newWakeLock(
76 74
                         PROXIMITY_SCREEN_OFF_WAKE_LOCK,
77
-                        MODULE_NAME);
75
+                        "jitsi:"+NAME);
78 76
         } catch (Throwable ignored) {
79 77
             wakeLock = null;
80 78
         }
@@ -89,7 +87,7 @@ class ProximityModule
89 87
      */
90 88
     @Override
91 89
     public String getName() {
92
-        return MODULE_NAME;
90
+        return NAME;
93 91
     }
94 92
 
95 93
     /**

+ 6
- 2
android/sdk/src/main/java/org/jitsi/meet/sdk/RNConnectionService.java View File

@@ -18,6 +18,7 @@ import com.facebook.react.bridge.ReactApplicationContext;
18 18
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
19 19
 import com.facebook.react.bridge.ReactMethod;
20 20
 import com.facebook.react.bridge.ReadableMap;
21
+import com.facebook.react.module.annotations.ReactModule;
21 22
 
22 23
 /**
23 24
  * The react-native side of Jitsi Meet's {@link ConnectionService}. Exposes
@@ -26,10 +27,13 @@ import com.facebook.react.bridge.ReadableMap;
26 27
  * @author Pawel Domas
27 28
  */
28 29
 @RequiresApi(api = Build.VERSION_CODES.O)
30
+@ReactModule(name = RNConnectionService.NAME)
29 31
 class RNConnectionService
30 32
     extends ReactContextBaseJavaModule {
31 33
 
32
-    private final static String TAG = ConnectionService.TAG;
34
+    public static final String NAME = "ConnectionService";
35
+
36
+    private static final String TAG = ConnectionService.TAG;
33 37
 
34 38
     /**
35 39
      * Sets the audio route on all existing {@link android.telecom.Connection}s
@@ -146,7 +150,7 @@ class RNConnectionService
146 150
 
147 151
     @Override
148 152
     public String getName() {
149
-        return "ConnectionService";
153
+        return NAME;
150 154
     }
151 155
 
152 156
     /**

+ 5
- 7
android/sdk/src/main/java/org/jitsi/meet/sdk/WiFiStatsModule.java View File

@@ -25,6 +25,7 @@ import com.facebook.react.bridge.Promise;
25 25
 import com.facebook.react.bridge.ReactApplicationContext;
26 26
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
27 27
 import com.facebook.react.bridge.ReactMethod;
28
+import com.facebook.react.module.annotations.ReactModule;
28 29
 
29 30
 import org.json.JSONArray;
30 31
 import org.json.JSONObject;
@@ -43,19 +44,16 @@ import java.util.concurrent.Executors;
43 44
  * Gathers rssi, signal in percentage, timestamp and the addresses of the wifi
44 45
  * device.
45 46
  */
47
+@ReactModule(name = WiFiStatsModule.NAME)
46 48
 class WiFiStatsModule
47 49
     extends ReactContextBaseJavaModule {
48 50
 
49
-    /**
50
-     * The name of {@code WiFiStatsModule} to be used in the React Native
51
-     * bridge.
52
-     */
53
-    private static final String MODULE_NAME = "WiFiStats";
51
+    public static final String NAME = "WiFiStats";
54 52
 
55 53
     /**
56 54
      * The {@code Log} tag {@code WiFiStatsModule} is to log messages with.
57 55
      */
58
-    static final String TAG = MODULE_NAME;
56
+    static final String TAG = NAME;
59 57
 
60 58
     /**
61 59
      * The scale used for the signal value. A level of the signal, given in the
@@ -87,7 +85,7 @@ class WiFiStatsModule
87 85
      */
88 86
     @Override
89 87
     public String getName() {
90
-        return MODULE_NAME;
88
+        return NAME;
91 89
     }
92 90
 
93 91
     /**

+ 6
- 3
android/sdk/src/main/java/org/jitsi/meet/sdk/analytics/AmplitudeModule.java View File

@@ -22,6 +22,7 @@ import com.facebook.react.bridge.ReactMethod;
22 22
 import com.facebook.react.bridge.ReadableMap;
23 23
 
24 24
 import com.amplitude.api.Amplitude;
25
+import com.facebook.react.module.annotations.ReactModule;
25 26
 
26 27
 import org.json.JSONException;
27 28
 import org.json.JSONObject;
@@ -29,9 +30,12 @@ import org.json.JSONObject;
29 30
 /**
30 31
  * Implements the react-native module for the Amplitude integration.
31 32
  */
33
+@ReactModule(name = AmplitudeModule.NAME)
32 34
 public class AmplitudeModule
33 35
         extends ReactContextBaseJavaModule {
34 36
 
37
+    public static final String NAME = "Amplitude";
38
+
35 39
     public AmplitudeModule(ReactApplicationContext reactContext) {
36 40
         super(reactContext);
37 41
     }
@@ -71,9 +75,8 @@ public class AmplitudeModule
71 75
      */
72 76
     @ReactMethod
73 77
     public void logEvent(String instanceName, String eventType, String eventPropsString) {
74
-        JSONObject eventProps = null;
75 78
         try {
76
-            eventProps = new JSONObject(eventPropsString);
79
+            JSONObject eventProps = new JSONObject(eventPropsString);
77 80
             Amplitude.getInstance(instanceName).logEvent(eventType, eventProps);
78 81
         } catch (JSONException e) {
79 82
             e.printStackTrace();
@@ -82,6 +85,6 @@ public class AmplitudeModule
82 85
 
83 86
     @Override
84 87
     public String getName() {
85
-        return "Amplitude";
88
+        return NAME;
86 89
     }
87 90
 }

+ 6
- 1
android/sdk/src/main/java/org/jitsi/meet/sdk/dropbox/Dropbox.java View File

@@ -20,6 +20,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
20 20
 import com.dropbox.core.android.Auth;
21 21
 import com.facebook.react.bridge.ReactMethod;
22 22
 import com.facebook.react.bridge.WritableMap;
23
+import com.facebook.react.module.annotations.ReactModule;
23 24
 
24 25
 import java.util.HashMap;
25 26
 import java.util.Map;
@@ -27,9 +28,13 @@ import java.util.Map;
27 28
 /**
28 29
  * Implements the react-native module for the dropbox integration.
29 30
  */
31
+@ReactModule(name = Dropbox.NAME)
30 32
 public class Dropbox
31 33
         extends ReactContextBaseJavaModule
32 34
         implements LifecycleEventListener {
35
+
36
+    public static final String NAME = "Dropbox";
37
+
33 38
     private String appKey;
34 39
 
35 40
     private String clientId;
@@ -131,7 +136,7 @@ public class Dropbox
131 136
 
132 137
     @Override
133 138
     public String getName() {
134
-        return "Dropbox";
139
+        return NAME;
135 140
     }
136 141
 
137 142
     /**

+ 6
- 7
android/sdk/src/main/java/org/jitsi/meet/sdk/net/NAT64AddrInfoModule.java View File

@@ -21,6 +21,7 @@ import com.facebook.react.bridge.Promise;
21 21
 import com.facebook.react.bridge.ReactApplicationContext;
22 22
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
23 23
 import com.facebook.react.bridge.ReactMethod;
24
+import com.facebook.react.module.annotations.ReactModule;
24 25
 
25 26
 import java.net.UnknownHostException;
26 27
 
@@ -32,9 +33,12 @@ import java.net.UnknownHostException;
32 33
  * [1]: https://tools.ietf.org/html/rfc6146
33 34
  * [2]: https://tools.ietf.org/html/rfc6052
34 35
  */
36
+@ReactModule(name = NAT64AddrInfoModule.NAME)
35 37
 public class NAT64AddrInfoModule
36 38
     extends ReactContextBaseJavaModule {
37 39
 
40
+    public final static String NAME = "NAT64AddrInfo";
41
+
38 42
     /**
39 43
      * The host for which the module wil try to resolve both IPv4 and IPv6
40 44
      * addresses in order to figure out the NAT64 prefix.
@@ -46,15 +50,10 @@ public class NAT64AddrInfoModule
46 50
      */
47 51
     private final static long INFO_LIFETIME = 60 * 1000;
48 52
 
49
-    /**
50
-     * The name of this module.
51
-     */
52
-    private final static String MODULE_NAME = "NAT64AddrInfo";
53
-
54 53
     /**
55 54
      * The {@code Log} tag {@code NAT64AddrInfoModule} is to log messages with.
56 55
      */
57
-    private final static String TAG = MODULE_NAME;
56
+    private final static String TAG = NAME;
58 57
 
59 58
     /**
60 59
      * The {@link NAT64AddrInfo} instance which holds NAT64 prefix/suffix.
@@ -119,6 +118,6 @@ public class NAT64AddrInfoModule
119 118
 
120 119
     @Override
121 120
     public String getName() {
122
-        return MODULE_NAME;
121
+        return NAME;
123 122
     }
124 123
 }

+ 76
- 68
ios/Podfile.lock View File

@@ -7,41 +7,41 @@ PODS:
7 7
     - Fabric (~> 1.9.0)
8 8
   - DoubleConversion (1.1.6)
9 9
   - Fabric (1.9.0)
10
-  - Firebase/Core (5.15.0):
10
+  - Firebase/Core (5.18.0):
11 11
     - Firebase/CoreOnly
12
-    - FirebaseAnalytics (= 5.4.0)
13
-  - Firebase/CoreOnly (5.15.0):
14
-    - FirebaseCore (= 5.1.10)
15
-  - Firebase/DynamicLinks (5.15.0):
12
+    - FirebaseAnalytics (= 5.7.0)
13
+  - Firebase/CoreOnly (5.18.0):
14
+    - FirebaseCore (= 5.3.1)
15
+  - Firebase/DynamicLinks (5.18.0):
16 16
     - Firebase/CoreOnly
17
-    - FirebaseDynamicLinks (= 3.3.0)
18
-  - FirebaseAnalytics (5.4.0):
19
-    - FirebaseCore (~> 5.1)
20
-    - FirebaseInstanceID (~> 3.3)
21
-    - GoogleAppMeasurement (= 5.4.0)
17
+    - FirebaseDynamicLinks (= 3.4.1)
18
+  - FirebaseAnalytics (5.7.0):
19
+    - FirebaseCore (~> 5.3)
20
+    - FirebaseInstanceID (~> 3.6)
21
+    - GoogleAppMeasurement (= 5.7.0)
22 22
     - GoogleUtilities/AppDelegateSwizzler (~> 5.2)
23 23
     - GoogleUtilities/MethodSwizzler (~> 5.2)
24 24
     - GoogleUtilities/Network (~> 5.2)
25 25
     - "GoogleUtilities/NSData+zlib (~> 5.2)"
26 26
     - nanopb (~> 0.3)
27
-  - FirebaseAnalyticsInterop (1.1.0)
28
-  - FirebaseCore (5.1.10):
27
+  - FirebaseAnalyticsInterop (1.2.0)
28
+  - FirebaseCore (5.3.1):
29 29
     - GoogleUtilities/Logger (~> 5.2)
30
-  - FirebaseDynamicLinks (3.3.0):
30
+  - FirebaseDynamicLinks (3.4.1):
31 31
     - FirebaseAnalytics (~> 5.1)
32 32
     - FirebaseAnalyticsInterop (~> 1.0)
33
-    - FirebaseCore (~> 5.1)
34
-  - FirebaseInstanceID (3.3.0):
35
-    - FirebaseCore (~> 5.1)
36
-    - GoogleUtilities/Environment (~> 5.3)
37
-    - GoogleUtilities/UserDefaults (~> 5.3)
33
+    - FirebaseCore (~> 5.2)
34
+  - FirebaseInstanceID (3.7.0):
35
+    - FirebaseCore (~> 5.2)
36
+    - GoogleUtilities/Environment (~> 5.2)
37
+    - GoogleUtilities/UserDefaults (~> 5.2)
38 38
   - FLAnimatedImage (1.0.12)
39
-  - Folly (2016.10.31.00):
39
+  - Folly (2018.10.22.00):
40 40
     - boost-for-react-native
41 41
     - DoubleConversion
42 42
     - glog
43 43
   - glog (0.3.5)
44
-  - GoogleAppMeasurement (5.4.0):
44
+  - GoogleAppMeasurement (5.7.0):
45 45
     - GoogleUtilities/AppDelegateSwizzler (~> 5.2)
46 46
     - GoogleUtilities/MethodSwizzler (~> 5.2)
47 47
     - GoogleUtilities/Network (~> 5.2)
@@ -59,23 +59,23 @@ PODS:
59 59
     - GoogleToolboxForMac/Defines (= 2.2.0)
60 60
     - "GoogleToolboxForMac/NSString+URLArguments (= 2.2.0)"
61 61
   - "GoogleToolboxForMac/NSString+URLArguments (2.2.0)"
62
-  - GoogleUtilities/AppDelegateSwizzler (5.3.7):
62
+  - GoogleUtilities/AppDelegateSwizzler (5.4.1):
63 63
     - GoogleUtilities/Environment
64 64
     - GoogleUtilities/Logger
65 65
     - GoogleUtilities/Network
66
-  - GoogleUtilities/Environment (5.3.7)
67
-  - GoogleUtilities/Logger (5.3.7):
66
+  - GoogleUtilities/Environment (5.4.1)
67
+  - GoogleUtilities/Logger (5.4.1):
68 68
     - GoogleUtilities/Environment
69
-  - GoogleUtilities/MethodSwizzler (5.3.7):
69
+  - GoogleUtilities/MethodSwizzler (5.4.1):
70 70
     - GoogleUtilities/Logger
71
-  - GoogleUtilities/Network (5.3.7):
71
+  - GoogleUtilities/Network (5.4.1):
72 72
     - GoogleUtilities/Logger
73 73
     - "GoogleUtilities/NSData+zlib"
74 74
     - GoogleUtilities/Reachability
75
-  - "GoogleUtilities/NSData+zlib (5.3.7)"
76
-  - GoogleUtilities/Reachability (5.3.7):
75
+  - "GoogleUtilities/NSData+zlib (5.4.1)"
76
+  - GoogleUtilities/Reachability (5.4.1):
77 77
     - GoogleUtilities/Logger
78
-  - GoogleUtilities/UserDefaults (5.3.7):
78
+  - GoogleUtilities/UserDefaults (5.4.1):
79 79
     - GoogleUtilities/Logger
80 80
   - GTMSessionFetcher/Core (1.2.1)
81 81
   - nanopb (0.3.901):
@@ -84,8 +84,8 @@ PODS:
84 84
   - nanopb/decode (0.3.901)
85 85
   - nanopb/encode (0.3.901)
86 86
   - ObjectiveDropboxOfficial (3.9.4)
87
-  - React (0.57.8):
88
-    - React/Core (= 0.57.8)
87
+  - React (0.59.1):
88
+    - React/Core (= 0.59.1)
89 89
   - react-native-background-timer (2.1.1):
90 90
     - React
91 91
   - react-native-calendar-events (1.6.4):
@@ -99,42 +99,50 @@ PODS:
99 99
     - React
100 100
   - react-native-webrtc (1.67.1):
101 101
     - React
102
-  - React/Core (0.57.8):
103
-    - yoga (= 0.57.8.React)
104
-  - React/CxxBridge (0.57.8):
105
-    - Folly (= 2016.10.31.00)
102
+  - React/Core (0.59.1):
103
+    - yoga (= 0.59.1.React)
104
+  - React/CxxBridge (0.59.1):
105
+    - Folly (= 2018.10.22.00)
106 106
     - React/Core
107 107
     - React/cxxreact
108
-  - React/cxxreact (0.57.8):
108
+    - React/jsiexecutor
109
+  - React/cxxreact (0.59.1):
109 110
     - boost-for-react-native (= 1.63.0)
110
-    - Folly (= 2016.10.31.00)
111
-    - React/jschelpers
111
+    - DoubleConversion
112
+    - Folly (= 2018.10.22.00)
113
+    - glog
112 114
     - React/jsinspector
113
-  - React/DevSupport (0.57.8):
115
+  - React/DevSupport (0.59.1):
114 116
     - React/Core
115 117
     - React/RCTWebSocket
116
-  - React/fishhook (0.57.8)
117
-  - React/jschelpers (0.57.8):
118
-    - Folly (= 2016.10.31.00)
119
-    - React/PrivateDatabase
120
-  - React/jsinspector (0.57.8)
121
-  - React/PrivateDatabase (0.57.8)
122
-  - React/RCTActionSheet (0.57.8):
118
+  - React/fishhook (0.59.1)
119
+  - React/jsi (0.59.1):
120
+    - DoubleConversion
121
+    - Folly (= 2018.10.22.00)
122
+    - glog
123
+  - React/jsiexecutor (0.59.1):
124
+    - DoubleConversion
125
+    - Folly (= 2018.10.22.00)
126
+    - glog
127
+    - React/cxxreact
128
+    - React/jsi
129
+  - React/jsinspector (0.59.1)
130
+  - React/RCTActionSheet (0.59.1):
123 131
     - React/Core
124
-  - React/RCTAnimation (0.57.8):
132
+  - React/RCTAnimation (0.59.1):
125 133
     - React/Core
126
-  - React/RCTBlob (0.57.8):
134
+  - React/RCTBlob (0.59.1):
127 135
     - React/Core
128
-  - React/RCTImage (0.57.8):
136
+  - React/RCTImage (0.59.1):
129 137
     - React/Core
130 138
     - React/RCTNetwork
131
-  - React/RCTLinkingIOS (0.57.8):
139
+  - React/RCTLinkingIOS (0.59.1):
132 140
     - React/Core
133
-  - React/RCTNetwork (0.57.8):
141
+  - React/RCTNetwork (0.59.1):
134 142
     - React/Core
135
-  - React/RCTText (0.57.8):
143
+  - React/RCTText (0.59.1):
136 144
     - React/Core
137
-  - React/RCTWebSocket (0.57.8):
145
+  - React/RCTWebSocket (0.59.1):
138 146
     - React/Core
139 147
     - React/fishhook
140 148
     - React/RCTBlob
@@ -148,11 +156,11 @@ PODS:
148 156
     - React/Core
149 157
   - RNVectorIcons (6.0.2):
150 158
     - React
151
-  - SDWebImage/Core (4.4.3)
152
-  - SDWebImage/GIF (4.4.3):
159
+  - SDWebImage/Core (4.4.6)
160
+  - SDWebImage/GIF (4.4.6):
153 161
     - FLAnimatedImage (~> 1.0)
154 162
     - SDWebImage/Core
155
-  - yoga (0.57.8.React)
163
+  - yoga (0.59.1.React)
156 164
 
157 165
 DEPENDENCIES:
158 166
   - Amplitude-iOS (~> 4.0.4)
@@ -244,23 +252,23 @@ SPEC CHECKSUMS:
244 252
   Crashlytics: 07fb167b1694128c1c9a5a5cc319b0e9c3ca0933
245 253
   DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
246 254
   Fabric: f988e33c97f08930a413e08123064d2e5f68d655
247
-  Firebase: 8bb9268bff82374f2cbaaabb143e725743c316ae
248
-  FirebaseAnalytics: c06f9d70577d79074214700a71fd5d39de5550fb
249
-  FirebaseAnalyticsInterop: e5f21be9af6548372e2f0815834ff909bff395a2
250
-  FirebaseCore: 35747502d9e8c6ee217385ad04446c7c2aaf9c5c
251
-  FirebaseDynamicLinks: c713da5f75c324f38fb2d57164bbc1c461aa6739
252
-  FirebaseInstanceID: e2fa4cb35ef5558c200f7f0ad8a53e212215f93e
255
+  Firebase: 02f3281965c075426141a0ce1277e9de6649cab9
256
+  FirebaseAnalytics: 23851fe602c872130a2c5c55040b302120346cc2
257
+  FirebaseAnalyticsInterop: efbe45c8385ec626e29f9525e5ebd38520dfb6c1
258
+  FirebaseCore: 52f851b30e11360f1e67cf04b1edfebf0a47a2d3
259
+  FirebaseDynamicLinks: f209c3caccd82102caa0e91d393e3ccc593501fd
260
+  FirebaseInstanceID: bd6fc5a258884e206fd5c474ebe4f5b00e21770e
253 261
   FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31
254
-  Folly: c89ac2d5c6ab169cd7397ef27485c44f35f742c7
255
-  glog: e8acf0ebbf99759d3ff18c86c292a5898282dcde
256
-  GoogleAppMeasurement: 98b71f5e04142793729a5ef23e5b96651ff4b70f
262
+  Folly: de497beb10f102453a1afa9edbf8cf8a251890de
263
+  glog: aefd1eb5dda2ab95ba0938556f34b98e2da3a60d
264
+  GoogleAppMeasurement: 6cf307834da065863f9faf4c0de0a936d81dd832
257 265
   GoogleSignIn: 7ff245e1a7b26d379099d3243a562f5747e23d39
258 266
   GoogleToolboxForMac: ff31605b7d66400dcec09bed5861689aebadda4d
259
-  GoogleUtilities: 111a012f4c3a29c9e7c954c082fafd6ee3c999c0
267
+  GoogleUtilities: 1e25823cbf46540b4284f6ef8e17b3a68ee12bbc
260 268
   GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
261 269
   nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
262 270
   ObjectiveDropboxOfficial: a5afefc83f6467c42c45f2253f583f2ad1ffc701
263
-  React: adbac0757ce35e92fbd447ab98c810209d27d9b0
271
+  React: 34a405ead72252839fdc4afc1f972a7ed984af84
264 272
   react-native-background-timer: 0d34748e53a972507c66963490c775321a88f6f2
265 273
   react-native-calendar-events: ee9573e355711ac679e071be70789542431f4ce3
266 274
   react-native-fast-image: 47487b71169aea34868e7b38bf870b6b3f2157c5
@@ -269,8 +277,8 @@ SPEC CHECKSUMS:
269 277
   RNGoogleSignin: 361174d9a3090d295b06257162b560d8efc8a6ed
270 278
   RNSound: 53d2fc9c6589bd68daba530262b7560393def3ac
271 279
   RNVectorIcons: d819334932bcda3332deb3d2c8ea4d069e0b98f9
272
-  SDWebImage: c5594f1a19c48d526d321e548902b56b479cd508
273
-  yoga: 74cdf036c30820443b25ade59916236b1e95ee93
280
+  SDWebImage: 3f3f0c02f09798048c47a5ed0a13f17b063572d8
281
+  yoga: 8fb47f180b19b0dadb285a09e4c74c8a41721d3a
274 282
 
275 283
 PODFILE CHECKSUM: b300161e95d65c24b91368803afb8873f4b873cc
276 284
 

+ 1
- 1
ios/sdk/sdk.xcodeproj/project.pbxproj View File

@@ -373,7 +373,7 @@
373 373
 			);
374 374
 			runOnlyForDeploymentPostprocessing = 0;
375 375
 			shellPath = /bin/sh;
376
-			shellScript = "if [[ \"$CONFIGURATION\" == *Debug* && ! \"$PLATFORM_NAME\" == *simulator ]]; then\n    IP=$(ipconfig getifaddr en0)\n    if [ -z \"$IP\" ]; then\n        IP=$(ifconfig | grep 'inet ' | grep -v ' 127.' | cut -d\\   -f2  | awk 'NR==1{print $1}')\n    fi\n    DEST=$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH\n    echo \"$IP\" > \"$DEST/ip.txt\"\n    exit 0\nfi\nexport NODE_BINARY=node\n../../node_modules/react-native/scripts/react-native-xcode.sh\n";
376
+			shellScript = "export NODE_BINARY=node\n../../node_modules/react-native/scripts/react-native-xcode.sh\n";
377 377
 		};
378 378
 		26796D8589142D80C8AFDA51 /* [CP] Check Pods Manifest.lock */ = {
379 379
 			isa = PBXShellScriptBuildPhase;

+ 1
- 1
ios/sdk/src/RCTBridgeWrapper.m View File

@@ -97,7 +97,7 @@ static NSURL *serverRootWithHost(NSString *host) {
97 97
     NSString *host = [self guessPackagerHost];
98 98
 
99 99
     if (host != nil) {
100
-        NSString *path = @"/index.ios.bundle";
100
+        NSString *path = @"/index.bundle";
101 101
         NSString *query = @"platform=ios&dev=true&minify=false";
102 102
         NSURLComponents *components
103 103
             = [NSURLComponents componentsWithURL:serverRootWithHost(host)

+ 19
- 0
metro.config.js View File

@@ -0,0 +1,19 @@
1
+/* eslint-disable */
2
+
3
+/**
4
+ * Metro configuration for React Native
5
+ * https://github.com/facebook/react-native
6
+ *
7
+ * @format
8
+ */
9
+
10
+module.exports = {
11
+  transformer: {
12
+    getTransformOptions: async () => ({
13
+      transform: {
14
+        experimentalImportSupport: false,
15
+        inlineRequires: false,
16
+      },
17
+    }),
18
+  },
19
+};

+ 600
- 289
package-lock.json
File diff suppressed because it is too large
View File


+ 5
- 6
package.json View File

@@ -49,7 +49,6 @@
49 49
     "jquery-i18next": "1.2.0",
50 50
     "js-md5": "0.6.1",
51 51
     "js-utils": "github:jitsi/js-utils#73a67a7a60d52f8e895f50939c8fcbd1f20fe7b5",
52
-    "jsc-android": "224109.1.0",
53 52
     "jsrsasign": "8.0.12",
54 53
     "jwt-decode": "2.2.0",
55 54
     "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#74f48e168eec4c05fd8600812cc00e6e34e9ab90",
@@ -58,12 +57,12 @@
58 57
     "moment": "2.19.4",
59 58
     "moment-duration-format": "2.2.2",
60 59
     "postis": "2.2.0",
61
-    "react": "16.6.3",
62
-    "react-dom": "16.6.3",
60
+    "react": "16.8.3",
61
+    "react-dom": "16.8.3",
63 62
     "react-emoji-render": "0.4.6",
64 63
     "react-i18next": "7.13.0",
65 64
     "react-linkify": "0.2.2",
66
-    "react-native": "0.57.8",
65
+    "react-native": "0.59.1",
67 66
     "react-native-background-timer": "2.1.1",
68 67
     "react-native-calendar-events": "1.6.4",
69 68
     "react-native-callstats": "3.57.1",
@@ -76,7 +75,7 @@
76 75
     "react-native-sound": "github:jitsi/react-native-sound#e4260ed7f641eeb0377d76eac7987aba72e1cf08",
77 76
     "react-native-swipeout": "2.3.6",
78 77
     "react-native-vector-icons": "6.0.2",
79
-    "react-native-webrtc": "github:jitsi/react-native-webrtc#c1be0cb1c6e8a83dfd406e478082a5ff205a97ec",
78
+    "react-native-webrtc": "github:jitsi/react-native-webrtc#4ded2c299651472ff4569e412161e93826aa5bf3",
80 79
     "react-redux": "5.0.7",
81 80
     "react-transition-group": "2.4.0",
82 81
     "redux": "4.0.0",
@@ -107,7 +106,7 @@
107 106
     "eslint-plugin-react": "7.11.1",
108 107
     "eslint-plugin-react-native": "3.3.0",
109 108
     "expose-loader": "0.7.5",
110
-    "flow-bin": "0.78.0",
109
+    "flow-bin": "0.92.0",
111 110
     "imports-loader": "0.7.1",
112 111
     "metro-react-native-babel-preset": "0.49.2",
113 112
     "node-sass": "4.10.0",

+ 1
- 1
react/features/welcome/components/WelcomePage.native.js View File

@@ -113,7 +113,7 @@ class WelcomePage extends AbstractWelcomePage {
113 113
                             <TextInput
114 114
                                 accessibilityLabel = { t(roomnameAccLabel) }
115 115
                                 autoCapitalize = 'none'
116
-                                autoComplete = { false }
116
+                                autoComplete = 'off'
117 117
                                 autoCorrect = { false }
118 118
                                 autoFocus = { false }
119 119
                                 onBlur = { this._onFieldBlur }

Loading…
Cancel
Save