Adds Swift Package Manager (SPM) support.

* Fixes flakey tests
* Updated resource loading for proj.db
* Reorganizes files for SPM layout and public headers
* Updates build notes

Author: paulsolt-ofsw

.gitignore

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

CHANGELOG.md

@@ -4,7 +4,10 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## 2.0.4 (TBD)
+
+## 3.0.0
+* Refactored to support Swift Package Manager because Cocoapods are deprecated
+* Restructuring files to better align with SPM format and updating header includes
 
 * TBD
 

Cartfile

@@ -0,0 +1,78 @@
+// swift-tools-version: 5.10
+import PackageDescription
+
+/// Cocoapods to SPM Conversion Notes
+/// * Using name: `proj-ios` causes issues with resource loading in Objective-C with [SWIFTPM_MODULE_BUNDLE pathForResource:resource ofType:type]; (The `-` become `_`)
+/// * Moved `proj.db` into this package since it gets loaded here for actual usage, not in PROJ (Access to resources is limited in SPM vs cocoapods)
+/// * Reorganized headers into include folder and resources into Resources
+
+let package = Package(
+    name: "projections",
+    platforms: [
+        .iOS(.v13), .macOS(.v13)
+    ],
+    products: [
+        .library(
+            name: "projections",
+             type: .static,
+//            type: .dynamic,
+            targets: ["projections"]
+        )
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ngageoint/PROJ.git", branch: "9.4.0_release_spm"),
+//        .package(name: "PROJ", path: "../PROJ"),
+//        .package(url: "https://github.com/ngageoint/PROJ.git", branch: "9.6_release_spm"),
+
+        .package(url: "https://github.com/ngageoint/coordinate-reference-systems-ios.git", branch: "psolt/package"),
+//        .package(name: "coordinate-reference-systems-ios", path: "../coordinate-reference-systems-ios")
+    ],
+
+    targets: [
+        .target(
+            name: "projections",
+            dependencies: [
+                .product(name: "proj", package: "PROJ"),
+                .product(name: "crs-ios", package: "coordinate-reference-systems-ios"),
+            ],
+            path: "proj-ios",
+            exclude: [
+            ],
+            resources: [
+                .copy("Resources/proj.db"),
+                .copy("Resources/projections.ogc.plist"),
+                .copy("Resources/projections.none.plist"),
+                .copy("Resources/projections.epsg.plist")
+            ],
+            publicHeadersPath: "include/Projections"
+        ),
+        .testTarget(
+            name: "proj-iosTests",
+            dependencies: [
+                "projections",
+            ],
+            path: "proj-iosTests",
+            exclude: [
+                "Info.plist",
+            ],
+            sources: ["."],
+            resources: [
+            ],
+            cSettings: [
+//                .headerSearchPath("../include/proj"),
+            ]
+        ),
+        .testTarget(
+            name: "proj-iosTests-swift",
+            dependencies: [
+                "projections",
+            ],
+            path: "proj-iosTests-swift",
+            sources: ["."],
+            resources: [
+            ]
+        ),
+    ]
+)
+
+

Cartfile.resolved

@@ -1,20 +1,14 @@
 
-Xcode Build:
-
-xcodebuild -workspace 'proj-ios.xcworkspace' -scheme proj-ios build
-
-Xcode Test:
-
-xcodebuild test -workspace 'proj-ios.xcworkspace' -scheme proj-ios -destination 'platform=iOS Simulator,name=iPhone 15'
+Swift Build & Test:
 
-CocoaPods Local Lint:
+    swift build
+    swift test
 
-pod lib lint proj-ios.podspec --use-libraries
-
-CocoaPods GitHub Release Lint:
-
-pod spec lint proj-ios.podspec --use-libraries
+Xcode Build:
 
-CocoaPods Deploy To Trunk:
+    open Package.swift
+    Command + B
 
-pod trunk push proj-ios.podspec --use-libraries
+Xcode Test:
+    open Package.swift
+    Command + U

Package.resolved

@@ -7,8 +7,9 @@
 //
 
 #import "PROJCRSParser.h"
-#import "CRSProjParser.h"
-#import "CRSKeyword.h"
+
+@import proj;
+@import crs_ios;
 
 @implementation PROJCRSParser
 

Package.swift

@@ -15,14 +15,24 @@ +(NSString *) propertyListPathWithName: (NSString *) name{
     return [self resourcePathWithName:name andType:PROJ_PROPERTY_LIST_TYPE];
 }
 
-+(NSString *) databasePath{
-    return [self resourcePathWithName:[NSString stringWithFormat:@"%@/%@", PROJ_BUNDLE_NAME, PROJ_DATABASE_NAME] andType:PROJ_DATABASE_TYPE];
++(NSString *) databasePath {
+    NSString *path = [self resourcePathWithName:PROJ_DATABASE_NAME andType:PROJ_DATABASE_TYPE];
+    return path;
 }
 
 +(NSString *) resourcePathWithName: (NSString *) name andType: (NSString *) type{
+   
+//    NSString *resource = [NSString stringWithFormat:@"%@/%@", PROJ_IOS_BUNDLE_NAME, name];
+    
+    // FIXME: Test this in an app to see if it works properly, then just use name if that's true. We're not loading from the proj.bundle anymore (Remove that reference)
+    NSString *resource = name;
 
-    NSString *resource = [NSString stringWithFormat:@"%@/%@", PROJ_IOS_BUNDLE_NAME, name];
     NSString *resourcePath = [[NSBundle mainBundle] pathForResource:resource ofType:type];
+    
+    if (!resourcePath) {
+        resourcePath = [SWIFTPM_MODULE_BUNDLE pathForResource:resource ofType:type];
+    }
+    
     if(resourcePath == nil){
         resourcePath = [[NSBundle bundleForClass:[self class]] pathForResource:resource ofType:type];
         if(resourcePath == nil){