Merge branch 'rime:master' into Fn

groverlynn · Jul 10, 2023 · 03352c7 · 03352c7
2 parents 20951d4 + 7de3919
commit 03352c7
Show file tree

Hide file tree

Showing 230 changed files with 1,062 additions and 7,953 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ Squirrel.xcodeproj/project.xcworkspace/
 Squirrel.xcodeproj/xcuserdata/
 build/
 build.log
+Frameworks/*
 bin/*
 lib/*
 data/opencc/

diff --git a/.gitmodules b/.gitmodules
@@ -5,3 +5,6 @@
 [submodule "plum"]
 	path = plum
 	url = https://github.com/rime/plum.git
+[submodule "Sparkle"]
+	path = Sparkle
+	url = https://github.com/sparkle-project/Sparkle
diff --git a/Assets.xcassets/RimeIcon.appiconset/Contents.json b/Assets.xcassets/RimeIcon.appiconset/Contents.json
@@ -1,13 +1,13 @@
 {
   "images" : [
     {
-      "filename" : "rime-small-16.png",
+      "filename" : "rime-16 1.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "16x16"
     },
     {
-      "filename" : "rime-small-32.png",
+      "filename" : "rime-32 1.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "16x16"

diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-1024.png b/Assets.xcassets/RimeIcon.appiconset/rime-1024.png
diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-128.png b/Assets.xcassets/RimeIcon.appiconset/rime-128.png
diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-16 1.png b/Assets.xcassets/RimeIcon.appiconset/rime-16 1.png
diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-256.png b/Assets.xcassets/RimeIcon.appiconset/rime-256.png
diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-32 1.png b/Assets.xcassets/RimeIcon.appiconset/rime-32 1.png
diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-32.png b/Assets.xcassets/RimeIcon.appiconset/rime-32.png
diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-512.png b/Assets.xcassets/RimeIcon.appiconset/rime-512.png
diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-64.png b/Assets.xcassets/RimeIcon.appiconset/rime-64.png
diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-small-16.png b/Assets.xcassets/RimeIcon.appiconset/rime-small-16.png
diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-small-32.png b/Assets.xcassets/RimeIcon.appiconset/rime-small-32.png
diff --git a/Frameworks/Sparkle.framework/Headers b/Frameworks/Sparkle.framework/Headers
diff --git a/Frameworks/Sparkle.framework/Modules b/Frameworks/Sparkle.framework/Modules
diff --git a/Frameworks/Sparkle.framework/PrivateHeaders b/Frameworks/Sparkle.framework/PrivateHeaders
diff --git a/Frameworks/Sparkle.framework/Resources b/Frameworks/Sparkle.framework/Resources
diff --git a/Frameworks/Sparkle.framework/Sparkle b/Frameworks/Sparkle.framework/Sparkle
diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h
diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloader.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloader.h
diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h
diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h
diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h
diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h
diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h
diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h
diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h
diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h