Merge pull request #36 from cybozu/end-of-support-ios14

End to support iOS 14
cybozu · Jul 5, 2024 · 90778d3 · 90778d3
2 parents 8749050 + 5b44dd0
commit 90778d3
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 130 deletions.
diff --git a/LicenseDemo/LicenseDemo.xcodeproj/project.pbxproj b/LicenseDemo/LicenseDemo.xcodeproj/project.pbxproj
@@ -179,7 +179,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1330;
-				LastUpgradeCheck = 1330;
+				LastUpgradeCheck = 1540;
 				TargetAttributes = {
 					18E61A6E2872A66800C5A710 = {
 						CreatedOnToolsVersion = 13.3.1;
@@ -326,6 +326,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -340,7 +341,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -386,6 +387,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -394,7 +396,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;

diff --git a/Package.swift b/Package.swift
@@ -5,7 +5,7 @@ import PackageDescription
 let package = Package(
     name: "LicenseList",
     platforms: [
-        .iOS(.v14)
+        .iOS(.v15)
     ],
     products: [
         .library(

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Generate a list of licenses for the Swift Package libraries that your app depend
 
 - Development with Xcode 15.2+
 - Written in Swift 5.9
-- Compatible with iOS 14.0+
+- Compatible with iOS 15.0+
 
 ## Privacy Manifest
 

diff --git a/Sources/LicenseList/LegacyLicenseSentence.swift b/Sources/LicenseList/LegacyLicenseSentence.swift
diff --git a/Sources/LicenseList/LegacyLicenseView.swift b/Sources/LicenseList/LegacyLicenseView.swift
diff --git a/Sources/LicenseList/LicenseListView.swift b/Sources/LicenseList/LicenseListView.swift
@@ -34,29 +34,15 @@ public struct LicenseListView: View {
                             .foregroundColor(Color(.systemGray3))
                     }
                 } else {
-                    libraryNavigationLink(library)
+                    NavigationLink {
+                        LicenseView(library: library)
+                            .licenseListViewStyle(licenseListViewStyle)
+                    } label: {
+                        Text(library.name)
+                    }
                 }
             }
         }
         .listStyle(.insetGrouped)
     }
-
-    @ViewBuilder
-    func libraryNavigationLink(_ library: Library) -> some View {
-        if #available(iOS 15, *) {
-            NavigationLink {
-                LicenseView(library: library)
-                    .licenseListViewStyle(licenseListViewStyle)
-            } label: {
-                Text(library.name)
-            }
-        } else {
-            NavigationLink {
-                LegacyLicenseView(library: library)
-                    .licenseListViewStyle(licenseListViewStyle)
-            } label: {
-                Text(library.name)
-            }
-        }
-    }
 }
diff --git a/Sources/LicenseList/LicenseListViewController.swift b/Sources/LicenseList/LicenseListViewController.swift
@@ -35,15 +35,9 @@ public class LicenseListViewController: UIViewController {
     }
 
     private func navigateTo(library: Library) {
-        let hostingController = UIHostingController(rootView: Group {
-            if #available(iOS 15, *) {
-                LicenseView(library: library)
-                    .licenseListViewStyle(licenseListViewStyle)
-            } else {
-                LegacyLicenseView(library: library)
-                    .licenseListViewStyle(licenseListViewStyle)
-            }
-        })
+        let hostingController = UIHostingController(
+            rootView: LicenseView(library: library).licenseListViewStyle(licenseListViewStyle)
+        )
         hostingController.title = library.name
         self.navigationController?.pushViewController(hostingController, animated: true)
     }

diff --git a/Sources/LicenseList/LicenseView.swift b/Sources/LicenseList/LicenseView.swift
@@ -7,7 +7,6 @@
 
 import SwiftUI
 
-@available(iOS 15, *)
 public struct LicenseView: View {
     @State private var attributedLicenseBody = AttributedString(stringLiteral: "")
 

diff --git a/Sources/LicenseList/String+Extensions.swift b/Sources/LicenseList/String+Extensions.swift
@@ -8,30 +8,15 @@
 import Foundation
 
 extension StringProtocol {
-    // For LicenseView
     func match(_ pattern: String) -> [Range<Index>] {
         if let range = self.range(of: pattern, options: .regularExpression) {
             return [range] + self[range.upperBound...].match(pattern)
         }
         return []
     }
-
-    // For LegacyLicenseView
-    func split(_ pattern: String) -> [LegacyLicenseSentence] {
-        if let range = self.range(of: pattern, options: .regularExpression) {
-            let res: [LegacyLicenseSentence] = [
-                LegacyLicenseSentence(isHyperLink: false, body: String(self[..<range.lowerBound])),
-                LegacyLicenseSentence(isHyperLink: true, body: String(self[range])),
-            ] + self[range.upperBound...].split(pattern)
-            return res.compactMap { $0.body.isEmpty ? nil : $0 }
-        }
-        return [LegacyLicenseSentence(isHyperLink: false, body: String(self))]
-    }
 }
 
-@available(iOS 15, *)
 extension AttributedStringProtocol {
-    // For LicenseView
     func match(_ pattern: String) -> [Range<AttributedString.Index>] {
         if let range = self.range(of: pattern, options: .regularExpression) {
             return [range] + self[range.upperBound...].match(pattern)