Merge pull request #97 from kkebo/swift-6-language-mode

kkebo · web-flow · commit 8f7ba014047c · 2025-03-22T03:24:57.000+09:00
diff --git a/DNSecure.xcodeproj/project.pbxproj b/DNSecure.xcodeproj/project.pbxproj
@@ -285,7 +285,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1200;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1620;
 				TargetAttributes = {
 					8940023724ACBD2700EBE74B = {
 						CreatedOnToolsVersion = 12.0;
@@ -547,7 +547,7 @@
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -574,15 +574,14 @@
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
 		8940026124ACBD2800EBE74B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = X4678G5DL2;
@@ -603,7 +602,6 @@
 		8940026224ACBD2800EBE74B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = X4678G5DL2;
@@ -624,7 +622,6 @@
 		8940026424ACBD2800EBE74B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = X4678G5DL2;
 				INFOPLIST_FILE = DNSecureUITests/Info.plist;
@@ -644,7 +641,6 @@
 		8940026524ACBD2800EBE74B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = X4678G5DL2;
 				INFOPLIST_FILE = DNSecureUITests/Info.plist;
diff --git a/DNSecure.xcodeproj/xcshareddata/xcschemes/DNSecure.xcscheme b/DNSecure.xcodeproj/xcshareddata/xcschemes/DNSecure.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1510"
+   LastUpgradeVersion = "1620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/DNSecure/Extensions/NEOnDemandRuleAction+CaseIterable.swift b/DNSecure/Extensions/NEOnDemandRuleAction+CaseIterable.swift
@@ -7,7 +7,7 @@
 
 import NetworkExtension
 
-extension NEOnDemandRuleAction: CaseIterable {
+extension NEOnDemandRuleAction: @retroactive CaseIterable {
     public static var allCases: [Self] {
         [.connect, .disconnect, .evaluateConnection, .ignore]
     }
diff --git a/DNSecure/Extensions/NEOnDemandRuleAction+CustomStringConvertible.swift b/DNSecure/Extensions/NEOnDemandRuleAction+CustomStringConvertible.swift
@@ -7,7 +7,7 @@
 
 import NetworkExtension
 
-extension NEOnDemandRuleAction: CustomStringConvertible {
+extension NEOnDemandRuleAction: @retroactive CustomStringConvertible {
     public var description: String {
         switch self {
         case .connect:
diff --git a/DNSecure/Extensions/NEOnDemandRuleInterfaceType+CaseIterable.swift b/DNSecure/Extensions/NEOnDemandRuleInterfaceType+CaseIterable.swift
@@ -7,7 +7,7 @@
 
 import NetworkExtension
 
-extension NEOnDemandRuleInterfaceType: CaseIterable {
+extension NEOnDemandRuleInterfaceType: @retroactive CaseIterable {
     public static var allCases: [Self] {
         #if os(macOS)
             return [.any, .ethernet, .wiFi]
diff --git a/DNSecure/Extensions/NEOnDemandRuleInterfaceType+CustomStringConvertible.swift b/DNSecure/Extensions/NEOnDemandRuleInterfaceType+CustomStringConvertible.swift
@@ -7,7 +7,7 @@
 
 import NetworkExtension
 
-extension NEOnDemandRuleInterfaceType: CustomStringConvertible {
+extension NEOnDemandRuleInterfaceType: @retroactive CustomStringConvertible {
     public var description: String {
         switch self {
         case .any:
diff --git a/DNSecure/Models/Resolver.swift b/DNSecure/Models/Resolver.swift
@@ -215,7 +215,7 @@ extension Resolvers {
     }
 }
 
-extension Resolvers: RawRepresentable {
+extension Resolvers: @retroactive RawRepresentable {
     public init?(rawValue: String) {
         guard let data = rawValue.data(using: .utf8),
               let result = try? JSONDecoder().decode(Self.self, from: data)
diff --git a/DNSecure/Views/ContentView.swift b/DNSecure/Views/ContentView.swift
@@ -66,7 +66,7 @@ struct ContentView {
     }
 
     private func updateStatus() {
-        #if !targetEnvironment(simulator) && !canImport(PlaygroundSupport)
+        #if !targetEnvironment(simulator)
             let manager = NEDNSSettingsManager.shared()
             manager.loadFromPreferences {
                 if let err = $0 {
@@ -84,7 +84,7 @@ struct ContentView {
             self.usedID = server.id.uuidString
         }
 
-        #if !targetEnvironment(simulator) && !canImport(PlaygroundSupport)
+        #if !targetEnvironment(simulator)
             let manager = NEDNSSettingsManager.shared()
             manager.dnsSettings = server.configuration.toDNSSettings()
             manager.onDemandRules = server.onDemandRules.toNEOnDemandRules()
@@ -108,7 +108,7 @@ struct ContentView {
     private func removeSettings() {
         self.usedID = nil
 
-        #if !targetEnvironment(simulator) && !canImport(PlaygroundSupport)
+        #if !targetEnvironment(simulator)
             let manager = NEDNSSettingsManager.shared()
             guard manager.dnsSettings != nil else {
                 // Already removed
@@ -133,6 +133,7 @@ struct ContentView {
     }
 }
 
+@MainActor
 extension ContentView: View {
     var body: some View {
         if #available(iOS 16, *) {
diff --git a/DNSecure/Views/DetailView.swift b/DNSecure/Views/DetailView.swift
@@ -19,6 +19,7 @@ struct DetailView {
     }
 }
 
+@MainActor
 extension DetailView: View {
     var body: some View {
         if #available(iOS 16, *) {
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 6.0
 
 // WARNING:
 // This file is automatically generated.

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`import NetworkExtension`
`9`	`9`
`10`		`-extension NEOnDemandRuleAction: CaseIterable {`
	`10`	`+extension NEOnDemandRuleAction: @retroactive CaseIterable {`
`11`	`11`	`public static var allCases: [Self] {`
`12`	`12`	`[.connect, .disconnect, .evaluateConnection, .ignore]`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ extension Resolvers {`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`
`218`		`-extension Resolvers: RawRepresentable {`
	`218`	`+extension Resolvers: @retroactive RawRepresentable {`
`219`	`219`	`public init?(rawValue: String) {`
`220`	`220`	`guard let data = rawValue.data(using: .utf8),`
`221`	`221`	`let result = try? JSONDecoder().decode(Self.self, from: data)`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ struct DetailView {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
	`22`	`+@MainActor`
`22`	`23`	`extension DetailView: View {`
`23`	`24`	`var body: some View {`
`24`	`25`	`if #available(iOS 16, *) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// swift-tools-version: 5.8`
	`1`	`+// swift-tools-version: 6.0`
`2`	`2`
`3`	`3`	`// WARNING:`
`4`	`4`	`// This file is automatically generated.`