diff --git a/platform/ios/platform/macos/macos.xcodeproj/project.pbxproj b/platform/ios/platform/macos/macos.xcodeproj/project.pbxproj index ed885c8ee..05e15e11e 100644 --- a/platform/ios/platform/macos/macos.xcodeproj/project.pbxproj +++ b/platform/ios/platform/macos/macos.xcodeproj/project.pbxproj @@ -1541,6 +1541,7 @@ DA839E911CC2E3400062CAFB = { CreatedOnToolsVersion = 7.3; LastSwiftMigration = 0920; + ProvisioningStyle = Manual; }; DAAA17961CE13BAE00731EFE = { CreatedOnToolsVersion = 7.3.1; @@ -2097,12 +2098,16 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = app/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; OTHER_CFLAGS = "-fvisibility=hidden"; PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL; PRODUCT_NAME = "Mapbox GL"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.0; }; @@ -2114,12 +2119,17 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = ""; + "EXCLUDED_ARCHS[sdk=*]" = arm64; INFOPLIST_FILE = app/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; OTHER_CFLAGS = "-fvisibility=hidden"; PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL; PRODUCT_NAME = "Mapbox GL"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 4.0; }; name = Release; @@ -2181,12 +2191,13 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 15256; DYLIB_INSTALL_NAME_BASE = "@rpath"; + "EXCLUDED_ARCHS[sdk=*]" = arm64; FRAMEWORK_VERSION = A; INFOPLIST_FILE = sdk/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; LLVM_LTO = YES; - ONLY_ACTIVE_ARCH = YES; + ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-fvisibility=hidden"; PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.Mapbox; PRODUCT_NAME = Mapbox; diff --git a/platform/ios/platform/macos/scripts/deploy-packages.sh b/platform/ios/platform/macos/scripts/deploy-packages.sh index 60dcbe790..180543fdc 100755 --- a/platform/ios/platform/macos/scripts/deploy-packages.sh +++ b/platform/ios/platform/macos/scripts/deploy-packages.sh @@ -19,6 +19,8 @@ function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; } function finish { >&2 echo -en "\033[0m"; } trap finish EXIT +ENABLE_APP_PUBLISH=${ENABLE_APP_PUBLISH:-NO} + publish() { OPTRESET=1 OPTIND= @@ -139,6 +141,11 @@ if [[ "${GITHUB_RELEASE}" == true ]]; then fi publish -r xpackage -s symbols -publish -r "xpackage SYMBOLS=NO" -a true + +if [[ ${ENABLE_APP_PUBLISH} = "YES" ]]; then + publish -r "xpackage SYMBOLS=NO" -a true +else + publish -r "xpackage SYMBOLS=NO" +fi; step "Finished deploying ${PUBLISH_VERSION} in $(($SECONDS / 60)) minutes and $(($SECONDS % 60)) seconds" diff --git a/platform/ios/platform/macos/scripts/package.sh b/platform/ios/platform/macos/scripts/package.sh index fd853398a..627335ae0 100755 --- a/platform/ios/platform/macos/scripts/package.sh +++ b/platform/ios/platform/macos/scripts/package.sh @@ -8,6 +8,7 @@ NAME=Mapbox OUTPUT=build/macos/pkg APP_OUTPUT=build/macos/app DERIVED_DATA=build/macos +ENABLE_APP_PUBLISH=${ENABLE_APP_PUBLISH:-NO} BUILDTYPE=${BUILDTYPE:-Release} SYMBOLS=${SYMBOLS:-YES} @@ -87,7 +88,7 @@ function validate_dsym { fi } -if [[ ${BUILDTYPE} == Release ]]; then +if [[ ${BUILDTYPE} == Release && ${ENABLE_APP_PUBLISH} = "YES" ]]; then validate_dsym \ "${OUTPUT}/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" \ "${OUTPUT}/${NAME}.framework/${NAME}"