Skip to content
This repository has been archived by the owner on Oct 4, 2024. It is now read-only.

Commit

Permalink
fix: missing && in makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
@ricardobrg
ricardobrg committed Oct 18, 2023
1 parent 4a2742a commit a2df4d5
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 37 deletions.
64 changes: 32 additions & 32 deletions example/vue2/ios/App/App.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,18 @@
objects = {

/* Begin PBXBuildFile section */
2F2F19247281CA87FFA5FC10 /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA7CB137CB38B3979413404A /* Pods_App.framework */; };
2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; };
50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; };
504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; };
504EC30D1FED79650016851F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30B1FED79650016851F /* Main.storyboard */; };
504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; };
504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; };
50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; };
E4E5024D2579EAC521E8D0D8 /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6BA32F966DEB60C35333DA7 /* Pods_App.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
2FAD9762203C412B000D30F8 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = "<group>"; };
4DEC218A73E6AD413A431218 /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = "<group>"; };
504EC3041FED79650016851F /* App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; };
504EC3071FED79650016851F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -28,16 +27,17 @@
504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
A4C02A64FDDEF59F6786A0BA /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
AA7CB137CB38B3979413404A /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
568281453A76810A1FC6AD9A /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
B6BA32F966DEB60C35333DA7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C4FBEFD13D5AA4DB3173433D /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
504EC3011FED79650016851F /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
2F2F19247281CA87FFA5FC10 /* Pods_App.framework in Frameworks */,
E4E5024D2579EAC521E8D0D8 /* Pods_App.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -49,8 +49,8 @@
children = (
504EC3061FED79650016851F /* App */,
504EC3051FED79650016851F /* Products */,
D14F9ED3BAA0525FAC377155 /* Pods */,
885466630CB0850C47639EB7 /* Frameworks */,
C0A8645BD60FBB5580CCD625 /* Pods */,
F02A3D7C5F31281E05AADBE3 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand All @@ -77,22 +77,22 @@
path = App;
sourceTree = "<group>";
};
885466630CB0850C47639EB7 /* Frameworks */ = {
C0A8645BD60FBB5580CCD625 /* Pods */ = {
isa = PBXGroup;
children = (
AA7CB137CB38B3979413404A /* Pods_App.framework */,
C4FBEFD13D5AA4DB3173433D /* Pods-App.debug.xcconfig */,
568281453A76810A1FC6AD9A /* Pods-App.release.xcconfig */,
);
name = Frameworks;
name = Pods;
path = Pods;
sourceTree = "<group>";
};
D14F9ED3BAA0525FAC377155 /* Pods */ = {
F02A3D7C5F31281E05AADBE3 /* Frameworks */ = {
isa = PBXGroup;
children = (
4DEC218A73E6AD413A431218 /* Pods-App.debug.xcconfig */,
A4C02A64FDDEF59F6786A0BA /* Pods-App.release.xcconfig */,
B6BA32F966DEB60C35333DA7 /* Pods_App.framework */,
);
name = Pods;
path = Pods;
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand All @@ -102,11 +102,11 @@
isa = PBXNativeTarget;
buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */;
buildPhases = (
085FBC45B2329240D8C19897 /* [CP] Check Pods Manifest.lock */,
9A7B00240E3692B9D7D8B7B1 /* [CP] Check Pods Manifest.lock */,
504EC3001FED79650016851F /* Sources */,
504EC3011FED79650016851F /* Frameworks */,
504EC3021FED79650016851F /* Resources */,
DB1CB402EB6BBB06B1B396B8 /* [CP] Embed Pods Frameworks */,
520A4ADEA6D9F05D8FE9CE7B /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -168,41 +168,41 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
085FBC45B2329240D8C19897 /* [CP] Check Pods Manifest.lock */ = {
520A4ADEA6D9F05D8FE9CE7B /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
DB1CB402EB6BBB06B1B396B8 /* [CP] Embed Pods Frameworks */ = {
9A7B00240E3692B9D7D8B7B1 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -347,7 +347,7 @@
};
504EC3171FED79650016851F /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 4DEC218A73E6AD413A431218 /* Pods-App.debug.xcconfig */;
baseConfigurationReference = C4FBEFD13D5AA4DB3173433D /* Pods-App.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
Expand All @@ -368,7 +368,7 @@
};
504EC3181FED79650016851F /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = A4C02A64FDDEF59F6786A0BA /* Pods-App.release.xcconfig */;
baseConfigurationReference = 568281453A76810A1FC6AD9A /* Pods-App.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
Expand Down
2 changes: 1 addition & 1 deletion example/vue2/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ vue3-example-android: vue3-example
cd example/vue3 && npx cap run android

vue3-example-ios: vue3-example
cd example/vue3/ios/App pod deintegrate
cd example/vue3/ios/App pod install --repo-update
cd example/vue3/ios/App && pod deintegrate
cd example/vue3/ios/App && pod install --repo-update
cd example/vue3 && npx cap run ios

vue2: clean
Expand All @@ -42,8 +42,8 @@ vue2-example-android: vue2-example
cd example/vue2 && npx cap run android

vue2-example-ios: vue2-example
cd example/vue2/ios/App pod deintegrate
cd example/vue2/ios/App pod install --repo-update
cd example/vue2/ios/App && pod deintegrate
cd example/vue2/ios/App && pod install --repo-update
cd example/vue2 && npx cap run ios

clean:
Expand Down

0 comments on commit a2df4d5

Please sign in to comment.