Bump to 1.1.0

TypeDuck-HK · Apr 3, 2024 · 27155db · 27155db
1 parent 56ae68a
commit 27155db
Show file tree

Hide file tree

Showing 8 changed files with 1,758 additions and 1,982 deletions.
diff --git a/Preparing/Sources/Preparing/Resources/data.csv b/Preparing/Sources/Preparing/Resources/data.csv
diff --git a/Preparing/Sources/Preparing/Resources/pinyin.txt b/Preparing/Sources/Preparing/Resources/pinyin.txt
diff --git a/Preparing/Sources/Preparing/Resources/syllable.txt b/Preparing/Sources/Preparing/Resources/syllable.txt
@@ -5,10 +5,8 @@
 785660	ai	ai
 785670	ak	ak
 785680	am	am
-785685	an	an
 785695	ap	ap
 785705	ar	aa
-785715	at	at
 785720	au	au
 786905	ba	baa
 786975	bo	bo
@@ -20,7 +18,6 @@
 789495	de	de
 789515	di	di
 789545	do	do
-790800	ei	ei
 792045	fa	faa
 792115	fo	fo
 792145	fu	fu

diff --git a/Preparing/Sources/Preparing/Resources/symbol.txt b/Preparing/Sources/Preparing/Resources/symbol.txt
diff --git a/TypeDuck.xcodeproj/project.pbxproj b/TypeDuck.xcodeproj/project.pbxproj
@@ -731,7 +731,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"TypeDuck/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
@@ -749,7 +749,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = hk.eduhk.inputmethod.TypeDuck;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -768,7 +768,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"TypeDuck/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
@@ -786,7 +786,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = hk.eduhk.inputmethod.TypeDuck;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/packaging/pack.sh b/packaging/pack.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 BUNDLE_IDENTIFIER='hk.eduhk.inputmethod.TypeDuck'
-APP_VERSION='1.0.0'
+APP_VERSION='1.1.0'
 INSTALL_LOCATION='/Library/Input Methods'
 
 pkgbuild \

diff --git a/packaging/scripts/postinstall b/packaging/scripts/postinstall
@@ -4,8 +4,8 @@ login_user=$(/usr/bin/stat -f%Su /dev/console)
 executable="${DSTROOT}/TypeDuck.app/Contents/MacOS/TypeDuck"
 
 # Stop the running instances
-osascript -e 'tell application id "hk.eduhk.inputmethod.TypeDuck" to if it is running then quit'
-/usr/bin/sudo -u "${login_user}" osascript -e 'tell application id "hk.eduhk.inputmethod.TypeDuck" to if it is running then quit'
+osascript -e 'tell application id "hk.eduhk.inputmethod.TypeDuck" to quit'
+/usr/bin/sudo -u "${login_user}" osascript -e 'tell application id "hk.eduhk.inputmethod.TypeDuck" to quit'
 
 # Install
 /usr/bin/sudo -u "${login_user}" "${executable}" install

diff --git a/packaging/scripts/preinstall b/packaging/scripts/preinstall
@@ -3,7 +3,7 @@
 login_user=$(/usr/bin/stat -f%Su /dev/console)
 
 # Stop the running instances
-osascript -e 'tell application id "hk.eduhk.inputmethod.TypeDuck" to if it is running then quit'
-/usr/bin/sudo -u "${login_user}" osascript -e 'tell application id "hk.eduhk.inputmethod.TypeDuck" to if it is running then quit'
+osascript -e 'tell application id "hk.eduhk.inputmethod.TypeDuck" to quit'
+/usr/bin/sudo -u "${login_user}" osascript -e 'tell application id "hk.eduhk.inputmethod.TypeDuck" to quit'
 
 exit 0