bug fix #7

underthestars-zhy · Nov 14, 2022 · 5e6fa31 · 5e6fa31
1 parent 5d6b24f
commit 5e6fa31
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 27 deletions.
diff --git a/IconChanger.xcodeproj/project.pbxproj b/IconChanger.xcodeproj/project.pbxproj
@@ -381,7 +381,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"IconChanger/Preview Content\"";
 				DEVELOPMENT_TEAM = 44BN78992X;
@@ -395,8 +395,8 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.2.3;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.zhuhaoyu.IconChanger;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -414,7 +414,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"IconChanger/Preview Content\"";
 				DEVELOPMENT_TEAM = 44BN78992X;
@@ -428,8 +428,8 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.2.3;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.zhuhaoyu.IconChanger;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -483,7 +483,7 @@
 			repositoryURL = "https://github.com/underthestars-zhy/LaunchPadManagerDBHelper";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 1.0.8;
+				minimumVersion = 1.0.9;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

diff --git a/IconChanger/IconManager.swift b/IconChanger/IconManager.swift
@@ -96,11 +96,7 @@ class IconManager: ObservableObject {
         let copy = content
 
         for (key, value) in replacement {
-            if #available(macOS 13.0, *) {
-                content.replace("%\(key)", with: value)
-            } else {
-                content = content.replace(target: "%\(key)", withString: value)
-            }
+            content = content.replace(target: "%\(key)", withString: value)
         }
 
         try content.write(to: path, atomically: true, encoding: .utf8)

diff --git a/IconChanger/URL+Universal.swift b/IconChanger/URL+Universal.swift
@@ -9,26 +9,14 @@ import Foundation
 
 extension URL {
     func universalappending(path: String) -> Self {
-        if #available(macOS 13, *) {
-            return self.appending(component: path)
-        } else {
-            return self.appendingPathComponent(path)
-        }
+        return self.appendingPathComponent(path)
     }
 
     func universalPath() -> String {
-        if #available(macOS 13, *) {
-            return self.path().removingPercentEncoding ?? self.path()
-        } else {
-            return self.path.removingPercentEncoding ?? self.path
-        }
+        return self.path.removingPercentEncoding ?? self.path
     }
 
     init(universalFilePath: String) {
-        if #available(macOS 13, *) {
-            self.init(filePath: universalFilePath)
-        } else {
-            self.init(fileURLWithPath: universalFilePath)
-        }
+        self.init(fileURLWithPath: universalFilePath)
     }
 }