Update examples for hostingBundle option

FPT-TrongND11 · Dec 4, 2021 · ba3839d · ba3839d
1 parent 19afe0f
commit ba3839d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 130 deletions.
diff --git a/...les/RswiftAppWithStaticFrameworks/RswiftAppWithStaticFrameworks.xcodeproj/project.pbxproj b/...les/RswiftAppWithStaticFrameworks/RswiftAppWithStaticFrameworks.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -438,13 +438,13 @@
 /* Begin PBXShellScriptBuildPhase section */
 		0B3751134FEE9BB94D60B6B8 /* R.swift */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"$(TEMP_DIR)/rswift-lastrun",
 			);
 			name = R.swift;
 			outputFileListPaths = (
@@ -454,7 +454,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export HOSTING_BUNDLE_NAME=${PRODUCT_NAME}\nexport TARGET_NAME=${PRODUCT_NAME}Bundle\n\"$SRCROOT/../../.build/debug/rswift\" generate \"$SRCROOT/Bar/Sources/R.generated.swift\" > \"$SRCROOT/rswift.log\"\n";
+			shellScript = "\"$SRCROOT/../../build/Debug/rswift\" generate \"$SRCROOT/Bar/Sources/R.generated.swift\"  --hostingBundle ${PRODUCT_NAME} --target ${PRODUCT_NAME}Bundle\n";
 		};
 		4213D882A02A85E88A6D8CA9 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -519,13 +519,13 @@
 		};
 		77448D795985C19AF55A5F1F /* R.swift */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"$(TEMP_DIR)/rswift-lastrun",
 			);
 			name = R.swift;
 			outputFileListPaths = (
@@ -535,7 +535,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export HOSTING_BUNDLE_NAME=${PRODUCT_NAME}\nexport TARGET_NAME=${PRODUCT_NAME}Bundle\n\"$SRCROOT/../../.build/debug/rswift\" generate \"$SRCROOT/Foo/Sources/R.generated.swift\" > \"$SRCROOT/rswift.log\"\n";
+			shellScript = "\"$SRCROOT/../../build/Debug/rswift\" generate \"$SRCROOT/Foo/Sources/R.generated.swift\" --hostingBundle ${PRODUCT_NAME} --target ${PRODUCT_NAME}Bundle\n";
 		};
 		795DD9FA56EF642DB2307F41 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -561,6 +561,7 @@
 		};
 		7F553EDAB894541615C8EB2C /* Copy Bundles */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);

diff --git a/Examples/RswiftAppWithStaticFrameworks/project.yml b/Examples/RswiftAppWithStaticFrameworks/project.yml
diff --git a/...pp/RwatchApp.xcodeproj/xcshareddata/xcschemes/ResourceApp-watchOS (Notification).xcscheme b/...pp/RwatchApp.xcodeproj/xcshareddata/xcschemes/ResourceApp-watchOS (Notification).xcscheme
@@ -41,18 +41,16 @@
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
       launchAutomaticallySubstyle = "8">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/ResourceApp">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "2F5FBC142135561200A83A69"
             BuildableName = "ResourceApp-watchOS.app"
             BlueprintName = "ResourceApp-watchOS"
             ReferencedContainer = "container:RwatchApp.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -61,27 +59,16 @@
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
       launchAutomaticallySubstyle = "8">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/ResourceApp">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "2F5FBC142135561200A83A69"
             BuildableName = "ResourceApp-watchOS.app"
             BlueprintName = "ResourceApp-watchOS"
             ReferencedContainer = "container:RwatchApp.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "2F5FBC142135561200A83A69"
-            BuildableName = "ResourceApp-watchOS.app"
-            BlueprintName = "ResourceApp-watchOS"
-            ReferencedContainer = "container:RwatchApp.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/Examples/RwatchApp/RwatchApp.xcodeproj/xcshareddata/xcschemes/ResourceApp-watchOS.xcscheme b/Examples/RwatchApp/RwatchApp.xcodeproj/xcshareddata/xcschemes/ResourceApp-watchOS.xcscheme
@@ -41,46 +41,33 @@
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
       notificationPayloadFile = "ResourceApp-watchOS-Extension/PushNotificationPayload.apns">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/ResourceApp">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "2F5FBC142135561200A83A69"
             BuildableName = "ResourceApp-watchOS.app"
             BlueprintName = "ResourceApp-watchOS"
             ReferencedContainer = "container:RwatchApp.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/ResourceApp">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "2F5FBC142135561200A83A69"
             BuildableName = "ResourceApp-watchOS.app"
             BlueprintName = "ResourceApp-watchOS"
             ReferencedContainer = "container:RwatchApp.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "2F5FBC142135561200A83A69"
-            BuildableName = "ResourceApp-watchOS.app"
-            BlueprintName = "ResourceApp-watchOS"
-            ReferencedContainer = "container:RwatchApp.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">