Skip to content

Commit 99c322d

Browse files
DjDeveloperrDjDeveloperr
committed
refactor(platforms): move Apple files under platforms/apple
1 parent ddb70f3 commit 99c322d

561 files changed

Lines changed: 69 additions & 66 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ v8_build
5454
.cipd/
5555

5656
# project template
57-
/templates/ios/.build_env_vars.sh
58-
/templates/ios/__PROJECT_NAME__.xcodeproj/project.xcworkspace/xcshareddata/
59-
/templates/visionos/.build_env_vars.sh
60-
/templates/visionos/__PROJECT_NAME__.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
57+
/platforms/apple/templates/ios/.build_env_vars.sh
58+
/platforms/apple/templates/ios/__PROJECT_NAME__.xcodeproj/project.xcworkspace/xcshareddata/
59+
/platforms/apple/templates/visionos/.build_env_vars.sh
60+
/platforms/apple/templates/visionos/__PROJECT_NAME__.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
6161

6262
.cache/
6363

‎README.md‎

Lines changed: 1 addition & 2 deletions

‎metadata-generator/README.md‎

Lines changed: 1 addition & 1 deletion

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"workspaces": [
2020
"packages/*",
21-
"examples",
21+
"platforms/apple/examples",
2222
"scripts"
2323
],
2424
"scripts": {
@@ -54,7 +54,7 @@
5454
"nsr": "./dist/nsr",
5555
"test:macos": "node ./scripts/run-tests-macos.js ./build/test-results/macos-junit.xml",
5656
"test:ios": "node ./scripts/run-tests-ios.js",
57-
"benchmark:objc-dispatch": "node ./benchmarks/objc-dispatch/run.js"
57+
"benchmark:objc-dispatch": "node ./platforms/apple/benchmarks/objc-dispatch/run.js"
5858
},
5959
"license": "Apache-2.0",
6060
"devDependencies": {
@@ -65,7 +65,7 @@
6565
"semver": "^7.5.0"
6666
},
6767
"lint-staged": {
68-
"{NativeScript,metadata-generator/src,test/runtime/fixtures}/**/*.{h,hpp,c,cpp,mm,m}": [
68+
"{NativeScript,metadata-generator/src,platforms/apple/test/runtime/fixtures}/**/*.{h,hpp,c,cpp,mm,m}": [
6969
"clang-format -i"
7070
]
7171
}

‎packages/macos-node-api/README.md‎

Lines changed: 1 addition & 1 deletion

‎packages/macos-node-api/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"types"
2020
],
2121
"scripts": {
22-
"test": "node ../../examples/foundation.js",
22+
"test": "node ../../platforms/apple/examples/foundation.js",
2323
"build": "cd ../.. && ./scripts/build_all_react_native.sh"
2424
},
2525
"keywords": [

NativeScriptRuntime.xcodeproj/project.pbxproj renamed to platforms/apple/NativeScriptRuntime.xcodeproj/project.pbxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
221E266E2EDCF1B40095699D /* libTestFixtures.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libTestFixtures.a; sourceTree = BUILT_PRODUCTS_DIR; };
6161
221E26C62EDCF22B0095699D /* TKLiveSync.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TKLiveSync.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6262
228CA10D2EB9350000A4EC63 /* TestRunner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestRunner.app; sourceTree = BUILT_PRODUCTS_DIR; };
63-
228CA3702EB9365C00A4EC63 /* NativeScript.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = NativeScript.xcframework; path = dist/NativeScript.xcframework; sourceTree = "<group>"; };
64-
228CA3742EB9377D00A4EC63 /* TKLiveSync.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = TKLiveSync.xcframework; path = dist/TKLiveSync.xcframework; sourceTree = "<group>"; };
63+
228CA3702EB9365C00A4EC63 /* NativeScript.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = NativeScript.xcframework; path = ../../dist/NativeScript.xcframework; sourceTree = "<group>"; };
64+
228CA3742EB9377D00A4EC63 /* TKLiveSync.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = TKLiveSync.xcframework; path = ../../dist/TKLiveSync.xcframework; sourceTree = "<group>"; };
6565
228CA7A42EB9387900A4EC63 /* app */ = {isa = PBXFileReference; lastKnownFileType = folder; name = app; path = test/runtime/runner/app; sourceTree = "<group>"; };
6666
/* End PBXFileReference section */
6767

@@ -312,14 +312,14 @@
312312
isa = PBXFileSystemSynchronizedRootGroup;
313313
exceptions = (
314314
);
315-
path = "metadata-generator";
315+
path = "../../metadata-generator";
316316
sourceTree = "<group>";
317317
};
318318
22D453EB2E23F21F00E2B467 /* NativeScript */ = {
319319
isa = PBXFileSystemSynchronizedRootGroup;
320320
exceptions = (
321321
);
322-
path = NativeScript;
322+
path = ../../NativeScript;
323323
sourceTree = "<group>";
324324
};
325325
/* End PBXFileSystemSynchronizedRootGroup section */
@@ -543,7 +543,7 @@
543543
);
544544
runOnlyForDeploymentPostprocessing = 0;
545545
shellPath = /bin/sh;
546-
shellScript = "cd ${PROJECT_DIR}/metadata-generator/dist/arm64/bin\ncp ../../../build-step-metadata-generator.py .\n./build-step-metadata-generator.py\n\nplatformTag=\"ios\"\nif [ \"$PLATFORM_NAME\" = \"macosx\" ]; then\n platformTag=\"macos\"\nelif [ \"$PLATFORM_NAME\" = \"iphonesimulator\" ]; then\n platformTag=\"ios-sim\"\nfi\n\narchList=\"$VALID_ARCHS\"\nif [ -z \"$archList\" ]; then\n archList=\"$ARCHS\"\nfi\n\nfor arch in $archList\ndo\n outputPath=\"$CONFIGURATION_BUILD_DIR/metadata-$arch.bin\"\n if [ -s \"$outputPath\" ]; then\n echo \"keeping generated $outputPath\"\n continue\n fi\n\n sourcePath=\"../../../metadata/metadata.$platformTag.$arch.nsmd\"\n if [ -f \"$sourcePath\" ]; then\n echo \"copying fallback $sourcePath -> $outputPath\"\n cp \"$sourcePath\" \"$outputPath\"\n else\n echo \"creating empty $outputPath (missing $sourcePath)\"\n : > \"$outputPath\"\n fi\ndone\n";
546+
shellScript = "cd ${PROJECT_DIR}/../../metadata-generator/dist/arm64/bin\ncp ../../../build-step-metadata-generator.py .\n./build-step-metadata-generator.py\n\nplatformTag=\"ios\"\nif [ \"$PLATFORM_NAME\" = \"macosx\" ]; then\n platformTag=\"macos\"\nelif [ \"$PLATFORM_NAME\" = \"iphonesimulator\" ]; then\n platformTag=\"ios-sim\"\nfi\n\narchList=\"$VALID_ARCHS\"\nif [ -z \"$archList\" ]; then\n archList=\"$ARCHS\"\nfi\n\nfor arch in $archList\ndo\n outputPath=\"$CONFIGURATION_BUILD_DIR/metadata-$arch.bin\"\n if [ -s \"$outputPath\" ]; then\n echo \"keeping generated $outputPath\"\n continue\n fi\n\n sourcePath=\"../../../metadata/metadata.$platformTag.$arch.nsmd\"\n if [ -f \"$sourcePath\" ]; then\n echo \"copying fallback $sourcePath -> $outputPath\"\n cp \"$sourcePath\" \"$outputPath\"\n else\n echo \"creating empty $outputPath (missing $sourcePath)\"\n : > \"$outputPath\"\n fi\ndone\n";
547547
};
548548
/* End PBXShellScriptBuildPhase section */
549549

@@ -1007,7 +1007,7 @@
10071007
GENERATE_INFOPLIST_FILE = YES;
10081008
HEADER_SEARCH_PATHS = (
10091009
"$(SRCROOT)/test/runtime/fixtures",
1010-
"$(SRCROOT)/NativeScript",
1010+
"$(SRCROOT)/../../NativeScript",
10111011
);
10121012
INFOPLIST_FILE = test/runtime/runner/Info.plist;
10131013
INFOPLIST_KEY_NSAppleMusicUsageDescription = "Listen Music";
@@ -1114,7 +1114,7 @@
11141114
GENERATE_INFOPLIST_FILE = YES;
11151115
HEADER_SEARCH_PATHS = (
11161116
"$(SRCROOT)/test/runtime/fixtures",
1117-
"$(SRCROOT)/NativeScript",
1117+
"$(SRCROOT)/../../NativeScript",
11181118
);
11191119
INFOPLIST_FILE = test/runtime/runner/Info.plist;
11201120
INFOPLIST_KEY_NSAppleMusicUsageDescription = "Listen Music";

NativeScriptRuntime.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to platforms/apple/NativeScriptRuntime.xcodeproj/project.xcworkspace/contents.xcworkspacedata

File renamed without changes.

TKLiveSync/Info.plist renamed to platforms/apple/TKLiveSync/Info.plist

File renamed without changes.

TKLiveSync/TKLiveSync.h renamed to platforms/apple/TKLiveSync/TKLiveSync.h

File renamed without changes.

0 commit comments

Comments
 (0)