Skip to content

Commit 4d8af49

Browse files
authored
Update to GEOS 3.13.0, Update Apple Platform Deployment Targets, Update CI Environment (#26)
* Increase minimum supported versions Fixes #23 * update to geos 3.13.0 * update ci environment * bump version in podspec * change how deployment targets are specified for cocoapods
1 parent f510e63 commit 4d8af49

File tree

617 files changed

+34035
-12619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

617 files changed

+34035
-12619
lines changed

.github/workflows/main.yml

Lines changed: 25 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ name: GEOSwift/geos
33

44
on:
55
push:
6-
branches: [ main ]
6+
branches: [main]
77
pull_request:
8-
branches: [ main ]
8+
branches: [main]
99

1010
jobs:
1111
podspec:
1212
name: Lint Podspec for ${{ matrix.platform }}
13-
runs-on: macos-12
13+
runs-on: macos-14
1414
strategy:
1515
matrix:
1616
platform: [ios, osx, tvos]
@@ -24,66 +24,26 @@ jobs:
2424
strategy:
2525
matrix:
2626
include:
27-
- name: "xcodebuild (iOS 16.2, Xcode 14.2)"
28-
os: macos-12
29-
xcode-version: "14.2"
30-
sdk: iphonesimulator16.2
31-
destination: "platform=iOS Simulator,OS=16.2,name=iPhone 14"
32-
- name: "xcodebuild (tvOS 16.1, Xcode 14.2)"
33-
os: macos-12
34-
xcode-version: "14.2"
35-
sdk: appletvsimulator16.1
36-
destination: "platform=tvOS Simulator,OS=16.1,name=Apple TV"
37-
- name: "xcodebuild (macOS 13.1, Xcode 14.2)"
38-
os: macos-12
39-
xcode-version: "14.2"
40-
sdk: macosx13.1
27+
- name: "xcodebuild (iOS 17.5, Xcode 15.4)"
28+
os: macos-14
29+
xcode-version: "15.4"
30+
sdk: iphonesimulator17.5
31+
destination: "platform=iOS Simulator,OS=17.5,name=iPhone 15"
32+
- name: "xcodebuild (tvOS 17.5, Xcode 15.4)"
33+
os: macos-14
34+
xcode-version: "15.4"
35+
sdk: appletvsimulator17.5
36+
destination: "platform=tvOS Simulator,OS=17.5,name=Apple TV"
37+
- name: "xcodebuild (macOS 14.5, Xcode 15.4)"
38+
os: macos-14
39+
xcode-version: "15.4"
40+
sdk: macosx14.5
4141
destination: "platform=OS X"
42-
- name: "xcodebuild (watchOS 9.1, Xcode 14.2)"
43-
os: macos-12
44-
xcode-version: "14.2"
45-
sdk: watchsimulator9.1
46-
destination: "platform=watchOS Simulator,OS=9.1,name=Apple Watch Series 8 (45mm)"
47-
- name: "xcodebuild (iOS 15.2, Xcode 13.2.1)"
48-
os: macos-11
49-
xcode-version: "13.2.1"
50-
sdk: iphonesimulator15.2
51-
destination: "platform=iOS Simulator,OS=15.2,name=iPhone 13"
52-
- name: "xcodebuild (tvOS 15.2, Xcode 13.2.1)"
53-
os: macos-11
54-
xcode-version: "13.2.1"
55-
sdk: appletvsimulator15.2
56-
destination: "platform=tvOS Simulator,OS=15.2,name=Apple TV"
57-
- name: "xcodebuild (macOS 12.1, Xcode 13.2.1)"
58-
os: macos-11
59-
xcode-version: "13.2.1"
60-
sdk: macosx12.1
61-
destination: "platform=OS X"
62-
- name: "xcodebuild (watchOS 8.3, Xcode 13.2.1)"
63-
os: macos-11
64-
xcode-version: "13.2.1"
65-
sdk: watchos8.3
66-
destination: "platform=watchOS Simulator,OS=8.3,name=Apple Watch Series 7 - 45mm"
67-
- name: "xcodebuild (iOS 14.0, Xcode 12.0.1)"
68-
os: macos-10.15
69-
xcode-version: "12"
70-
sdk: iphonesimulator14.0
71-
destination: "platform=iOS Simulator,OS=14.0,name=iPhone 11"
72-
- name: "xcodebuild (tvOS 14.0, Xcode 12.0.1)"
73-
os: macos-10.15
74-
xcode-version: "12"
75-
sdk: appletvsimulator14.0
76-
destination: "platform=tvOS Simulator,OS=14.0,name=Apple TV"
77-
- name: "xcodebuild (macOS 10.15, Xcode 12.0.1)"
78-
os: macos-10.15
79-
xcode-version: "12"
80-
sdk: macosx10.15
81-
destination: "platform=OS X"
82-
- name: "xcodebuild (watchOS 7.0, Xcode 12.0.1)"
83-
os: macos-10.15
84-
xcode-version: "12"
85-
sdk: watchos7.0
86-
destination: "platform=watchOS Simulator,OS=7.0,name=Apple Watch Series 6 - 44mm"
42+
- name: "xcodebuild (watchOS 10.5, Xcode 15.4)"
43+
os: macos-14
44+
xcode-version: "15.4"
45+
sdk: watchsimulator10.5
46+
destination: "platform=watchOS Simulator,OS=10.5,name=Apple Watch Series 9 (45mm)"
8747
steps:
8848
- uses: actions/checkout@v3
8949
- name: Select Xcode Version
@@ -103,12 +63,8 @@ jobs:
10363
strategy:
10464
matrix:
10565
include:
106-
- os: macos-10.15
107-
xcode-version: "12"
108-
- os: macos-11
109-
xcode-version: "13.2.1"
110-
- os: macos-12
111-
xcode-version: "14.2"
66+
- os: macos-14
67+
xcode-version: "15.4"
11268
steps:
11369
- uses: actions/checkout@v3
11470
- name: Select Xcode Version
@@ -121,7 +77,7 @@ jobs:
12177
strategy:
12278
matrix:
12379
include:
124-
- os: ubuntu-22.04
80+
- os: ubuntu-24.04
12581
steps:
12682
- uses: actions/checkout@v3
12783
- name: Build

Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// swift-tools-version:5.3
1+
// swift-tools-version:5.9
22
import PackageDescription
33

44
let package = Package(
55
name: "geos",
6-
platforms: [.iOS(.v9), .macOS("10.9"), .tvOS(.v9), .watchOS(.v2)],
6+
platforms: [.iOS(.v12), .macOS(.v10_13), .tvOS(.v12), .watchOS(.v4)],
77
products: [
88
.library(
99
name: "geos",
@@ -20,5 +20,5 @@ let package = Package(
2020
.headerSearchPath("include"),
2121
.headerSearchPath("src/deps")])
2222
],
23-
cxxLanguageStandard: .cxx11
23+
cxxLanguageStandard: .cxx14
2424
)

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ it in your Swift or Objective-C project. It is commonly used via
1313

1414
## Requirements
1515

16-
* iOS 9.0+, macOS 10.9+, tvOS 9.0+, watchOS 2.0+ (Swift Package Manager, CocoaPods)
16+
* iOS 12.0+, macOS 10.13+, tvOS 12.0+, watchOS 4.0+ (Swift Package Manager, CocoaPods)
1717
* Linux (Swift Package Manager)
1818

1919
> GEOS is licensed under LGPL 2.1 and its compatibility with static linking is
2020
at least controversial. Use of geos without dynamic linking is discouraged.
2121

2222
## Upstream Version
2323

24-
GEOSwift/geos 8.1.0 packages [libgeos/geos](https://github.com/libgeos/geos) 3.11.2
24+
GEOSwift/geos 9.0.0 packages [libgeos/geos](https://github.com/libgeos/geos) 3.13.0
2525

2626
## Installing with CocoaPods
2727

@@ -36,7 +36,7 @@ GEOSwift/geos 8.1.0 packages [libgeos/geos](https://github.com/libgeos/geos) 3.1
3636

3737
1. Update the top-level dependencies in your `Package.swift` to include:
3838

39-
.package(url: "https://github.com/GEOSwift/geos.git", from: "8.1.0")
39+
.package(url: "https://github.com/GEOSwift/geos.git", from: "9.0.0")
4040

4141
2. Update the target dependencies in your `Package.swift` to include
4242

0 commit comments

Comments
 (0)