Skip to content

Commit

Permalink
Update to GEOS 3.13.0, Update Apple Platform Deployment Targets, Upda…
Browse files Browse the repository at this point in the history
…te 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
  • Loading branch information
macdrevx authored Sep 28, 2024
1 parent f510e63 commit 4d8af49
Show file tree
Hide file tree
Showing 617 changed files with 34,035 additions and 12,619 deletions.
94 changes: 25 additions & 69 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name: GEOSwift/geos

on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]
branches: [main]

jobs:
podspec:
name: Lint Podspec for ${{ matrix.platform }}
runs-on: macos-12
runs-on: macos-14
strategy:
matrix:
platform: [ios, osx, tvos]
Expand All @@ -24,66 +24,26 @@ 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
- 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.5, Xcode 15.4)"
os: macos-14
xcode-version: "15.4"
sdk: macosx14.5
destination: "platform=OS X"
- name: "xcodebuild (watchOS 9.1, Xcode 14.2)"
os: macos-12
xcode-version: "14.2"
sdk: watchsimulator9.1
destination: "platform=watchOS Simulator,OS=9.1,name=Apple Watch Series 8 (45mm)"
- 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
destination: "platform=OS X"
- name: "xcodebuild (watchOS 8.3, Xcode 13.2.1)"
os: macos-11
xcode-version: "13.2.1"
sdk: watchos8.3
destination: "platform=watchOS Simulator,OS=8.3,name=Apple Watch Series 7 - 45mm"
- name: "xcodebuild (iOS 14.0, Xcode 12.0.1)"
os: macos-10.15
xcode-version: "12"
sdk: iphonesimulator14.0
destination: "platform=iOS Simulator,OS=14.0,name=iPhone 11"
- name: "xcodebuild (tvOS 14.0, Xcode 12.0.1)"
os: macos-10.15
xcode-version: "12"
sdk: appletvsimulator14.0
destination: "platform=tvOS Simulator,OS=14.0,name=Apple TV"
- name: "xcodebuild (macOS 10.15, Xcode 12.0.1)"
os: macos-10.15
xcode-version: "12"
sdk: macosx10.15
destination: "platform=OS X"
- name: "xcodebuild (watchOS 7.0, Xcode 12.0.1)"
os: macos-10.15
xcode-version: "12"
sdk: watchos7.0
destination: "platform=watchOS Simulator,OS=7.0,name=Apple Watch Series 6 - 44mm"
- name: "xcodebuild (watchOS 10.5, Xcode 15.4)"
os: macos-14
xcode-version: "15.4"
sdk: watchsimulator10.5
destination: "platform=watchOS Simulator,OS=10.5,name=Apple Watch Series 9 (45mm)"
steps:
- uses: actions/checkout@v3
- name: Select Xcode Version
Expand All @@ -103,12 +63,8 @@ jobs:
strategy:
matrix:
include:
- os: macos-10.15
xcode-version: "12"
- os: macos-11
xcode-version: "13.2.1"
- os: macos-12
xcode-version: "14.2"
- os: macos-14
xcode-version: "15.4"
steps:
- uses: actions/checkout@v3
- name: Select Xcode Version
Expand All @@ -121,7 +77,7 @@ jobs:
strategy:
matrix:
include:
- os: ubuntu-22.04
- os: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- name: Build
Expand Down
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// swift-tools-version:5.3
// swift-tools-version:5.9
import PackageDescription

let package = Package(
name: "geos",
platforms: [.iOS(.v9), .macOS("10.9"), .tvOS(.v9), .watchOS(.v2)],
platforms: [.iOS(.v12), .macOS(.v10_13), .tvOS(.v12), .watchOS(.v4)],
products: [
.library(
name: "geos",
Expand All @@ -20,5 +20,5 @@ let package = Package(
.headerSearchPath("include"),
.headerSearchPath("src/deps")])
],
cxxLanguageStandard: .cxx11
cxxLanguageStandard: .cxx14
)
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ it in your Swift or Objective-C project. It is commonly used via

## Requirements

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

> 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.

## Upstream Version

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

## Installing with CocoaPods

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

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

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

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

Expand Down
Loading

0 comments on commit 4d8af49

Please sign in to comment.