4.2.0

yanue · Jul 6, 2024 · 2d5030e · 2d5030e
1 parent 3fcdf6a
commit 2d5030e
Show file tree

Hide file tree

Showing 21 changed files with 245 additions and 220 deletions.
diff --git a/Build/appdmg.sh b/Build/appdmg.sh
@@ -35,8 +35,6 @@ do
         echo "appdmg V2rayU-64.dmg"
         rm -f V2rayU-64.dmg
         appdmg appdmg.json "V2rayU-64.dmg"
-        #rm -fr release/V2rayU.app
-        ./sign_update "V2rayU-64.dmg"
 
         break
         ;;
@@ -48,8 +46,6 @@ do
         echo "appdmg V2rayU-arm64.dmg"
         rm -f V2rayU-arm64.dmg
         appdmg appdmg.json "V2rayU-arm64.dmg"
-                #rm -fr release/V2rayU.app
-        ./sign_update "V2rayU-64.dmg"
 
         break
         ;;

diff --git a/Build/build.plist b/Build/build.plist
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>  
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">  
-<plist version="1.0">  
-<dict>  
-    <key>compileBitcode</key>  
-    <false/>  
-    <key>method</key>  
-    <string>development</string>
-</dict>  
-</plist>  
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>method</key>
+	<dict/>
+	<key>development</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Build/publish.sh b/Build/publish.sh
diff --git a/Build/release.sh b/Build/release.sh
@@ -13,26 +13,60 @@ APP_TITLE="${APP_NAME} - V${APP_Version}"
 AppCastDir=$HOME/swift/appcast
 
 function updatePlistVersion() {
+    echo "Updating plist version..."
     buildString=$(/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" "${BASE_DIR}/V2rayU/${INFOPLIST_FILE}")
-    /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $buildString" "${BASE_DIR}/V2rayU/${INFOPLIST_FILE}"
+    if [ $? -eq 0 ]; then
+        /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $buildString" "${BASE_DIR}/V2rayU/${INFOPLIST_FILE}"
+        if [ $? -ne 0 ]; then
+            echo "Error: Failed to set CFBundleVersion"
+            exit 1
+        fi
+    else
+        echo "Error: Failed to read CFBundleShortVersionString"
+        exit 1
+    fi
 }
 
 function build() {
-    echo "Building V2rayU."${APP_Version}
+    echo "Building V2rayU version ${APP_Version}"
+
     echo "Cleaning up old archive & app..."
     rm -rf ${V2rayU_ARCHIVE} ${V2rayU_RELEASE}
+    if [ $? -ne 0 ]; then
+        echo "Error: Failed to clean up old archive & app"
+        exit 1
+    fi
 
     echo "Building archive... please wait a minute"
     xcodebuild -workspace ${BASE_DIR}/V2rayU.xcworkspace -config Release -scheme V2rayU -archivePath ${V2rayU_ARCHIVE} archive
+    if [ $? -ne 0 ]; then
+        echo "Error: Failed to build archive"
+        exit 1
+    fi
 
     echo "Exporting archive..."
     xcodebuild -archivePath ${V2rayU_ARCHIVE} -exportArchive -exportPath ${V2rayU_RELEASE} -exportOptionsPlist ./build.plist
+    if [ $? -ne 0 ]; then
+        echo "Error: Failed to export archive"
+        exit 1
+    fi
 
     echo "Cleaning up archive..."
     rm -rf ${V2rayU_ARCHIVE}
+    if [ $? -ne 0 ]; then
+        echo "Error: Failed to clean up archive"
+        exit 1
+    fi
 
+    echo "Setting permissions for resources..."
     chmod -R 755 "${V2rayU_RELEASE}/${APP_NAME}.app/Contents/Resources/v2ray-core"
     chmod -R 755 "${V2rayU_RELEASE}/${APP_NAME}.app/Contents/Resources/unzip.sh"
+    if [ $? -ne 0 ]; then
+        echo "Error: Failed to set permissions for resources"
+        exit 1
+    fi
+
+    echo "Build and export completed successfully."
 }
 
 function createDmg() {
@@ -209,9 +243,6 @@ function createDmgByAppdmg() {
     echo ${BUILD_DIR}/appdmg.json
     appdmg appdmg.json ${DMG_FINAL}
 
-    # appcast sign update
-    ${AppCastDir}/bin/sign_update ${DMG_FINAL}
-
 #    umount "/Volumes/${APP_NAME}"
 }
 
@@ -256,7 +287,7 @@ function makeDmg() {
 }
 
 
-
-
+#makeDmg
+createDmgByAppdmg
 
 echo 'done'
diff --git a/Build/sign.sh b/Build/sign.sh
diff --git a/Build/sign_update b/Build/sign_update
diff --git a/Podfile b/Podfile
@@ -10,8 +10,7 @@ target 'V2rayU' do
   # Pods for V2rayU
   pod 'FirebaseAnalytics', '~> 10.24.0'
   pod 'FirebaseCrashlytics'
-  pod 'Alamofire'
-  pod 'SwiftyJSON'
+  pod 'SwiftyJSON'/
   # master branch
   pod 'Preferences', :git => 'https://github.com/sindresorhus/Preferences.git'
   pod 'QRCoder'
@@ -21,11 +20,11 @@ target 'V2rayU' do
 
 end
 
-# fix libarclite_macosx.a need min deploy target 10.14
+# fix libarclite_macosx.a need min deploy target 11.0
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
-      config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '10.14'
+      config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '11.0'
     end
   end
 end
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,5 +1,4 @@
 PODS:
-  - Alamofire (4.8.2)
   - FirebaseAnalytics (10.24.0):
     - FirebaseAnalytics/AdIdSupport (= 10.24.0)
     - FirebaseCore (~> 10.0)
@@ -112,26 +111,22 @@ PODS:
   - PromisesSwift (2.4.0):
     - PromisesObjC (= 2.4.0)
   - QRCoder (1.1.0)
-  - Sparkle (2.6.2)
   - Swifter (1.4.7)
   - SwiftyJSON (5.0.0)
   - Yams (5.0.6)
 
 DEPENDENCIES:
-  - Alamofire
   - FirebaseAnalytics (~> 10.24.0)
   - FirebaseCrashlytics
   - MASShortcut
   - Preferences (from `https://github.com/sindresorhus/Preferences.git`)
   - QRCoder
-  - Sparkle (~> 2.0)
   - Swifter
   - SwiftyJSON
   - Yams
 
 SPEC REPOS:
   https://github.com/CocoaPods/Specs.git:
-    - Alamofire
     - FirebaseAnalytics
     - FirebaseCore
     - FirebaseCoreExtension
@@ -148,7 +143,6 @@ SPEC REPOS:
     - PromisesObjC
     - PromisesSwift
     - QRCoder
-    - Sparkle
     - Swifter
     - SwiftyJSON
     - Yams
@@ -163,7 +157,6 @@ CHECKOUT OPTIONS:
     :git: https://github.com/sindresorhus/Preferences.git
 
 SPEC CHECKSUMS:
-  Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
   FirebaseAnalytics: b5efc493eb0f40ec560b04a472e3e1a15d39ca13
   FirebaseCore: 11dc8a16dfb7c5e3c3f45ba0e191a33ac4f50894
   FirebaseCoreExtension: af5fd85e817ea9d19f9a2659a376cf9cf99f03c0
@@ -181,11 +174,10 @@ SPEC CHECKSUMS:
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
   QRCoder: cbd2bee531cc86d286df7942334cfed94c803ae4
-  Sparkle: a62c7dc4f410ced73beb2169cf1d3cc3f028a295
   Swifter: 2327ef5d872c638aebab79646ce494af508b0c8f
   SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
   Yams: e10dae147f517ed57ecae37c5e8681bdf8fcab65
 
-PODFILE CHECKSUM: 071aabe40b11d56fb50a9b83f6ed47079838bdee
+PODFILE CHECKSUM: d61ad825ad5d61b2b98237544e21946c9babe3a0
 
 COCOAPODS: 1.15.2