浏览代码

react-native 0.40.0

master
Lyubomir Marinov 7 年前
父节点
当前提交
ae726cfdc0

+ 1
- 0
.gitattributes 查看文件

@@ -1,2 +1,3 @@
1 1
 *.bundle.js -text -diff
2
+*.pbxproj -text
2 3
 lib-jitsi-meet.js -text -diff

+ 15
- 3
.gitignore 查看文件

@@ -36,12 +36,13 @@ DerivedData
36 36
 *.xcuserstate
37 37
 project.xcworkspace
38 38
 
39
-# Android/IJ
39
+# Android/IntelliJ
40 40
 #
41
-*.iml
41
+build/
42 42
 .idea
43 43
 .gradle
44 44
 local.properties
45
+*.iml
45 46
 
46 47
 # node.js
47 48
 #
@@ -53,4 +54,15 @@ npm-debug.log
53 54
 buck-out/
54 55
 \.buckd/
55 56
 android/app/libs
56
-android/keystores/debug.keystore
57
+*.keystore
58
+
59
+# fastlane
60
+#
61
+# It is recommended to not store the screenshots in the git repo. Instead, use
62
+# fastlane to re-generate the screenshots whenever they are needed. For more
63
+# information about the recommended setup visit:
64
+# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
65
+#
66
+fastlane/report.xml
67
+fastlane/Preview.html
68
+fastlane/screenshots

+ 3
- 3
android/app/build.gradle 查看文件

@@ -144,7 +144,7 @@ dependencies {
144 144
     compile project(':react-native-webrtc')
145 145
     compile fileTree(dir: 'libs', include: ['*.jar'])
146 146
     compile 'com.android.support:appcompat-v7:23.0.1'
147
-    compile 'com.facebook.react:react-native:+'
147
+    compile 'com.facebook.react:react-native:+'  // From node_modules
148 148
 }
149 149
 
150 150
 apply from: '../../node_modules/react-native-vector-icons/fonts.gradle'
@@ -152,6 +152,6 @@ apply from: '../../node_modules/react-native-vector-icons/fonts.gradle'
152 152
 // Run this once to be able to run the application with BUCK
153 153
 // puts all compile dependencies into folder libs for BUCK to use
154 154
 task copyDownloadableDepsToLibs(type: Copy) {
155
-  from configurations.compile
156
-  into 'libs'
155
+    from configurations.compile
156
+    into 'libs'
157 157
 }

+ 3
- 0
android/app/src/main/java/org/jitsi/meet/MainApplication.java 查看文件

@@ -5,6 +5,7 @@ import android.app.Application;
5 5
 import com.facebook.react.ReactApplication;
6 6
 import com.facebook.react.ReactNativeHost;
7 7
 import com.facebook.react.ReactPackage;
8
+import com.facebook.soloader.SoLoader;
8 9
 
9 10
 import java.util.Arrays;
10 11
 import java.util.List;
@@ -48,6 +49,8 @@ public class MainApplication extends Application implements ReactApplication {
48 49
     public void onCreate() {
49 50
         super.onCreate();
50 51
 
52
+        SoLoader.init(this, /* native exopackage */ false);
53
+
51 54
         if (!getReactNativeHost()
52 55
                 .getReactInstanceManager()
53 56
                     .getDevSupportManager()

+ 135
- 0
ios/jitsi-meet-react.xcodeproj/project.pbxproj 查看文件

@@ -24,6 +24,7 @@
24 24
 		146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
25 25
 		2602576C1D0A7703001E3363 /* jitsi.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2602576B1D0A7703001E3363 /* jitsi.ttf */; };
26 26
 		3847F11906B4479A9162628F /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 821D8ABD506944B4BDBB069B /* libRNVectorIcons.a */; };
27
+		5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
27 28
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
28 29
 		901FE90FA5744B5B94DCDC41 /* libKCKeepAwake.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EA8C046B2BF46279796F07D /* libKCKeepAwake.a */; };
29 30
 		B30EF2311DC0ED7C00690F45 /* WebRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B30EF2301DC0ED7C00690F45 /* WebRTC.framework */; };
@@ -113,6 +114,62 @@
113 114
 			remoteGlobalIDString = 5DBEB1501B18CEA900B34395;
114 115
 			remoteInfo = RNVectorIcons;
115 116
 		};
117
+		3DAD3EA41DF850E9000B6D8A /* PBXContainerItemProxy */ = {
118
+			isa = PBXContainerItemProxy;
119
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
120
+			proxyType = 2;
121
+			remoteGlobalIDString = 3D3C059A1DE3340900C268FA;
122
+			remoteInfo = yoga;
123
+		};
124
+		3DAD3EA61DF850E9000B6D8A /* PBXContainerItemProxy */ = {
125
+			isa = PBXContainerItemProxy;
126
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
127
+			proxyType = 2;
128
+			remoteGlobalIDString = 3D3C06751DE3340C00C268FA;
129
+			remoteInfo = "yoga-tvOS";
130
+		};
131
+		3DAD3EA81DF850E9000B6D8A /* PBXContainerItemProxy */ = {
132
+			isa = PBXContainerItemProxy;
133
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
134
+			proxyType = 2;
135
+			remoteGlobalIDString = 3D3CD9251DE5FBEC00167DC4;
136
+			remoteInfo = cxxreact;
137
+		};
138
+		3DAD3EAA1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
139
+			isa = PBXContainerItemProxy;
140
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
141
+			proxyType = 2;
142
+			remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
143
+			remoteInfo = "cxxreact-tvOS";
144
+		};
145
+		3DAD3EAC1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
146
+			isa = PBXContainerItemProxy;
147
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
148
+			proxyType = 2;
149
+			remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
150
+			remoteInfo = jschelpers;
151
+		};
152
+		3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
153
+			isa = PBXContainerItemProxy;
154
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
155
+			proxyType = 2;
156
+			remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
157
+			remoteInfo = "jschelpers-tvOS";
158
+		};
159
+		5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */ = {
160
+			isa = PBXContainerItemProxy;
161
+			containerPortal = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */;
162
+			proxyType = 2;
163
+			remoteGlobalIDString = 134814201AA4EA6300B7C361;
164
+			remoteInfo = RCTAnimation;
165
+		};
166
+		5E9157341DD0AC6500FF2AA8 /* PBXContainerItemProxy */ = {
167
+			isa = PBXContainerItemProxy;
168
+			containerPortal = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */;
169
+			proxyType = 2;
170
+			remoteGlobalIDString = 2D2A28201D9B03D100D4039D;
171
+			remoteInfo = "RCTAnimation-tvOS";
172
+		};
116 173
 		78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */ = {
117 174
 			isa = PBXContainerItemProxy;
118 175
 			containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
@@ -221,6 +278,7 @@
221 278
 		22418656B14845609F953A42 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; };
222 279
 		2602576B1D0A7703001E3363 /* jitsi.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = jitsi.ttf; path = ../android/app/src/main/assets/fonts/jitsi.ttf; sourceTree = "<group>"; };
223 280
 		5B09C20C78C74A548AAAC1FA /* KCKeepAwake.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = KCKeepAwake.xcodeproj; path = "../node_modules/react-native-keep-awake/ios/KCKeepAwake.xcodeproj"; sourceTree = "<group>"; };
281
+		5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
224 282
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
225 283
 		821D8ABD506944B4BDBB069B /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = "<group>"; };
226 284
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
@@ -259,6 +317,7 @@
259 317
 				BF96438E1C34FBE100B0BBDF /* VideoToolbox.framework in Frameworks */,
260 318
 				146834051AC3E58100842450 /* libReact.a in Frameworks */,
261 319
 				00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
320
+				5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
262 321
 				00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
263 322
 				00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */,
264 323
 				133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */,
@@ -364,6 +423,12 @@
364 423
 			isa = PBXGroup;
365 424
 			children = (
366 425
 				146834041AC3E56700842450 /* libReact.a */,
426
+				3DAD3EA51DF850E9000B6D8A /* libyoga.a */,
427
+				3DAD3EA71DF850E9000B6D8A /* libyoga.a */,
428
+				3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */,
429
+				3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
430
+				3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
431
+				3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
367 432
 				B3BA19EF1DC6B37B00BCD481 /* libReact-tvOS.a */,
368 433
 			);
369 434
 			name = Products;
@@ -377,6 +442,15 @@
377 442
 			name = Products;
378 443
 			sourceTree = "<group>";
379 444
 		};
445
+		5E91572E1DD0AC6500FF2AA8 /* Products */ = {
446
+			isa = PBXGroup;
447
+			children = (
448
+				5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */,
449
+				5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */,
450
+			);
451
+			name = Products;
452
+			sourceTree = "<group>";
453
+		};
380 454
 		6956B374CC3C453DB7B8E82D /* Resources */ = {
381 455
 			isa = PBXGroup;
382 456
 			children = (
@@ -403,6 +477,7 @@
403 477
 				BF9643911C34FBF100B0BBDF /* libsqlite3.tbd */,
404 478
 				BF9643931C34FBF900B0BBDF /* libstdc++.tbd */,
405 479
 				00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
480
+				5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */,
406 481
 				00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */,
407 482
 				00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */,
408 483
 				78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */,
@@ -534,6 +609,10 @@
534 609
 					ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
535 610
 					ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
536 611
 				},
612
+				{
613
+					ProductGroup = 5E91572E1DD0AC6500FF2AA8 /* Products */;
614
+					ProjectRef = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */;
615
+				},
537 616
 				{
538 617
 					ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
539 618
 					ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
@@ -720,6 +799,62 @@
720 799
 			remoteRef = B3BA19EE1DC6B37B00BCD481 /* PBXContainerItemProxy */;
721 800
 			sourceTree = BUILT_PRODUCTS_DIR;
722 801
 		};
802
+		3DAD3EA51DF850E9000B6D8A /* libyoga.a */ = {
803
+			isa = PBXReferenceProxy;
804
+			fileType = archive.ar;
805
+			path = libyoga.a;
806
+			remoteRef = 3DAD3EA41DF850E9000B6D8A /* PBXContainerItemProxy */;
807
+			sourceTree = BUILT_PRODUCTS_DIR;
808
+		};
809
+		3DAD3EA71DF850E9000B6D8A /* libyoga.a */ = {
810
+			isa = PBXReferenceProxy;
811
+			fileType = archive.ar;
812
+			path = libyoga.a;
813
+			remoteRef = 3DAD3EA61DF850E9000B6D8A /* PBXContainerItemProxy */;
814
+			sourceTree = BUILT_PRODUCTS_DIR;
815
+		};
816
+		3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */ = {
817
+			isa = PBXReferenceProxy;
818
+			fileType = archive.ar;
819
+			path = libcxxreact.a;
820
+			remoteRef = 3DAD3EA81DF850E9000B6D8A /* PBXContainerItemProxy */;
821
+			sourceTree = BUILT_PRODUCTS_DIR;
822
+		};
823
+		3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */ = {
824
+			isa = PBXReferenceProxy;
825
+			fileType = archive.ar;
826
+			path = libcxxreact.a;
827
+			remoteRef = 3DAD3EAA1DF850E9000B6D8A /* PBXContainerItemProxy */;
828
+			sourceTree = BUILT_PRODUCTS_DIR;
829
+		};
830
+		3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */ = {
831
+			isa = PBXReferenceProxy;
832
+			fileType = archive.ar;
833
+			path = libjschelpers.a;
834
+			remoteRef = 3DAD3EAC1DF850E9000B6D8A /* PBXContainerItemProxy */;
835
+			sourceTree = BUILT_PRODUCTS_DIR;
836
+		};
837
+		3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */ = {
838
+			isa = PBXReferenceProxy;
839
+			fileType = archive.ar;
840
+			path = libjschelpers.a;
841
+			remoteRef = 3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */;
842
+			sourceTree = BUILT_PRODUCTS_DIR;
843
+		};
844
+		5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */ = {
845
+			isa = PBXReferenceProxy;
846
+			fileType = archive.ar;
847
+			path = libRCTAnimation.a;
848
+			remoteRef = 5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */;
849
+			sourceTree = BUILT_PRODUCTS_DIR;
850
+		};
851
+		5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */ = {
852
+			isa = PBXReferenceProxy;
853
+			fileType = archive.ar;
854
+			path = "libRCTAnimation-tvOS.a";
855
+			remoteRef = 5E9157341DD0AC6500FF2AA8 /* PBXContainerItemProxy */;
856
+			sourceTree = BUILT_PRODUCTS_DIR;
857
+		};
723 858
 		BFC745131CB829A700673F38 /* libRCTWebRTC.a */ = {
724 859
 			isa = PBXReferenceProxy;
725 860
 			fileType = archive.ar;

+ 15
- 1
ios/jitsi-meet-react.xcodeproj/xcshareddata/xcschemes/jitsi-meet-react.xcscheme 查看文件

@@ -3,9 +3,23 @@
3 3
    LastUpgradeVersion = "0800"
4 4
    version = "1.3">
5 5
    <BuildAction
6
-      parallelizeBuildables = "YES"
6
+      parallelizeBuildables = "NO"
7 7
       buildImplicitDependencies = "YES">
8 8
       <BuildActionEntries>
9
+         <BuildActionEntry
10
+            buildForTesting = "YES"
11
+            buildForRunning = "YES"
12
+            buildForProfiling = "YES"
13
+            buildForArchiving = "YES"
14
+            buildForAnalyzing = "YES">
15
+            <BuildableReference
16
+               BuildableIdentifier = "primary"
17
+               BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
18
+               BuildableName = "libReact.a"
19
+               BlueprintName = "React"
20
+               ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
21
+            </BuildableReference>
22
+         </BuildActionEntry>
9 23
          <BuildActionEntry
10 24
             buildForTesting = "YES"
11 25
             buildForRunning = "YES"

+ 2
- 2
package.json 查看文件

@@ -34,10 +34,10 @@
34 34
     "postis": "^2.2.0",
35 35
     "react": "15.4.2",
36 36
     "react-dom": "15.4.2",
37
-    "react-native": "0.39.2",
37
+    "react-native": "0.40.0",
38 38
     "react-native-keep-awake": "^1.0.7",
39 39
     "react-native-prompt": "^1.0.0",
40
-    "react-native-vector-icons": "^3.0.0",
40
+    "react-native-vector-icons": "^4.0.0",
41 41
     "react-native-webrtc": "jitsi/react-native-webrtc",
42 42
     "react-redux": "^5.0.2",
43 43
     "redux": "^3.5.2",

正在加载...
取消
保存