vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 1 Wiki Activity

fix: ios build issue

Browse Source
This commit is contained in:
hiddify-com
2024-07-30 18:38:46 +02:00
parent 9e374b168f
commit ce01af1cd8
3 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
.github/workflows/build.yml vendored
View File

@@ -60,28 +60,28 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
# - platform: android-apk - platform: android-apk
# os: ubuntu-latest os: ubuntu-latest
# targets: apk targets: apk
# - platform: android-aab - platform: android-aab
# os: ubuntu-latest os: ubuntu-latest
# targets: aab targets: aab
# - platform: windows - platform: windows
# os: windows-2019 os: windows-2019
# aarch: amd64 aarch: amd64
# targets: exe,msix targets: exe,msix
# - platform: linux - platform: linux
# os: ubuntu-22.04 os: ubuntu-22.04
# aarch: amd64 aarch: amd64
# targets: AppImage,deb,rpm targets: AppImage,deb,rpm
# - platform: macos - platform: macos
# os: macos-13 os: macos-13
# aarch: universal aarch: universal
# targets: dmg,pkg targets: dmg,pkg
- platform: ios - platform: ios
os: macos-14 os: macos-14
@@ -104,10 +104,10 @@ jobs:
if: ${{ inputs.upload-artifact && startsWith(matrix.os,'macos') }} if: ${{ inputs.upload-artifact && startsWith(matrix.os,'macos') }}
run: | run: |
mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
echo "${{secrets.NEW_APPLE_MOBILE_PROVISIONING_PROFILES_TARXZ_BASE64}}"|base64 --decode | tar xJ -C ~/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 # 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.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 - name: Import Apple Mobile Provisioning Profile
run: | run: |
mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles 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.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.NEW_APPLE_STORE_PROVISIONING_PROFILES_TARXZ_BASE64}}"|base64 --decode | tar xJ -C ~/Library/MobileDevice/Provisioning\ Profiles
- uses: Apple-Actions/upload-testflight-build@v1 - uses: Apple-Actions/upload-testflight-build@v1
with: with:

2
ios/Base.xcconfig
View File

@@ -5,6 +5,6 @@
// Created by GFWFighter on 7/24/1402 AP. // 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 SERVICE_IDENTIFIER=com.hiddify.app
DEVELOPMENT_TEAM=3JFTY5BP58 DEVELOPMENT_TEAM=3JFTY5BP58

12
ios/Runner.xcodeproj/project.pbxproj
View File

@@ -799,7 +799,7 @@
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-lresolv"; OTHER_LDFLAGS = "-lresolv";
PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER).SingBoxPacketTunnel"; 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)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -850,7 +850,7 @@
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "-lresolv"; OTHER_LDFLAGS = "-lresolv";
PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER).SingBoxPacketTunnel"; 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)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -899,7 +899,7 @@
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "-lresolv"; OTHER_LDFLAGS = "-lresolv";
PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER).SingBoxPacketTunnel"; 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)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1006,7 +1006,7 @@
"-lresolv", "-lresolv",
); );
PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; 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)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO; SUPPORTS_MACCATALYST = NO;
@@ -1226,7 +1226,7 @@
"-lresolv", "-lresolv",
); );
PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; 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)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO; SUPPORTS_MACCATALYST = NO;
@@ -1275,7 +1275,7 @@
"-lresolv", "-lresolv",
); );
PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; 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)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO; SUPPORTS_MACCATALYST = NO;