Skip to content

Commit 81f547d

Browse files
ryantremryantrem
authored
Fix various issues with the PackageTest apps for Android and iOS (#309)
1 parent 119409a commit 81f547d

File tree

10 files changed

+365
-328
lines changed

10 files changed

+365
-328
lines changed

‎Apps/PackageTest/0.63.1/android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
jcenter()
1313
}
1414
dependencies {
15-
classpath("com.android.tools.build:gradle:3.5.3")
15+
classpath("com.android.tools.build:gradle:3.5.4")
1616
// NOTE: Do not place your application dependencies here; they belong
1717
// in the individual module build.gradle files
1818
}

‎Apps/PackageTest/0.63.1/ios/PackageTest.xcodeproj/project.pbxproj

+2-12
Original file line numberDiff line numberDiff line change
@@ -596,12 +596,6 @@
596596
ENABLE_BITCODE = NO;
597597
INFOPLIST_FILE = PackageTest/Info.plist;
598598
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
599-
LIBRARY_SEARCH_PATHS = (
600-
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
601-
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
602-
"\"$(inherited)\"",
603-
"\"$(SDKROOT)/usr/lib/swift\"",
604-
);
605599
OTHER_LDFLAGS = (
606600
"$(inherited)",
607601
"-ObjC",
@@ -624,12 +618,6 @@
624618
CURRENT_PROJECT_VERSION = 1;
625619
INFOPLIST_FILE = PackageTest/Info.plist;
626620
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
627-
LIBRARY_SEARCH_PATHS = (
628-
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
629-
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
630-
"\"$(inherited)\"",
631-
"\"$(SDKROOT)/usr/lib/swift\"",
632-
);
633621
OTHER_LDFLAGS = (
634622
"$(inherited)",
635623
"-ObjC",
@@ -801,6 +789,7 @@
801789
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
802790
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
803791
"\"$(inherited)\"",
792+
"\"$(SDKROOT)/usr/lib/swift\"",
804793
);
805794
MTL_ENABLE_DEBUG_INFO = YES;
806795
ONLY_ACTIVE_ARCH = YES;
@@ -854,6 +843,7 @@
854843
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
855844
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
856845
"\"$(inherited)\"",
846+
"\"$(SDKROOT)/usr/lib/swift\"",
857847
);
858848
MTL_ENABLE_DEBUG_INFO = NO;
859849
SDKROOT = iphoneos;

‎Apps/PackageTest/0.63.1/ios/Podfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ PODS:
236236
- React-cxxreact (= 0.63.1)
237237
- React-jsi (= 0.63.1)
238238
- React-jsinspector (0.63.1)
239-
- react-native-babylon (0.0.1):
239+
- react-native-babylon (0.4.0-alpha.41):
240240
- React
241241
- React-RCTActionSheet (0.63.1):
242242
- React-Core/RCTActionSheetHeaders (= 0.63.1)
@@ -460,7 +460,7 @@ SPEC CHECKSUMS:
460460
React-jsi: b32a31da32e030f30bbf9a8d3a9c8325df9e793f
461461
React-jsiexecutor: 7ab9cdcdd18d57652fb041f8a147fe9658d4e00a
462462
React-jsinspector: 2e28bb487e42dda6c94dbfa0c648d1343767a0fb
463-
react-native-babylon: aefdca46971b35a7dbe99cd9c8ba4ea7d6d0b8b4
463+
react-native-babylon: a65a6fb5f93add09adca32d996c027d69def04ad
464464
React-RCTActionSheet: 1702a1a85e550b5c36e2e03cb2bd3adea053de95
465465
React-RCTAnimation: ddda576010a878865a4eab83a78acd92176ef6a1
466466
React-RCTBlob: 34334384284c81577409d5205bd2b9ff594d8ab6

‎Apps/PackageTest/0.63.1/package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Apps/PackageTest/0.63.1/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"dependencies": {
1313
"@babylonjs/core": "5.0.0-alpha.60",
14-
"@babylonjs/react-native": "^0.4.0-alpha.33",
14+
"@babylonjs/react-native": "^0.4.0-alpha.41",
1515
"react": "16.13.1",
1616
"react-native": "0.63.1",
1717
"react-native-permissions": "^2.1.5"

‎Apps/PackageTest/0.64.0/android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
jcenter()
1313
}
1414
dependencies {
15-
classpath("com.android.tools.build:gradle:3.5.3")
15+
classpath("com.android.tools.build:gradle:3.5.4")
1616
// NOTE: Do not place your application dependencies here; they belong
1717
// in the individual module build.gradle files
1818
}

‎Apps/PackageTest/0.64.0/ios/PackageTest.xcodeproj/project.pbxproj

+2-12
Original file line numberDiff line numberDiff line change
@@ -596,12 +596,6 @@
596596
ENABLE_BITCODE = NO;
597597
INFOPLIST_FILE = PackageTest/Info.plist;
598598
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
599-
LIBRARY_SEARCH_PATHS = (
600-
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
601-
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
602-
"\"$(inherited)\"",
603-
"\"$(SDKROOT)/usr/lib/swift\"",
604-
);
605599
OTHER_LDFLAGS = (
606600
"$(inherited)",
607601
"-ObjC",
@@ -624,12 +618,6 @@
624618
CURRENT_PROJECT_VERSION = 1;
625619
INFOPLIST_FILE = PackageTest/Info.plist;
626620
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
627-
LIBRARY_SEARCH_PATHS = (
628-
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
629-
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
630-
"\"$(inherited)\"",
631-
"\"$(SDKROOT)/usr/lib/swift\"",
632-
);
633621
OTHER_LDFLAGS = (
634622
"$(inherited)",
635623
"-ObjC",
@@ -801,6 +789,7 @@
801789
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
802790
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
803791
"\"$(inherited)\"",
792+
"\"$(SDKROOT)/usr/lib/swift\"",
804793
);
805794
MTL_ENABLE_DEBUG_INFO = YES;
806795
ONLY_ACTIVE_ARCH = YES;
@@ -854,6 +843,7 @@
854843
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
855844
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
856845
"\"$(inherited)\"",
846+
"\"$(SDKROOT)/usr/lib/swift\"",
857847
);
858848
MTL_ENABLE_DEBUG_INFO = NO;
859849
SDKROOT = iphoneos;

0 commit comments

Comments
 (0)