Skip to content

Commit ae726cf

Browse files
lyubomirlyubomir
committed
react-native 0.40.0
1 parent 1a04e5a commit ae726cf

File tree

7 files changed

+174
-9
lines changed

7 files changed

+174
-9
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
*.bundle.js -text -diff
2+
*.pbxproj -text
23
lib-jitsi-meet.js -text -diff

‎.gitignore

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@ DerivedData
3636
*.xcuserstate
3737
project.xcworkspace
3838

39-
# Android/IJ
39+
# Android/IntelliJ
4040
#
41-
*.iml
41+
build/
4242
.idea
4343
.gradle
4444
local.properties
45+
*.iml
4546

4647
# node.js
4748
#
@@ -53,4 +54,15 @@ npm-debug.log
5354
buck-out/
5455
\.buckd/
5556
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

‎android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@ dependencies {
144144
compile project(':react-native-webrtc')
145145
compile fileTree(dir: 'libs', include: ['*.jar'])
146146
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
148148
}
149149

150150
apply from: '../../node_modules/react-native-vector-icons/fonts.gradle'
151151

152152
// Run this once to be able to run the application with BUCK
153153
// puts all compile dependencies into folder libs for BUCK to use
154154
task copyDownloadableDepsToLibs(type: Copy) {
155-
from configurations.compile
156-
into 'libs'
155+
from configurations.compile
156+
into 'libs'
157157
}

‎android/app/src/main/java/org/jitsi/meet/MainApplication.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.facebook.react.ReactApplication;
66
import com.facebook.react.ReactNativeHost;
77
import com.facebook.react.ReactPackage;
8+
import com.facebook.soloader.SoLoader;
89

910
import java.util.Arrays;
1011
import java.util.List;
@@ -48,6 +49,8 @@ public ReactNativeHost getReactNativeHost() {
4849
public void onCreate() {
4950
super.onCreate();
5051

52+
SoLoader.init(this, /* native exopackage */ false);
53+
5154
if (!getReactNativeHost()
5255
.getReactInstanceManager()
5356
.getDevSupportManager()

‎ios/jitsi-meet-react.xcodeproj/project.pbxproj

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
2525
2602576C1D0A7703001E3363 /* jitsi.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2602576B1D0A7703001E3363 /* jitsi.ttf */; };
2626
3847F11906B4479A9162628F /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 821D8ABD506944B4BDBB069B /* libRNVectorIcons.a */; };
27+
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
2728
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
2829
901FE90FA5744B5B94DCDC41 /* libKCKeepAwake.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EA8C046B2BF46279796F07D /* libKCKeepAwake.a */; };
2930
B30EF2311DC0ED7C00690F45 /* WebRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B30EF2301DC0ED7C00690F45 /* WebRTC.framework */; };
@@ -113,6 +114,62 @@
113114
remoteGlobalIDString = 5DBEB1501B18CEA900B34395;
114115
remoteInfo = RNVectorIcons;
115116
};
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+
};
116173
78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */ = {
117174
isa = PBXContainerItemProxy;
118175
containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
@@ -221,6 +278,7 @@
221278
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>"; };
222279
2602576B1D0A7703001E3363 /* jitsi.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = jitsi.ttf; path = ../android/app/src/main/assets/fonts/jitsi.ttf; sourceTree = "<group>"; };
223280
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>"; };
224282
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
225283
821D8ABD506944B4BDBB069B /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = "<group>"; };
226284
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 @@
259317
BF96438E1C34FBE100B0BBDF /* VideoToolbox.framework in Frameworks */,
260318
146834051AC3E58100842450 /* libReact.a in Frameworks */,
261319
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
320+
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
262321
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
263322
00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */,
264323
133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */,
@@ -364,6 +423,12 @@
364423
isa = PBXGroup;
365424
children = (
366425
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 */,
367432
B3BA19EF1DC6B37B00BCD481 /* libReact-tvOS.a */,
368433
);
369434
name = Products;
@@ -377,6 +442,15 @@
377442
name = Products;
378443
sourceTree = "<group>";
379444
};
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+
};
380454
6956B374CC3C453DB7B8E82D /* Resources */ = {
381455
isa = PBXGroup;
382456
children = (
@@ -403,6 +477,7 @@
403477
BF9643911C34FBF100B0BBDF /* libsqlite3.tbd */,
404478
BF9643931C34FBF900B0BBDF /* libstdc++.tbd */,
405479
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
480+
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */,
406481
00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */,
407482
00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */,
408483
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */,
@@ -534,6 +609,10 @@
534609
ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
535610
ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
536611
},
612+
{
613+
ProductGroup = 5E91572E1DD0AC6500FF2AA8 /* Products */;
614+
ProjectRef = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */;
615+
},
537616
{
538617
ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
539618
ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
@@ -720,6 +799,62 @@
720799
remoteRef = B3BA19EE1DC6B37B00BCD481 /* PBXContainerItemProxy */;
721800
sourceTree = BUILT_PRODUCTS_DIR;
722801
};
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+
};
723858
BFC745131CB829A700673F38 /* libRCTWebRTC.a */ = {
724859
isa = PBXReferenceProxy;
725860
fileType = archive.ar;

‎ios/jitsi-meet-react.xcodeproj/xcshareddata/xcschemes/jitsi-meet-react.xcscheme

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,23 @@
33
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
6-
parallelizeBuildables = "YES"
6+
parallelizeBuildables = "NO"
77
buildImplicitDependencies = "YES">
88
<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>
923
<BuildActionEntry
1024
buildForTesting = "YES"
1125
buildForRunning = "YES"

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
"postis": "^2.2.0",
3535
"react": "15.4.2",
3636
"react-dom": "15.4.2",
37-
"react-native": "0.39.2",
37+
"react-native": "0.40.0",
3838
"react-native-keep-awake": "^1.0.7",
3939
"react-native-prompt": "^1.0.0",
40-
"react-native-vector-icons": "^3.0.0",
40+
"react-native-vector-icons": "^4.0.0",
4141
"react-native-webrtc": "jitsi/react-native-webrtc",
4242
"react-redux": "^5.0.2",
4343
"redux": "^3.5.2",

0 commit comments

Comments
 (0)