Merge pull request #14 from ngageoint/psolt/package

Adds Swift Package Manager Support and Update NS_ENUM (SimpleFeatures 5.0.0) for Swift Interoperability.

Author: paulsolt-ofsw

.github/workflows/build-test.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches-ignore:
       - master
+  pull_request:
 
 jobs:
 
@@ -13,8 +14,8 @@ jobs:
 
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v3
-    - name: Install
-      run: pod install
+      uses: actions/checkout@v4
     - name: Build
-      run: xcodebuild build-for-testing -workspace sf-wkb-ios.xcworkspace -scheme sf-wkb-ios -destination 'platform=iOS Simulator,OS=latest,name=iPhone 14'
+      run: swift build
+    - name: Test
+      run: swift test

.github/workflows/build.yml

@@ -5,3 +5,4 @@ Pods
 xcuserdata/
 *.swp
 Carthage/
+.build/

.gitignore

@@ -4,9 +4,11 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## 4.1.5 (TBD)
+## 5.0.0 (6-4-2025) 
 
-* TBD
+* Adds Swift Package support and removes Cocoapods support (since it's deprecated). 
+* Integrates sf-ios 5.0.0 (SimpleFeatures) breaking code chanegs for NS_ENUM.  
+* Updates existing enums to NS_ENUM for Swift for Objective-C interoperability. 
 
 ## [4.1.4](https://github.com/ngageoint/simple-features-wkb-ios/releases/tag/4.1.4) (04-08-2024)
 

CHANGELOG.md

@@ -0,0 +1,48 @@
+// swift-tools-version: 5.10
+
+import PackageDescription
+
+let package = Package(
+    name: "SimpleFeaturesWKB",
+    platforms: [.macOS(.v11), .iOS(.v13)],
+    products: [
+        .library(
+            name: "SimpleFeaturesWKB",
+            targets: ["SimpleFeaturesWKB"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ngageoint/simple-features-ios", from: "5.0.0"),
+    ],
+    targets: [
+        .target(
+            name: "SimpleFeaturesWKB",
+            dependencies: [
+                .product(name: "SimpleFeatures", package: "simple-features-ios")
+            ],
+            path: "sf-wkb-ios",
+            publicHeadersPath: "include"
+        ),
+        .testTarget(
+            name: "SimpleFeaturesWKBTests",
+            dependencies: [
+                "SimpleFeaturesWKB",
+                "TestUtils"
+            ],
+            path: "sf-wkb-iosTests"
+        ),
+        .testTarget(
+            name: "SimpleFeaturesWKBTestsSwift",
+            dependencies: [
+                "SimpleFeaturesWKB",
+                "TestUtils"
+            ],
+            path: "sf-wkb-iosTests-swift"
+        ),
+        .target(
+            name: "TestUtils", // Shared test code
+            dependencies: ["SimpleFeaturesWKB"],
+            path: "TestUtils",
+            publicHeadersPath: ""
+        ),
+    ]
+)

Cartfile

@@ -24,7 +24,7 @@ View the latest [Appledoc](http://ngageoint.github.io/simple-features-wkb-ios/do
 // NSData *data = ...
 
 SFGeometry *geometry = [SFWBGeometryReader readGeometryWithData:data];
-enum SFGeometryType geometryType = geometry.geometryType;
+SFGeometryType geometryType = geometry.geometryType;
 
 ```
 
@@ -40,44 +40,49 @@ NSData *data = [SFWBGeometryWriter writeGeometry:geometry];
 
 ### Build ###
 
-[![Build & Test](https://github.com/ngageoint/simple-features-wkb-ios/workflows/Build%20&%20Test/badge.svg)](https://github.com/ngageoint/simple-features-wkb-ios/actions/workflows/build-test.yml)
+[![Build](https://github.com/ngageoint/simple-features-wkb-ios/actions/workflows/build.yml/badge.svg)](https://github.com/ngageoint/simple-features-wkb-ios/actions/workflows/build.yml)
 
-Build this repository using Xcode and/or CocoaPods:
+Build this repository using SPM:
 
-    pod repo update
-    pod install
+    swift build
 
-Open sf-wkb-ios.xcworkspace in Xcode or build from command line:
+Open the Swift Package in Xcode:
 
-    xcodebuild -workspace 'sf-wkb-ios.xcworkspace' -scheme sf-wkb-ios build
+    open Package.swift
 
 Run tests from Xcode or from command line:
 
-    xcodebuild test -workspace 'sf-wkb-ios.xcworkspace' -scheme sf-wkb-ios -destination 'platform=iOS Simulator,name=iPhone 15'
+    swift test
 
 ### Include Library ###
 
-Include this repository by specifying it in a Podfile using a supported option.
+Add a package dependency version:
 
-Pull from [CocoaPods](https://cocoapods.org/pods/sf-wkb-ios):
+    .package(url: "https://github.com/ngageoint/simple-features-wkb-ios", from: "5.0.0"),
 
-    pod 'sf-wkb-ios', '~> 4.1.4'
+    # Or specific branch:
 
-Pull from GitHub:
+    .package(url: "https://github.com/ngageoint/simple-features-wkb-ios", branch: "release/5.0.0"),
+    
+    # Or as a local dependency:        
 
-    pod 'sf-wkb-ios', :git => 'https://github.com/ngageoint/simple-features-wkb-ios.git', :branch => 'master'
-    pod 'sf-wkb-ios', :git => 'https://github.com/ngageoint/simple-features-wkb-ios.git', :tag => '4.1.4'
+    .package(name: "simple-features-wkb-ios", path: "../simple-features-wkb-ios"),
 
-Include as local project:
+Use it in a target:
 
-    pod 'sf-wkb-ios', :path => '../simple-features-wkb-ios'
+        .target(
+            name: "MyLibrary",
+            dependencies: [
+                .product(name: "SimpleFeaturesWKB", package: "simple-features-wkb-ios")
+            ]
+        )
 
 ### Swift ###
 
-To use from Swift, import the sf-wkb-ios bridging header from the Swift project's bridging header
-
-    #import "sf-wkb-ios-Bridging-Header.h"
+To use from Swift, import the framework:
 
+    import SimpleFeaturesWKB
+    
 #### Read ####
 
 ```swift