Merge branch 'master' into dark_mode

rime · Jan 18, 2021 · c2923e2 · c2923e2
2 parents 8dc2f38 + 088cc84
commit c2923e2
Show file tree

Hide file tree

Showing 107 changed files with 167 additions and 2,492 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
 language: objective-c
 os: osx
+osx_image: xcode12.3
 compiler: clang
 install: ./travis-install.sh
 script: make

diff --git a/Makefile b/Makefile
@@ -12,16 +12,17 @@ RIME_LIB_DIR = librime/dist/lib
 RIME_LIBRARY_FILE_NAME = librime.1.dylib
 RIME_LIBRARY = lib/$(RIME_LIBRARY_FILE_NAME)
 
-RIME_DEPS = librime/thirdparty/lib/libmarisa.a \
+RIME_DEPS = librime/thirdparty/lib/libcapnp.a \
+	librime/thirdparty/lib/libmarisa.a \
 	librime/thirdparty/lib/libleveldb.a \
 	librime/thirdparty/lib/libopencc.a \
 	librime/thirdparty/lib/libyaml-cpp.a
 PLUM_DATA = bin/rime-install \
 	data/plum/default.yaml \
 	data/plum/symbols.yaml \
 	data/plum/essay.txt
-OPENCC_DATA = data/opencc/TSCharacters.ocd \
-	data/opencc/TSPhrases.ocd \
+OPENCC_DATA = data/opencc/TSCharacters.ocd2 \
+	data/opencc/TSPhrases.ocd2 \
 	data/opencc/t2s.json
 DEPS_CHECK = $(RIME_LIBRARY) $(PLUM_DATA) $(OPENCC_DATA)
 

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@
 安裝輸入法
 ---
 
-本品適用於 64 位 macOS 10.7+
+本品適用於 macOS 10.9+
 
 初次安裝，如果在部份應用程序中打不出字，請註銷並重新登錄。
 

diff --git a/Sparkle.framework/Headers b/Sparkle.framework/Headers
diff --git a/Sparkle.framework/Resources b/Sparkle.framework/Resources
diff --git a/Sparkle.framework/Sparkle b/Sparkle.framework/Sparkle
diff --git a/Sparkle.framework/Versions/A/Headers/SUAppcast.h b/Sparkle.framework/Versions/A/Headers/SUAppcast.h
diff --git a/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h b/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h
diff --git a/Sparkle.framework/Versions/A/Headers/SUUpdater.h b/Sparkle.framework/Versions/A/Headers/SUUpdater.h
diff --git a/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h b/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h
diff --git a/Sparkle.framework/Versions/A/Headers/Sparkle.h b/Sparkle.framework/Versions/A/Headers/Sparkle.h
diff --git a/Sparkle.framework/Versions/A/Resources/Info.plist b/Sparkle.framework/Versions/A/Resources/Info.plist
diff --git a/Sparkle.framework/Versions/A/Resources/License.txt b/Sparkle.framework/Versions/A/Resources/License.txt