Adds Swift Package Manager support

paulsolt-ofsw · paulsolt-ofsw · commit 884977ef4046 · 2025-05-07T14:54:38.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ Pods
 xcuserdata/
 *.swp
 Carthage/
+.build/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,9 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## 4.2.6 (TBD)
+## 5.0.0
 
-* TBD
+* Integrated sf-geojson-ios 5.0.0 (NS_ENUM Interoperability fixes)
 
 ## [4.2.5](https://github.com/ngageoint/ogc-api-features-json-ios/releases/tag/4.2.5) (04-08-2024)
 
diff --git a/Package.resolved b/Package.resolved
@@ -0,0 +1,24 @@
+{
+  "originHash" : "f1fe69523c01f3f616889f74e9def3e9cf39e8a371c1a1909068977abd002349",
+  "pins" : [
+    {
+      "identity" : "simple-features-geojson-ios",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ngageoint/simple-features-geojson-ios",
+      "state" : {
+        "branch" : "psolt/Package",
+        "revision" : "79674f41f5d8be1e39922cf77b45362869bb8113"
+      }
+    },
+    {
+      "identity" : "simple-features-ios",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ngageoint/simple-features-ios",
+      "state" : {
+        "branch" : "psolt/v5-NS_ENUM_Package",
+        "revision" : "0050585703585a94bca5c8530a6c45de10c0293c"
+      }
+    }
+  ],
+  "version" : 3
+}
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,34 @@
+// swift-tools-version: 5.10
+
+import PackageDescription
+
+let package = Package(
+    name: "OGC_APIFeaturesJSON",
+    platforms: [
+        .iOS(.v13), .macOS(.v12)
+    ],
+    products: [
+        .library(
+            name: "OGC_APIFeaturesJSON",
+            targets: ["OGC_APIFeaturesJSON"])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ngageoint/simple-features-geojson-ios", branch: "psolt/Package"), // FIXME: Update to published release (5.0.0 version)
+    ],
+    targets: [
+        .target(
+            name: "OGC_APIFeaturesJSON",
+            dependencies: [
+                .product(name: "SimpleFeaturesGeoJSON", package: "simple-features-geojson-ios")
+            ],
+            path: "ogc-api-features-json-ios"
+        ),
+        .testTarget(
+            name: "OGCAPIFeaturesJSONTests",
+            dependencies: [
+                "OGC_APIFeaturesJSON"
+            ],
+            path: "ogc-api-features-json-iosTests",
+        )
+    ]
+)
diff --git a/ogc-api-features-json-ios/Info.plist b/ogc-api-features-json-ios/Info.plist
diff --git a/ogc-api-features-json-ios/OAFCollection.m b/ogc-api-features-json-ios/OAFCollection.m
@@ -6,8 +6,8 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFCollection.h"
-#import "OAFFeaturesConverter.h"
+#import <OGC_APIFeaturesJSON/OAFCollection.h>
+#import <OGC_APIFeaturesJSON/OAFFeaturesConverter.h>
 
 NSString * const OAF_ID = @"id";
 NSString * const OAF_DESCRIPTION = @"description";
diff --git a/ogc-api-features-json-ios/OAFCollections.m b/ogc-api-features-json-ios/OAFCollections.m
@@ -6,8 +6,8 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFCollections.h"
-#import "OAFFeaturesConverter.h"
+#import <OGC_APIFeaturesJSON/OAFCollections.h>
+#import <OGC_APIFeaturesJSON/OAFFeaturesConverter.h>
 
 NSString * const OAF_COLLECTIONS = @"collections";
 
diff --git a/ogc-api-features-json-ios/OAFCrs.m b/ogc-api-features-json-ios/OAFCrs.m
@@ -6,7 +6,7 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFCrs.h"
+#import <OGC_APIFeaturesJSON/OAFCrs.h>
 
 NSString *const OAF_CRS_PATTERN = @"http.+/([^/]+)/([^/]+)/([^/]+)$";
 int const OAF_CRS_PATTERN_AUTHORITY_GROUP = 1;
diff --git a/ogc-api-features-json-ios/OAFExtent.m b/ogc-api-features-json-ios/OAFExtent.m
@@ -6,8 +6,8 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFExtent.h"
-#import "OAFFeaturesConverter.h"
+#import <OGC_APIFeaturesJSON/OAFExtent.h>
+#import <OGC_APIFeaturesJSON/OAFFeaturesConverter.h>
 
 NSString * const OAF_SPATIAL = @"spatial";
 NSString * const OAF_TEMPORAL = @"temporal";
diff --git a/ogc-api-features-json-ios/OAFFeatureCollection.m b/ogc-api-features-json-ios/OAFFeatureCollection.m
@@ -6,9 +6,10 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFFeatureCollection.h"
-#import "OAFFeaturesConverter.h"
-#import "SFGFeatureConverter.h"
+#import <OGC_APIFeaturesJSON/OAFFeatureCollection.h>
+#import <OGC_APIFeaturesJSON/OAFFeaturesConverter.h>
+
+@import SimpleFeaturesGeoJSON;
 
 NSString * const OAF_LINKS = @"links";
 NSString * const OAF_TIME_STAMP = @"timeStamp";
diff --git a/ogc-api-features-json-ios/OAFFeaturesConverter.m b/ogc-api-features-json-ios/OAFFeaturesConverter.m
@@ -6,8 +6,8 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFFeaturesConverter.h"
-#import "SFGFeatureConverter.h"
+#import <OGC_APIFeaturesJSON/OAFFeaturesConverter.h>
+#import <SimpleFeaturesGeoJSON/SimpleFeaturesGeoJSON.h>
 
 @implementation OAFFeaturesConverter
 
diff --git a/ogc-api-features-json-ios/OAFFeaturesObject.m b/ogc-api-features-json-ios/OAFFeaturesObject.m
@@ -6,8 +6,8 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFFeaturesObject.h"
-#import "SFGOrderedDictionary.h"
+#import <OGC_APIFeaturesJSON/OAFFeaturesObject.h>
+@import SimpleFeaturesGeoJSON;
 
 @implementation OAFFeaturesObject
 
diff --git a/ogc-api-features-json-ios/OAFLink.m b/ogc-api-features-json-ios/OAFLink.m
@@ -6,7 +6,7 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFLink.h"
+#import <OGC_APIFeaturesJSON/OAFLink.h>
 
 NSString * const OAF_HREF = @"href";
 NSString * const OAF_REL = @"rel";
diff --git a/ogc-api-features-json-ios/OAFSpatial.m b/ogc-api-features-json-ios/OAFSpatial.m
@@ -6,7 +6,7 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFSpatial.h"
+#import <OGC_APIFeaturesJSON/OAFSpatial.h>
 
 NSString * const OAF_BBOX = @"bbox";
 NSString * const OAF_CRS = @"crs";
diff --git a/ogc-api-features-json-ios/OAFTemporal.m b/ogc-api-features-json-ios/OAFTemporal.m
@@ -6,7 +6,7 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFTemporal.h"
+#import <OGC_APIFeaturesJSON/OAFTemporal.h>
 
 NSString * const OAF_INTERVAL = @"interval";
 NSString * const OAF_TRS = @"trs";
diff --git a/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFCollection.h b/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFCollection.h
@@ -6,8 +6,8 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFLink.h"
-#import "OAFExtent.h"
+#import <OGC_APIFeaturesJSON/OAFLink.h>
+#import <OGC_APIFeaturesJSON/OAFExtent.h>
 
 /**
  * id property name
diff --git a/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFCollections.h b/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFCollections.h
@@ -6,7 +6,7 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFCollection.h"
+#import <OGC_APIFeaturesJSON/OAFCollection.h>
 
 /**
  * collections property name
diff --git a/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFCrs.h b/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFCrs.h
diff --git a/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFExtent.h b/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFExtent.h
@@ -6,8 +6,8 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFSpatial.h"
-#import "OAFTemporal.h"
+#import <OGC_APIFeaturesJSON/OAFSpatial.h>
+#import <OGC_APIFeaturesJSON/OAFTemporal.h>
 
 /**
  * spatial property name
diff --git a/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFFeatureCollection.h b/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFFeatureCollection.h
@@ -6,8 +6,8 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "SFGFeatureCollection.h"
-#import "OAFLink.h"
+#import <SimpleFeaturesGeoJSON/SimpleFeaturesGeoJSON.h>
+#import <OGC_APIFeaturesJSON/OAFLink.h>
 
 /**
  * Links property name
diff --git a/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFFeaturesConverter.h b/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFFeaturesConverter.h
@@ -6,8 +6,8 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFCollections.h"
-#import "OAFFeatureCollection.h"
+#import <OGC_APIFeaturesJSON/OAFCollections.h>
+#import <OGC_APIFeaturesJSON/OAFFeatureCollection.h>
 
 /**
  * Features Converter
diff --git a/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFFeaturesObject.h b/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFFeaturesObject.h
diff --git a/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFLink.h b/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFLink.h
@@ -6,7 +6,7 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFFeaturesObject.h"
+#import <OGC_APIFeaturesJSON/OAFFeaturesObject.h>
 
 /**
  * href property name
diff --git a/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFSpatial.h b/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFSpatial.h
@@ -6,7 +6,7 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFFeaturesObject.h"
+#import <OGC_APIFeaturesJSON/OAFFeaturesObject.h>
 
 /**
  * bbox property name
diff --git a/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFTemporal.h b/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OAFTemporal.h
@@ -6,7 +6,7 @@
 //  Copyright © 2019 NGA. All rights reserved.
 //
 
-#import "OAFFeaturesObject.h"
+#import <OGC_APIFeaturesJSON/OAFFeaturesObject.h>
 
 /**
  * interval property name
diff --git a/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OGC_APIFeaturesJSON.h b/ogc-api-features-json-ios/include/OGC_APIFeaturesJSON/OGC_APIFeaturesJSON.h
@@ -0,0 +1,23 @@
+//
+//  OGC_APIFeaturesJSON.h
+//  ogc-api-features-json-ios
+//
+//  Created by Brian Osborn on 8/6/19.
+//  Copyright (c) 2019 NGA. All rights reserved.
+//
+
+#ifndef ogc_api_features_json_ios_ogc_api_features_json_ios_h
+#define ogc_api_features_json_ios_ogc_api_features_json_ios_h
+
+#import <OGC_APIFeaturesJSON/OAFCollection.h>
+#import <OGC_APIFeaturesJSON/OAFCollections.h>
+#import <OGC_APIFeaturesJSON/OAFCrs.h>
+#import <OGC_APIFeaturesJSON/OAFExtent.h>
+#import <OGC_APIFeaturesJSON/OAFFeatureCollection.h>
+#import <OGC_APIFeaturesJSON/OAFFeaturesConverter.h>
+#import <OGC_APIFeaturesJSON/OAFFeaturesObject.h>
+#import <OGC_APIFeaturesJSON/OAFLink.h>
+#import <OGC_APIFeaturesJSON/OAFSpatial.h>
+#import <OGC_APIFeaturesJSON/OAFTemporal.h>
+
+#endif
diff --git a/ogc-api-features-json-ios/ogc-api-features-json-ios-Bridging-Header.h b/ogc-api-features-json-ios/ogc-api-features-json-ios-Bridging-Header.h
diff --git a/ogc-api-features-json-ios/ogc-api-features-json-ios-Prefix.pch b/ogc-api-features-json-ios/ogc-api-features-json-ios-Prefix.pch
diff --git a/ogc-api-features-json-ios/ogc_api_features_json_ios.h b/ogc-api-features-json-ios/ogc_api_features_json_ios.h
diff --git a/ogc-api-features-json-ios/ogc_api_features_json_ios.swift b/ogc-api-features-json-ios/ogc_api_features_json_ios.swift
diff --git a/ogc-api-features-json-iosTests/Info.plist b/ogc-api-features-json-iosTests/Info.plist
diff --git a/ogc-api-features-json-iosTests/OAFFeaturesTest.m b/ogc-api-features-json-iosTests/OAFFeaturesTest.m
