Skip to content

Commit 646b719

Browse files
JimmyDaddyJimmyDaddy
committed
test: fix example config
1 parent 1c62250 commit 646b719

File tree

7 files changed

+43
-149
lines changed

7 files changed

+43
-149
lines changed

‎example/Gemfile.lock

Lines changed: 0 additions & 99 deletions
This file was deleted.

‎example/ios/ImageMarkerExample.xcodeproj/project.pbxproj

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
1313
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1414
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
15-
552FE0025890E32E99AF119A /* libPods-ImageMarkerExample-ImageMarkerExampleUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 744A2F230C283E0D140F997B /* libPods-ImageMarkerExample-ImageMarkerExampleUITests.a */; };
1615
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
1716
A119E9E12B162437000C0527 /* ImageMarkerExampleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A119E9E02B162437000C0527 /* ImageMarkerExampleUITests.swift */; };
1817
A119E9E32B162437000C0527 /* ImageMarkerExampleUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A119E9E22B162437000C0527 /* ImageMarkerExampleUITestsLaunchTests.swift */; };
@@ -38,7 +37,6 @@
3837
15E0FEF5E88EB5BA856E015A /* Pods-ImageMarkerExample-ImageMarkerExampleUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImageMarkerExample-ImageMarkerExampleUITests.release.xcconfig"; path = "Target Support Files/Pods-ImageMarkerExample-ImageMarkerExampleUITests/Pods-ImageMarkerExample-ImageMarkerExampleUITests.release.xcconfig"; sourceTree = "<group>"; };
3938
3B4392A12AC88292D35C810B /* Pods-ImageMarkerExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImageMarkerExample.debug.xcconfig"; path = "Target Support Files/Pods-ImageMarkerExample/Pods-ImageMarkerExample.debug.xcconfig"; sourceTree = "<group>"; };
4039
5709B34CF0A7D63546082F79 /* Pods-ImageMarkerExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImageMarkerExample.release.xcconfig"; path = "Target Support Files/Pods-ImageMarkerExample/Pods-ImageMarkerExample.release.xcconfig"; sourceTree = "<group>"; };
41-
5AF9B3B6D62946E1E270EDB8 /* Pods-ImageMarkerExample-ImageMarkerExampleUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImageMarkerExample-ImageMarkerExampleUITests.debug.xcconfig"; path = "Target Support Files/Pods-ImageMarkerExample-ImageMarkerExampleUITests/Pods-ImageMarkerExample-ImageMarkerExampleUITests.debug.xcconfig"; sourceTree = "<group>"; };
4240
5DCACB8F33CDC322A6C60F78 /* libPods-ImageMarkerExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ImageMarkerExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4341
6F2EF2314753552DE3ED8A96 /* libPods-ImageMarkerExample-ImageMarkerExampleUITests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ImageMarkerExample-ImageMarkerExampleUITests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4442
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = ImageMarkerExample/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -151,7 +149,6 @@
151149
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "ImageMarkerExample" */;
152150
buildPhases = (
153151
C38B50BA6285516D6DCD4F65 /* [CP] Check Pods Manifest.lock */,
154-
FD10A7F022414F080027D42C /* Start Packager */,
155152
13B07F871A680F5B00A75B9A /* Sources */,
156153
13B07F8C1A680F5B00A75B9A /* Frameworks */,
157154
13B07F8E1A680F5B00A75B9A /* Resources */,
@@ -246,23 +243,6 @@
246243
/* End PBXResourcesBuildPhase section */
247244

248245
/* Begin PBXShellScriptBuildPhase section */
249-
00D2AD9DAE49776B6A95E7C2 /* [CP] Copy Pods Resources */ = {
250-
isa = PBXShellScriptBuildPhase;
251-
buildActionMask = 2147483647;
252-
files = (
253-
);
254-
inputFileListPaths = (
255-
"${PODS_ROOT}/Target Support Files/Pods-ImageMarkerExample-ImageMarkerExampleUITests/Pods-ImageMarkerExample-ImageMarkerExampleUITests-resources-${CONFIGURATION}-input-files.xcfilelist",
256-
);
257-
name = "[CP] Copy Pods Resources";
258-
outputFileListPaths = (
259-
"${PODS_ROOT}/Target Support Files/Pods-ImageMarkerExample-ImageMarkerExampleUITests/Pods-ImageMarkerExample-ImageMarkerExampleUITests-resources-${CONFIGURATION}-output-files.xcfilelist",
260-
);
261-
runOnlyForDeploymentPostprocessing = 0;
262-
shellPath = /bin/sh;
263-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ImageMarkerExample-ImageMarkerExampleUITests/Pods-ImageMarkerExample-ImageMarkerExampleUITests-resources.sh\"\n";
264-
showEnvVarsInLog = 0;
265-
};
266246
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */ = {
267247
isa = PBXShellScriptBuildPhase;
268248
buildActionMask = 2147483647;
@@ -391,25 +371,6 @@
391371
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ImageMarkerExample-ImageMarkerExampleUITests/Pods-ImageMarkerExample-ImageMarkerExampleUITests-resources.sh\"\n";
392372
showEnvVarsInLog = 0;
393373
};
394-
FD10A7F022414F080027D42C /* Start Packager */ = {
395-
isa = PBXShellScriptBuildPhase;
396-
buildActionMask = 2147483647;
397-
files = (
398-
);
399-
inputFileListPaths = (
400-
);
401-
inputPaths = (
402-
);
403-
name = "Start Packager";
404-
outputFileListPaths = (
405-
);
406-
outputPaths = (
407-
);
408-
runOnlyForDeploymentPostprocessing = 0;
409-
shellPath = /bin/sh;
410-
shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../node_modules/react-native/scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n exit 2\n fi\n else\n open \"$SRCROOT/../node_modules/react-native/scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n fi\nfi\n";
411-
showEnvVarsInLog = 0;
412-
};
413374
/* End PBXShellScriptBuildPhase section */
414375

415376
/* Begin PBXSourcesBuildPhase section */

‎example/ios/Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ PODS:
946946
- React-debug
947947
- react-native-blob-util (0.19.6):
948948
- React-Core
949-
- react-native-image-marker (1.1.11):
949+
- react-native-image-marker (1.2.1):
950950
- React-Core
951951
- react-native-image-picker (5.7.0):
952952
- React-Core
@@ -1320,7 +1320,7 @@ EXTERNAL SOURCES:
13201320
:path: "../node_modules/react-native/ReactCommon/yoga"
13211321

13221322
SPEC CHECKSUMS:
1323-
boost: 26fad476bfa736552bbfa698a06cc530475c1505
1323+
boost: 69c3d61aee7f5f7facabe24312f0302003b5af29
13241324
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
13251325
DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
13261326
FBLazyVector: 2296bacb2fa157a43991048b0a9d71c1c8b65083
@@ -1360,7 +1360,7 @@ SPEC CHECKSUMS:
13601360
React-logger: e0c1e918d9588a9f39c9bc62d9d6bfe9ca238d9d
13611361
React-Mapbuffer: 9731a0a63ebaf8976014623c4d637744d7353a7c
13621362
react-native-blob-util: d8fa1a7f726867907a8e43163fdd8b441d4489ea
1363-
react-native-image-marker: d58c3e046b75e3302fd4f365cd7c32051badfef2
1363+
react-native-image-marker: c2352e04b9c5322c47154bd54430182889f4ebd3
13641364
react-native-image-picker: 3269f75c251cdcd61ab51b911dd30d6fff8c6169
13651365
React-nativeconfig: 37aecd26d64b79327c3f10e43b2e9a6c425e0a60
13661366
React-NativeModulesApple: 9ca6d2eaa1dd5606588262195b46d0774bdec83a
@@ -1385,6 +1385,6 @@ SPEC CHECKSUMS:
13851385
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
13861386
Yoga: 4f53dc50008d626fa679c7a1cb4bed898f8c0bde
13871387

1388-
PODFILE CHECKSUM: 8c3f9c33c24df0951c16c5461728b73f75674df3
1388+
PODFILE CHECKSUM: 2eb44bc264b7eac4758d0059314683cceb10a876
13891389

1390-
COCOAPODS: 1.12.1
1390+
COCOAPODS: 1.14.3

‎example/ios/scripts.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
export RCT_METRO_PORT="${RCT_METRO_PORT:=8081}"
2+
echo "export RCT_METRO_PORT=${RCT_METRO_PORT}" > "${SRCROOT}/../node_modules/react-native/scripts/.packager.env"
3+
if [ -z "${RCT_NO_LAUNCH_PACKAGER+xxx}" ] ; then
4+
if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then
5+
if ! curl -s "http://localhost:${RCT_METRO_PORT}/status" | grep -q "packager-status:running" ; then
6+
echo "Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly"
7+
exit 2
8+
fi
9+
else
10+
open "$SRCROOT/../node_modules/react-native/scripts/launchPackager.command" || echo "Can't start packager automatically"
11+
fi
12+
fi

‎example/package.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@
77
"ios": "react-native run-ios",
88
"start": "react-native start",
99
"pods": "pod-install",
10-
"m1-pods": "cd ios && arch -x86_64 pod install"
10+
"m1-pods": "cd ios && arch -x86_64 pod install",
11+
"postinstall": "patch-package"
1112
},
1213
"dependencies": {
1314
"@expo/react-native-action-sheet": "^4.0.1",
1415
"filesize": "^10.1.0",
16+
"patch-package": "^8.0.0",
17+
"postinstall-postinstall": "^2.1.0",
1518
"react": "18.2.0",
1619
"react-native": "0.73.1",
1720
"react-native-blob-util": "^0.19.2",
@@ -23,13 +26,13 @@
2326
"@babel/core": "^7.20.0",
2427
"@babel/preset-env": "^7.20.0",
2528
"@babel/runtime": "^7.20.0",
26-
"babel-plugin-module-resolver": "^4.1.0",
27-
"@react-native/typescript-config": "^0.73.1",
2829
"@react-native/babel-preset": "^0.73.18",
2930
"@react-native/eslint-config": "^0.73.1",
3031
"@react-native/metro-config": "^0.73.2",
32+
"@react-native/typescript-config": "^0.73.1",
3133
"@types/react": "^18.2.6",
32-
"typescript": "5.0.4",
33-
"prettier": "2.8.8"
34+
"babel-plugin-module-resolver": "^4.1.0",
35+
"prettier": "2.8.8",
36+
"typescript": "5.0.4"
3437
}
3538
}

‎example/patches/react-native+0.73.1.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/node_modules/react-native/third-party-podspecs/boost.podspec b/node_modules/react-native/third-party-podspecs/boost.podspec
2+
index 3950fce..7089b21 100644
3+
--- a/node_modules/react-native/third-party-podspecs/boost.podspec
4+
+++ b/node_modules/react-native/third-party-podspecs/boost.podspec
5+
@@ -10,7 +10,7 @@ Pod::Spec.new do |spec|
6+
spec.homepage = 'http://www.boost.org'
7+
spec.summary = 'Boost provides free peer-reviewed portable C++ source libraries.'
8+
spec.authors = 'Rene Rivera'
9+
- spec.source = { :http => 'https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.tar.bz2',
10+
+ spec.source = { :http => 'https://sourceforge.net/projects/boost/files/boost/1.83.0/boost_1_83_0.tar.bz2',
11+
:sha256 => '6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e' }
12+
13+
# Pinning to the same version as React.podspec.

‎package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"pod-install": "^0.1.0",
7777
"prettier": "^2.0.5",
7878
"react": "18.2.0",
79-
"react-native": "0.71.11",
79+
"react-native": "0.73.1",
8080
"react-native-builder-bob": "^0.20.0",
8181
"release-it": "^16.2.0",
8282
"typedoc": "^0.24.8",
@@ -167,5 +167,9 @@
167167
}
168168
]
169169
]
170+
},
171+
"dependencies": {
172+
"patch-package": "^8.0.0",
173+
"postinstall-postinstall": "^2.1.0"
170174
}
171175
}

0 commit comments

Comments
 (0)