From ce01af1cd88458498321b4feaffc043ce38ca211 Mon Sep 17 00:00:00 2001 From: hiddify-com <114227601+hiddify-com@users.noreply.github.com> Date: Tue, 30 Jul 2024 18:38:46 +0200 Subject: [PATCH] fix: ios build issue --- .github/workflows/build.yml | 46 ++++++++++++++-------------- ios/Base.xcconfig | 2 +- ios/Runner.xcodeproj/project.pbxproj | 12 ++++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index caf5bb46..e8ee1843 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,28 +60,28 @@ jobs: fail-fast: false matrix: include: - # - platform: android-apk - # os: ubuntu-latest - # targets: apk + - platform: android-apk + os: ubuntu-latest + targets: apk - # - platform: android-aab - # os: ubuntu-latest - # targets: aab + - platform: android-aab + os: ubuntu-latest + targets: aab - # - platform: windows - # os: windows-2019 - # aarch: amd64 - # targets: exe,msix + - platform: windows + os: windows-2019 + aarch: amd64 + targets: exe,msix - # - platform: linux - # os: ubuntu-22.04 - # aarch: amd64 - # targets: AppImage,deb,rpm + - platform: linux + os: ubuntu-22.04 + aarch: amd64 + targets: AppImage,deb,rpm - # - platform: macos - # os: macos-13 - # aarch: universal - # targets: dmg,pkg + - platform: macos + os: macos-13 + aarch: universal + targets: dmg,pkg - platform: ios os: macos-14 @@ -104,10 +104,10 @@ jobs: if: ${{ inputs.upload-artifact && startsWith(matrix.os,'macos') }} run: | mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles - echo "${{secrets.NEW_APPLE_MOBILE_PROVISIONING_PROFILES_TARXZ_BASE64}}"|base64 --decode | tar xJ -C ~/Library/MobileDevice/Provisioning\ Profiles - ls ~/Library/MobileDevice/Provisioning\ Profiles + echo "${{secrets.APPLE_DEVLOP_PROVISIONING_PROFILES_TARGZ_BASE64}}"|base64 --decode | tar xz -C ~/Library/MobileDevice/Provisioning\ Profiles + # ls ~/Library/MobileDevice/Provisioning\ Profiles + # echo "${{secrets.NEW_APPLE_MOBILE_PROVISIONING_PROFILES_TARXZ_BASE64}}"|base64 --decode | tar xJ -C ~/Library/MobileDevice/Provisioning\ Profiles # # echo "${{secrets.NEW_APPLE_MOBILE_PROVISIONING_PROFILES_TARGZ_BASE64_2}}"|base64 --decode | tar xz -C ~/Library/MobileDevice/Provisioning\ Profiles - # # echo "${{secrets.APPLE_DEVLOP_PROVISIONING_PROFILES_TARGZ_BASE64}}"|base64 --decode | tar xz -C ~/Library/MobileDevice/Provisioning\ Profiles @@ -416,8 +416,8 @@ jobs: - name: Import Apple Mobile Provisioning Profile run: | mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles - #echo "${{secrets.APPLE_DIST_PROVISIONING_PROFILES_TARGZ_BASE64}}"|base64 --decode | tar xz -C ~/Library/MobileDevice/Provisioning\ Profiles - echo "${{secrets.NEW_APPLE_STORE_PROVISIONING_PROFILES_TARXZ_BASE64}}"|base64 --decode | tar xJ -C ~/Library/MobileDevice/Provisioning\ Profiles + echo "${{secrets.APPLE_DIST_PROVISIONING_PROFILES_TARGZ_BASE64}}"|base64 --decode | tar xz -C ~/Library/MobileDevice/Provisioning\ Profiles + #echo "${{secrets.NEW_APPLE_STORE_PROVISIONING_PROFILES_TARXZ_BASE64}}"|base64 --decode | tar xJ -C ~/Library/MobileDevice/Provisioning\ Profiles - uses: Apple-Actions/upload-testflight-build@v1 with: diff --git a/ios/Base.xcconfig b/ios/Base.xcconfig index 0cb0924a..9ff3f337 100644 --- a/ios/Base.xcconfig +++ b/ios/Base.xcconfig @@ -5,6 +5,6 @@ // Created by GFWFighter on 7/24/1402 AP. // -BASE_BUNDLE_IDENTIFIER=com.hiddify.apple +BASE_BUNDLE_IDENTIFIER=app.hiddify.com SERVICE_IDENTIFIER=com.hiddify.app DEVELOPMENT_TEAM=3JFTY5BP58 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 21167e8c..0c2f608e 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -799,7 +799,7 @@ MTL_FAST_MATH = YES; OTHER_LDFLAGS = "-lresolv"; PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER).SingBoxPacketTunnel"; - "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = com.hiddify.apple.SingBoxPacketTunnel; + "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = app.hiddify.com.SingBoxPacketTunnel; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -850,7 +850,7 @@ ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-lresolv"; PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER).SingBoxPacketTunnel"; - "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = com.hiddify.apple.SingBoxPacketTunnel; + "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = app.hiddify.com.SingBoxPacketTunnel; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -899,7 +899,7 @@ ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-lresolv"; PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER).SingBoxPacketTunnel"; - "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = com.hiddify.apple.SingBoxPacketTunnel; + "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = app.hiddify.com.SingBoxPacketTunnel; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1006,7 +1006,7 @@ "-lresolv", ); PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; - "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = com.hiddify.apple; + "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = app.hiddify.com; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -1226,7 +1226,7 @@ "-lresolv", ); PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; - "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = com.hiddify.apple; + "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = app.hiddify.com; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -1275,7 +1275,7 @@ "-lresolv", ); PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; - "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = com.hiddify.apple; + "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = app.hiddify.com; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO;