update version: 2.0.0

yanue · Feb 9, 2020 · dee21f5 · dee21f5
1 parent 381be18
commit dee21f5
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 146 deletions.
diff --git a/Build/V2rayU.icns b/Build/V2rayU.icns
diff --git a/Build/appdmg.json b/Build/appdmg.json
@@ -0,0 +1,26 @@
+{
+  "title": "V2rayU Installer",
+  "icon": "V2rayU.icns",
+  "icon-size": 80,
+  "background": "[email protected]",
+  "window": {
+    "size": {
+      "width": 500,
+      "height": 292
+    }
+  },
+  "contents": [
+    {
+      "x": 380,
+      "y": 120,
+      "type": "link",
+      "path": "/Applications"
+    },
+    {
+      "x": 120,
+      "y": 120,
+      "type": "file",
+      "path": "V2rayU.app"
+    }
+  ]
+}
diff --git a/Build/[email protected] b/Build/[email protected]
diff --git a/Build/pac/abp.js b/Build/pac/abp.js
diff --git a/Build/pac/gfwlist.txt b/Build/pac/gfwlist.txt
diff --git a/Build/pac/user-rule.txt b/Build/pac/user-rule.txt
diff --git a/Build/release.sh b/Build/release.sh
@@ -178,6 +178,22 @@ function downloadV2ray() {
     rm -fr v2ray-macos.zip
 }
 
+function createDmgByAppdmg() {
+    umount "/Volumes/${APP_NAME}"
+
+    rm -rf ${BUILD_DIR}/${APP_NAME}.app ${BUILD_DIR}/${DMG_FINAL}
+    \cp -Rf "${V2rayU_RELEASE}/${APP_NAME}.app" "${BUILD_DIR}/${APP_NAME}.app"
+
+    # https://github.com/LinusU/node-appdmg
+    # npm install -g appdmg
+    echo ${BUILD_DIR}/appdmg.json
+    appdmg appdmg.json ${DMG_FINAL}
+
+    # appcast sign update
+    ${AppCastDir}/bin/sign_update ${DMG_FINAL}
+
+    umount "/Volumes/${APP_NAME}"
+}
 
 function makeDmg() {
     echo "正在打包版本: V"${APP_Version}
@@ -199,7 +215,7 @@ function makeDmg() {
     updatePlistVersion
     downloadV2ray
     build
-    createDmg
+    createDmgByAppdmg
 }
 
 function publish() {

diff --git a/Build/sketch/bg.sketch b/Build/sketch/bg.sketch
diff --git a/Build/sketch/icns.sketch b/Build/sketch/icns.sketch
diff --git a/Build/sketch/icon.sketch b/Build/sketch/icon.sketch
diff --git a/Build/test.sh b/Build/test.sh
diff --git a/V2rayU.xcodeproj/project.pbxproj b/V2rayU.xcodeproj/project.pbxproj
@@ -43,6 +43,7 @@
 		66FEAD53217EE14C009DECF9 /* ConfigWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 66FEAD4E217EE14C009DECF9 /* ConfigWindow.xib */; };
 		6D6DF2CF13D9FD3C7C6492A4 /* QrcodeWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D6DF12EA09D2D80788666D0 /* QrcodeWindow.swift */; };
 		6D6DF2F2DFB2234541488BBD /* PreferenceSubscribe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D6DF5345E4582EE0EBD468D /* PreferenceSubscribe.swift */; };
+		6D6DF426E93AA9929183CE26 /* appdmg.json in Resources */ = {isa = PBXBuildFile; fileRef = 6D6DF927AC79EEF7378C192A /* appdmg.json */; };
 		6D6DF51271B1AF55EACC79F2 /* PreferenceSubscribe.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6D6DF0CCE47F1253DECD5855 /* PreferenceSubscribe.strings */; };
 		6D6DF5F67A917F78FF652D45 /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = 6D6DF8F5112A8407EE959998 /* .gitignore */; };
 		6D6DF6553CF221AEB71913EE /* PreferenceGeneral.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D6DFFB29020127E034AD168 /* PreferenceGeneral.swift */; };
@@ -204,6 +205,7 @@
 		6D6DF870C8E334815FBA78B2 /* PreferenceAbout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreferenceAbout.swift; sourceTree = "<group>"; };
 		6D6DF87840CDA04AF0E9D36E /* Scanner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Scanner.swift; sourceTree = "<group>"; };
 		6D6DF8F5112A8407EE959998 /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = file.gitignore; path = .gitignore; sourceTree = "<group>"; };
+		6D6DF927AC79EEF7378C192A /* appdmg.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = appdmg.json; sourceTree = "<group>"; };
 		6D6DFD730D8572B1FCAB1FFE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = V2rayU/Base.lproj/PreferenceSubscribe.xib; sourceTree = SOURCE_ROOT; };
 		6D6DFD9F5991B38B128888D6 /* V2rayConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = V2rayConfig.swift; sourceTree = "<group>"; };
 		6D6DFE1CDFAD9828F2FDE1A5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = V2rayU/Base.lproj/PreferenceAdvance.xib; sourceTree = SOURCE_ROOT; };
@@ -358,6 +360,7 @@
 				66FEAD45217D75FC009DECF9 /* release.sh */,
 				6D6DFD93CE866018306A090E /* pac */,
 				6653C20422E0A2B700754D66 /* publish.sh */,
+				6D6DF927AC79EEF7378C192A /* appdmg.json */,
 			);
 			path = Build;
 			sourceTree = "<group>";
@@ -582,6 +585,7 @@
 				6D6DFFD18860EBE148F6DF1F /* PreferencePac.strings in Resources */,
 				66193A8923EE46BC00289B6A /* PreferenceRouting.xib in Resources */,
 				6D6DF51271B1AF55EACC79F2 /* PreferenceSubscribe.strings in Resources */,
+				6D6DF426E93AA9929183CE26 /* appdmg.json in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1038,7 +1042,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 2.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = net.yanue.V2rayU;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1066,7 +1070,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 2.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = net.yanue.V2rayU;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/V2rayU/Info.plist b/V2rayU/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.1</string>
+	<string>2.0.0</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.5.1</string>
+	<string>2.0.0</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>