diff --git a/Makefile b/Makefile index 1789c5626..fe8a141b0 100644 --- a/Makefile +++ b/Makefile @@ -118,7 +118,6 @@ $(SPARKLE_FRAMEWORK): sparkle: xcodebuild -project Sparkle/Sparkle.xcodeproj -configuration Release $(BUILD_SETTINGS) build - xcodebuild -project Sparkle/Sparkle.xcodeproj -scheme sign_update -configuration Release -derivedDataPath Sparkle/build $(BUILD_SETTINGS) build $(MAKE) copy-sparkle-framework $(SPARKLE_SIGN): @@ -128,7 +127,6 @@ $(SPARKLE_SIGN): copy-sparkle-framework: mkdir -p Frameworks cp -RP Sparkle/build/Release/Sparkle.framework Frameworks/ - cp Sparkle/build/Build/Products/Release/sign_update package/ clean-sparkle: rm -rf Frameworks/* > /dev/null 2>&1 || true @@ -152,6 +150,7 @@ endif package: release $(PACKAGE) archive: package $(SPARKLE_SIGN) + bash package/make_archive DSTROOT = /Library/Input Methods SQUIRREL_APP_ROOT = $(DSTROOT)/Squirrel.app diff --git a/Squirrel.xcodeproj/project.pbxproj b/Squirrel.xcodeproj/project.pbxproj index 2d30fde03..15249e831 100644 --- a/Squirrel.xcodeproj/project.pbxproj +++ b/Squirrel.xcodeproj/project.pbxproj @@ -648,7 +648,6 @@ CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_ENTITLEMENTS = resources/Squirrel.entitlements; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1.0.0; CURRENT_PROJECT_VERSION = 1.0.3; DEAD_CODE_STRIPPING = YES; FRAMEWORK_SEARCH_PATHS = ( diff --git a/resources/Info.plist b/resources/Info.plist index 442ff9188..df13876c7 100644 --- a/resources/Info.plist +++ b/resources/Info.plist @@ -36,7 +36,6 @@ rime.pdf tsInputModeCharacterRepertoireKey - Latn Hans Hant @@ -65,7 +64,6 @@ rime.pdf tsInputModeCharacterRepertoireKey - Latn Hant Hans diff --git a/sources/SquirrelTheme.swift b/sources/SquirrelTheme.swift index 190a91fae..60af2236a 100644 --- a/sources/SquirrelTheme.swift +++ b/sources/SquirrelTheme.swift @@ -342,4 +342,3 @@ private extension SquirrelTheme { alpha: blend(foreground: foregroundColor.alphaComponent, background: backgroundColor.alphaComponent)) } } - diff --git a/sources/SquirrelView.swift b/sources/SquirrelView.swift index e1770decb..45fe1e69d 100644 --- a/sources/SquirrelView.swift +++ b/sources/SquirrelView.swift @@ -766,4 +766,3 @@ private extension SquirrelView { return (layer, downPath, upPath) } } -