Merge branch 'main' into dev

CofficLab · Dec 8, 2024 · 05ddbab · 05ddbab
2 parents 7fff0bc + af704d9
commit 05ddbab
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/pro-release.yaml b/.github/workflows/pro-release.yaml
@@ -25,7 +25,7 @@ env:
 
 jobs:
   build_with_signing:
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

diff --git a/GitOK.xcodeproj/project.pbxproj b/GitOK.xcodeproj/project.pbxproj
@@ -1154,7 +1154,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 132;
+				CURRENT_PROJECT_VERSION = 136;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
 				DEVELOPMENT_TEAM = Y6HZ9JJYV6;
@@ -1178,7 +1178,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 1.1.24;
+				MARKETING_VERSION = 1.1.28;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yueyi.GitOK;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -1198,7 +1198,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 132;
+				CURRENT_PROJECT_VERSION = 136;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
 				DEVELOPMENT_TEAM = Y6HZ9JJYV6;
@@ -1222,7 +1222,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 1.1.24;
+				MARKETING_VERSION = 1.1.28;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yueyi.GitOK;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;

diff --git a/appcast.xml b/appcast.xml
@@ -3,12 +3,12 @@
     <channel>
         <title>GitOK</title>
         <item>
-            <title>1.1.24</title>
-            <pubDate>Sat, 07 Dec 2024 10:47:52 +0000</pubDate>
-            <sparkle:version>132</sparkle:version>
-            <sparkle:shortVersionString>1.1.24</sparkle:shortVersionString>
+            <title>1.1.28</title>
+            <pubDate>Sun, 08 Dec 2024 11:58:30 +0000</pubDate>
+            <sparkle:version>136</sparkle:version>
+            <sparkle:shortVersionString>1.1.28</sparkle:shortVersionString>
             <sparkle:minimumSystemVersion>14.0</sparkle:minimumSystemVersion>
-            <enclosure url="https://github.com/CofficLab/GitOK/releases/latest/download/GitOK-1.1.24.dmg" length="28826591" type="application/octet-stream" sparkle:edSignature="HI6+QbmYuaFPZj+7bwn1EJxTHLM5SmCQIddQ5ITBbFOUxoC+8XcXxVoeRS4jOPh2lVBWefJmi+lXmSZ/4dtPAQ=="/>
+            <enclosure url="https://github.com/CofficLab/GitOK/releases/latest/download/GitOK-1.1.28.dmg" length="28839493" type="application/octet-stream" sparkle:edSignature="eH3nXnJbXnuzodW62HM7ARUinDZkIQSE341blPcRgQECudFZChpr+hcmBujWIg3cTAqngSSOHSsxCbVAusyYCw=="/>
         </item>
     </channel>
 </rss>