Fall 2024 updates (#21)

macdrevx · web-flow · commit 961bed008cd8 · 2024-10-07T07:59:17.000-04:00
* Update to GEOSwift 11; Bump min versions * Update CI environment * Fix lint * add test plan * add workspace * remove watchos * fix warnings when building with swift 6 compiler * add tvos to quicklook * update changelog * only swift 6 compiler knows about @retroactive * Add some xcode 16 ci jobs
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -3,25 +3,29 @@ name: GEOSwiftMapKit
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   swiftlint:
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v3
+      - name: Install SwiftLint
+        run: brew install swiftlint
       - name: Swiftlint
-        run: swiftlint
+        run: swiftlint --strict
   podspec:
     name: Lint Podspec for ${{ matrix.platform }}
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
       matrix:
-        platform: [ios, osx, tvos]
+        platform: [ios, macos, tvos]
     steps:
       - uses: actions/checkout@v3
+      - name: Update CocoaPods Specs
+        run: pod repo update
       - name: Lint Podspec
         run: pod lib lint --platforms=${{ matrix.platform }}
   xcodebuild:
@@ -30,46 +34,36 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: "xcodebuild (iOS 16.2, Xcode 14.2)"
-            os: macos-12
-            xcode-version: "14.2"
-            sdk: iphonesimulator16.2
-            destination: "platform=iOS Simulator,OS=16.2,name=iPhone 14"
-          - name: "xcodebuild (tvOS 16.1, Xcode 14.2)"
-            os: macos-12
-            xcode-version: "14.2"
-            sdk: appletvsimulator16.1
-            destination: "platform=tvOS Simulator,OS=16.1,name=Apple TV"
-          - name: "xcodebuild (macOS 13.1, Xcode 14.2)"
-            os: macos-12
-            xcode-version: "14.2"
-            sdk: macosx13.1
-            destination: "platform=macOS"
-          - name: "xcodebuild (macCatalyst 13.1, Xcode 14.2)"
-            os: macos-12
-            xcode-version: "14.2"
-            sdk: macosx13.1
-            destination: "platform=macOS,variant=Mac Catalyst"
-          - name: "xcodebuild (iOS 15.2, Xcode 13.2.1)"
-            os: macos-11
-            xcode-version: "13.2.1"
-            sdk: iphonesimulator15.2
-            destination: "platform=iOS Simulator,OS=15.2,name=iPhone 13"
-          - name: "xcodebuild (tvOS 15.2, Xcode 13.2.1)"
-            os: macos-11
-            xcode-version: "13.2.1"
-            sdk: appletvsimulator15.2
-            destination: "platform=tvOS Simulator,OS=15.2,name=Apple TV"
-          - name: "xcodebuild (macOS 12.1, Xcode 13.2.1)"
-            os: macos-11
-            xcode-version: "13.2.1"
-            sdk: macosx12.1
+          - name: "xcodebuild (iOS 18.0, Xcode 16.0)"
+            os: macos-14
+            xcode-version: "16"
+            sdk: iphonesimulator18.0
+            destination: "platform=iOS Simulator,OS=18.0,name=iPhone 16"
+          - name: "xcodebuild (tvOS 18.0, Xcode 16.0)"
+            os: macos-14
+            xcode-version: "16"
+            sdk: appletvsimulator18.0
+            destination: "platform=tvOS Simulator,OS=18.0,name=Apple TV"
+          - name: "xcodebuild (macOS 15.0, Xcode 16.0)"
+            os: macos-14
+            xcode-version: "16"
+            sdk: macosx15.0
+            destination: "platform=OS X"
+          - name: "xcodebuild (iOS 17.5, Xcode 15.4)"
+            os: macos-14
+            xcode-version: "15.4"
+            sdk: iphonesimulator17.5
+            destination: "platform=iOS Simulator,OS=17.5,name=iPhone 15"
+          - name: "xcodebuild (tvOS 17.5, Xcode 15.4)"
+            os: macos-14
+            xcode-version: "15.4"
+            sdk: appletvsimulator17.5
+            destination: "platform=tvOS Simulator,OS=17.5,name=Apple TV"
+          - name: "xcodebuild (macOS 14.7, Xcode 15.4)"
+            os: macos-14
+            xcode-version: "15.4"
+            sdk: macosx14.5
             destination: "platform=OS X"
-          - name: "xcodebuild (macCatalyst 12.1, Xcode 13.2.1)"
-            os: macos-11
-            xcode-version: "13.2.1"
-            sdk: macosx12.1
-            destination: "platform=OS X,variant=Mac Catalyst"
     steps:
       - uses: actions/checkout@v3
       - name: Select Xcode Version
@@ -89,10 +83,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-11
-            xcode-version: "13.2.1"
-          - os: macos-12
-            xcode-version: "14.2"
+          - os: macos-14
+            xcode-version: "15.4"
+          - os: macos-14
+            xcode-version: "16"
     steps:
       - uses: actions/checkout@v3
       - name: Select Xcode Version
diff --git a/.gitignore b/.gitignore
@@ -30,4 +30,3 @@ Carthage/Build
 # Swift Package Manager
 
 .build/
-.swiftpm/
diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/GEOSwiftMapKit.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/GEOSwiftMapKit.xcscheme
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1600"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "GEOSwiftMapKit"
+               BuildableName = "GEOSwiftMapKit"
+               BlueprintName = "GEOSwiftMapKit"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:GEOSwiftMapKit.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "GEOSwiftMapKitTests"
+               BuildableName = "GEOSwiftMapKitTests"
+               BlueprintName = "GEOSwiftMapKitTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "GEOSwiftMapKit"
+            BuildableName = "GEOSwiftMapKit"
+            BlueprintName = "GEOSwiftMapKit"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 5.0.0
+
+* Updates to GEOSwift 11.0.0
+* Increases min Swift version to 5.9
+* Increases min deployment targets for Apple platforms
+* Expands QuickLook support to tvOS
+* Fixes some warnings when building with Xcode 16
+
 ## 4.0.0
 
 * Updates to GEOSwift 10.0.0
diff --git a/GEOSwiftMapKit.podspec b/GEOSwiftMapKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name = 'GEOSwiftMapKit'
-  s.version = '4.0.0'
-  s.swift_version = '5.5'
+  s.version = '5.0.0'
+  s.swift_version = '5.9'
   s.cocoapods_version = '~> 1.10'
   s.summary = 'MapKit support for GEOSwift'
   s.description  = <<~DESC
@@ -15,16 +15,14 @@ Pod::Spec.new do |s|
     file: 'LICENSE'
   }
   s.authors = 'Andrew Hershberger'
-  s.platforms = {
-    ios: '9.0',
-    osx: '10.9',
-    tvos: '9.2',
-  }
+  s.ios.deployment_target = '12.0'
+  s.macos.deployment_target = '10.13'
+  s.tvos.deployment_target = '12.0'
   s.source = {
     git: 'https://github.com/GEOSwift/GEOSwiftMapKit.git',
     tag: s.version
   }
   s.source_files = 'Sources/**/*.swift'
   s.macos.exclude_files = 'GEOSwiftMapKit/GEOSwift+MapKitQuickLook.swift'
-  s.dependency 'GEOSwift', '~> 10.0'
+  s.dependency 'GEOSwift', '~> 11.0'
 end
diff --git a/GEOSwiftMapKit.xctestplan b/GEOSwiftMapKit.xctestplan
@@ -0,0 +1,24 @@
+{
+  "configurations" : [
+    {
+      "id" : "13C39BF1-17D7-4105-AD5C-3810194BC2B3",
+      "name" : "Test Scheme Action",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "codeCoverage" : false
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:",
+        "identifier" : "GEOSwiftMapKitTests",
+        "name" : "GEOSwiftMapKitTests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/Package.resolved b/Package.resolved
@@ -1,25 +1,23 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "geos",
-        "repositoryURL": "https://github.com/GEOSwift/geos.git",
-        "state": {
-          "branch": null,
-          "revision": "f510e634c822116fca615064d889300dba40d761",
-          "version": "8.1.0"
-        }
-      },
-      {
-        "package": "GEOSwift",
-        "repositoryURL": "https://github.com/GEOSwift/GEOSwift.git",
-        "state": {
-          "branch": null,
-          "revision": "e55eef92fb533107b43e30fcf275223a5055797e",
-          "version": "10.0.0"
-        }
+  "pins" : [
+    {
+      "identity" : "geos",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/GEOSwift/geos.git",
+      "state" : {
+        "revision" : "4d8af495e7507f48f1ae9104102debdd2043917b",
+        "version" : "9.0.0"
       }
-    ]
-  },
-  "version": 1
+    },
+    {
+      "identity" : "geoswift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/GEOSwift/GEOSwift.git",
+      "state" : {
+        "revision" : "e42c062c2feb0df61373ae8cd6031a823a0dc981",
+        "version" : "11.0.0"
+      }
+    }
+  ],
+  "version" : 2
 }
diff --git a/Package.swift b/Package.swift
@@ -1,14 +1,14 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.9
 import PackageDescription
 
 let package = Package(
     name: "GEOSwiftMapKit",
-    platforms: [.iOS(.v9), .macOS("10.9"), .tvOS("9.2")],
+    platforms: [.iOS(.v12), .macOS(.v10_13), .tvOS(.v12)],
     products: [
         .library(name: "GEOSwiftMapKit", targets: ["GEOSwiftMapKit"])
     ],
     dependencies: [
-        .package(url: "https://github.com/GEOSwift/GEOSwift.git", from: "10.0.0")
+        .package(url: "https://github.com/GEOSwift/GEOSwift.git", from: "11.0.0")
     ],
     targets: [
         .target(
diff --git a/Playgrounds/GEOSwiftMapKit.playground/playground.xcworkspace/contents.xcworkspacedata b/Playgrounds/GEOSwiftMapKit.playground/playground.xcworkspace/contents.xcworkspacedata
diff --git a/README.md b/README.md
@@ -9,8 +9,8 @@ See [GEOSwift](https://github.com/GEOSwift/GEOSwift) for full details
 
 ## Requirements
 
-* iOS 9.0+, tvOS 9.2+, macOS 10.9+ (CocoaPods, Swift PM)
-* Swift 5.5
+* iOS 12.0+, tvOS 12.0+, macOS 10.13+ (CocoaPods, Swift PM)
+* Swift 5.9
 
 > GEOS is licensed under LGPL 2.1 and its compatibility with static linking is
 at least controversial. Use of geos without dynamic linking is discouraged.
@@ -30,7 +30,7 @@ at least controversial. Use of geos without dynamic linking is discouraged.
 
 1. Update the top-level dependencies in your `Package.swift` to include:
 
-        .package(url: "https://github.com/GEOSwift/GEOSwiftMapKit.git", from: "4.0.0")
+        .package(url: "https://github.com/GEOSwift/GEOSwiftMapKit.git", from: "5.0.0")
 
 2. Update the target dependencies in your `Package.swift` to include
 
diff --git a/Sources/GEOSwiftMapKit/GEOSwift+MapKit.swift b/Sources/GEOSwiftMapKit/GEOSwift+MapKit.swift
@@ -20,7 +20,7 @@ public extension Point {
 public extension GEOSwift.Polygon {
     static var world: GEOSwift.Polygon {
         // swiftlint:disable:next force_try
-        return try! Polygon(exterior: Polygon.LinearRing(points: [
+        try! Polygon(exterior: Polygon.LinearRing(points: [
             Point(x: -180, y: 90),
             Point(x: -180, y: -90),
             Point(x: 180, y: -90),
diff --git a/Sources/GEOSwiftMapKit/GEOSwift+MapKitQuickLook.swift b/Sources/GEOSwiftMapKit/GEOSwift+MapKitQuickLook.swift
diff --git a/Tests/GEOSwiftMapKitTests/MapKit+Equatable.swift b/Tests/GEOSwiftMapKitTests/MapKit+Equatable.swift

Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,3 @@ Carthage/Build`
`30`	`30`	`# Swift Package Manager`
`31`	`31`
`32`	`32`	`.build/`
`33`		`-.swiftpm/`