From 5d493aafc0ceaf8c515976af7f8cd9997312afc7 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Wed, 4 Dec 2024 21:52:58 +0800 Subject: [PATCH] Fix the bug that the demo Xcode project fails to build because of the "concatenated project name" approach, introduced in commit 902b9318795f1b6088f0591231bd90eb302a9b35 --- .github/workflows/demo-gh-pages.yml | 2 +- demo/iosApp/iosApp.xcodeproj/project.pbxproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/demo-gh-pages.yml b/.github/workflows/demo-gh-pages.yml index dbbaa62b..5d7e2b77 100644 --- a/.github/workflows/demo-gh-pages.yml +++ b/.github/workflows/demo-gh-pages.yml @@ -41,7 +41,7 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Build the distribution with Gradle Wrapper - run: ./gradlew :demo:sideBySideBrowserDistribution + run: ./gradlew :compose-multiplatform-html-unified-demo:sideBySideBrowserDistribution - name: Upload artifact uses: actions/upload-pages-artifact@v3 diff --git a/demo/iosApp/iosApp.xcodeproj/project.pbxproj b/demo/iosApp/iosApp.xcodeproj/project.pbxproj index 7a56ed44..6c2151c2 100644 --- a/demo/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/demo/iosApp/iosApp.xcodeproj/project.pbxproj @@ -175,7 +175,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ \"YES\" = \"$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED\" ]; then\n echo \"Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \\\"YES\\\"\"\n exit 0\nfi\ncd \"$SRCROOT/../..\"\n./gradlew :demo:embedAndSignAppleFrameworkForXcode\n"; + shellScript = "if [ \"YES\" = \"$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED\" ]; then\n echo \"Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \\\"YES\\\"\"\n exit 0\nfi\ncd \"$SRCROOT/../..\"\n./gradlew :compose-multiplatform-html-unified-demo:embedAndSignAppleFrameworkForXcode\n"; }; /* End PBXShellScriptBuildPhase section */