diff --git a/Build/release.sh b/Build/release.sh index 3cc93f7..e57ced0 100755 --- a/Build/release.sh +++ b/Build/release.sh @@ -7,7 +7,7 @@ BASE_DIR=$HOME/swift/V2rayU BUILD_DIR=${BASE_DIR}/Build V2rayU_ARCHIVE=${BUILD_DIR}/V2rayU.xcarchive V2rayU_RELEASE=${BUILD_DIR}/release -APP_Version=$(/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" "${BASE_DIR}/${APP_NAME}/${INFOPLIST_FILE}") +APP_Version=$(sed -n '/MARKETING_VERSION/{s/MARKETING_VERSION = //;s/;//;s/^[[:space:]]*//;p;q;}' ../V2rayU.xcodeproj/project.pbxproj) DMG_FINAL="${APP_NAME}.dmg" APP_TITLE="${APP_NAME} - V${APP_Version}" AppCastDir=$HOME/swift/appcast diff --git a/Podfile.lock b/Podfile.lock index ac26cb8..2241c90 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -11,7 +11,7 @@ PODS: DEPENDENCIES: - Alamofire - - GCDWebServer (~> 3.5.2) + - GCDWebServer (~> 3.5.3) - Preferences (from `https://github.com/sindresorhus/Preferences.git`) - QRCoder - Sparkle @@ -50,6 +50,6 @@ SPEC CHECKSUMS: SwiftSocket: 2f7a7e26a7489f5f33b69da914ec366368dfcbcc SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7 -PODFILE CHECKSUM: d63885d0265a509a07d6c2f6d28b86787d3d028c +PODFILE CHECKSUM: e6f88c43f5f4e8c624a2b2a1f5c31464053eefe8 COCOAPODS: 1.8.1 diff --git a/V2rayU.xcodeproj/project.pbxproj b/V2rayU.xcodeproj/project.pbxproj index 70a143e..7728a59 100644 --- a/V2rayU.xcodeproj/project.pbxproj +++ b/V2rayU.xcodeproj/project.pbxproj @@ -982,12 +982,14 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1.5.0; DEVELOPMENT_TEAM = RJYEH6TCJD; INFOPLIST_FILE = V2rayU/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); + MARKETING_VERSION = 1.5.0; PRODUCT_BUNDLE_IDENTIFIER = net.yanue.V2rayU; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1006,12 +1008,14 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1.5.0; DEVELOPMENT_TEAM = RJYEH6TCJD; INFOPLIST_FILE = V2rayU/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); + MARKETING_VERSION = 1.5.0; PRODUCT_BUNDLE_IDENTIFIER = net.yanue.V2rayU; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/V2rayU/Info.plist b/V2rayU/Info.plist index 63c5c71..405454f 100644 --- a/V2rayU/Info.plist +++ b/V2rayU/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.4.1 + $(MARKETING_VERSION) CFBundleURLTypes @@ -34,13 +34,18 @@ CFBundleVersion - 1.4.1 + $(MARKETING_VERSION) LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) LSUIElement + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + NSHumanReadableCopyright Copyright © 2019 yanue. All rights reserved. NSMainNibFile @@ -51,10 +56,5 @@ https://gitee.com/yanue/appcast/raw/master/appcast.xml SUPublicEDKey PW8pDnr5VZkmC93gZjUDlHI8gkJSspPoDU3DdhsMkps - NSAppTransportSecurity - - NSAllowsArbitraryLoads - -