Updated imports from NS_ENUM changes.

Updated tests and fixed warnigns.
Updated github workflow files.

Author: paulsolt-ofsw

.github/workflows/build-test.yml

@@ -18,4 +18,8 @@ jobs:
     - name: Install
       run: pod install
     - name: Build & Test
-      run: xcodebuild test -workspace sf-wkt-ios.xcworkspace -scheme sf-wkt-ios -destination 'platform=iOS Simulator,OS=latest,name=iPhone 14'
+      run: |
+        iphone_names=$(xcrun simctl list devices available --json | jq -r '.devices | to_entries[] | .value[] | select(.name | test("^iPhone [0-9]+")) | .name')
+        latest_iphone=$(echo "$iphone_names" | sort | tail -n 1)
+        echo "latest_iphone: $latest_iphone"
+        xcodebuild test -workspace sf-wkt-ios.xcworkspace -scheme sf-wkt-ios -destination "platform=iOS Simulator,OS=latest,name=$latest_iphone"

.github/workflows/build.yml

@@ -13,8 +13,12 @@ jobs:
 
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Install
       run: pod install
     - name: Build
-      run: xcodebuild build-for-testing -workspace sf-wkt-ios.xcworkspace -scheme sf-wkt-ios -destination 'platform=iOS Simulator,OS=latest,name=iPhone 14'
+      run: |
+        iphone_names=$(xcrun simctl list devices available --json | jq -r '.devices | to_entries[] | .value[] | select(.name | test("^iPhone [0-9]+")) | .name')
+        latest_iphone=$(echo "$iphone_names" | sort | tail -n 1)
+        echo "latest_iphone: $latest_iphone"
+        xcodebuild build-for-testing -workspace sf-wkt-ios.xcworkspace -scheme sf-wkt-ios -destination "platform=iOS Simulator,OS=latest,name=latest_iphone"

sf-wkt-ios.xcodeproj/project.pbxproj

@@ -9,20 +9,18 @@
 /* Begin PBXBuildFile section */
 		042FC6571B963FE500549A4B /* sf_wkt_ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 042FC64B1B963FE500549A4B /* sf_wkt_ios.framework */; };
 		042FC6D31B96421E00549A4B /* sf-wkt-ios-Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 042FC69E1B96421E00549A4B /* sf-wkt-ios-Prefix.pch */; };
-		042FC6D51B96453E00549A4B /* sf_wkt_ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 042FC6D41B96453E00549A4B /* sf_wkt_ios.h */; };
-		0472B51B1C03590500496B87 /* sf-wkt-ios-Bridging-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = 0472B51A1C03590500496B87 /* sf-wkt-ios-Bridging-Header.h */; };
-		0485564C24D9A32C00810C6D /* SFWTGeometryTypeInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0485564A24D9A32C00810C6D /* SFWTGeometryTypeInfo.h */; };
+		042FC6D51B96453E00549A4B /* sf_wkt_ios.h in Headers */ = {isa = PBXBuildFile; fileRef = 042FC6D41B96453E00549A4B /* sf_wkt_ios.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0485564C24D9A32C00810C6D /* SFWTGeometryTypeInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0485564A24D9A32C00810C6D /* SFWTGeometryTypeInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0485564D24D9A32C00810C6D /* SFWTGeometryTypeInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 0485564B24D9A32C00810C6D /* SFWTGeometryTypeInfo.m */; };
-		0485565024D9AD9000810C6D /* SFWTGeometryReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0485564E24D9AD9000810C6D /* SFWTGeometryReader.h */; };
+		0485565024D9AD9000810C6D /* SFWTGeometryReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0485564E24D9AD9000810C6D /* SFWTGeometryReader.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0485565124D9AD9000810C6D /* SFWTGeometryReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 0485564F24D9AD9000810C6D /* SFWTGeometryReader.m */; };
-		0485565424D9ADC300810C6D /* SFWTGeometryWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 0485565224D9ADC300810C6D /* SFWTGeometryWriter.h */; };
+		0485565424D9ADC300810C6D /* SFWTGeometryWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 0485565224D9ADC300810C6D /* SFWTGeometryWriter.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0485565524D9ADC300810C6D /* SFWTGeometryWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 0485565324D9ADC300810C6D /* SFWTGeometryWriter.m */; };
 		0485565824DD6A9F00810C6D /* SFWTTestUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 0485565724DD6A9F00810C6D /* SFWTTestUtils.m */; };
 		0485565B24DD6C9500810C6D /* SFWTGeometryTestUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 0485565A24DD6C9500810C6D /* SFWTGeometryTestUtils.m */; };
 		0485565E24DD8B4700810C6D /* SFWTReadmeTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 0485565D24DD8B4700810C6D /* SFWTReadmeTest.m */; };
 		0485566124DDD0F500810C6D /* SFWTSwiftReadmeTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0485566024DDD0F500810C6D /* SFWTSwiftReadmeTest.swift */; };
 		0485566324DDEF7300810C6D /* SFWTTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 0485566224DDEF7300810C6D /* SFWTTestCase.m */; };
-		0493A59E2AE94176000B75E6 /* sf_wkt_ios.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0493A59D2AE94176000B75E6 /* sf_wkt_ios.swift */; };
 		B4B9C5C590F6D09B45DC2BDB /* libPods-sf-wkt-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F9A70C9172FC5893F17C0FB6 /* libPods-sf-wkt-ios.a */; };
 		B5D94958E350F092F31540ED /* libPods-sf-wkt-iosTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 499642A447440D35F38311C9 /* libPods-sf-wkt-iosTests.a */; };
 /* End PBXBuildFile section */
@@ -44,7 +42,6 @@
 		042FC65C1B963FE500549A4B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		042FC69E1B96421E00549A4B /* sf-wkt-ios-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sf-wkt-ios-Prefix.pch"; sourceTree = "<group>"; };
 		042FC6D41B96453E00549A4B /* sf_wkt_ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sf_wkt_ios.h; sourceTree = "<group>"; };
-		0472B51A1C03590500496B87 /* sf-wkt-ios-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sf-wkt-ios-Bridging-Header.h"; sourceTree = "<group>"; };
 		0485564A24D9A32C00810C6D /* SFWTGeometryTypeInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFWTGeometryTypeInfo.h; sourceTree = "<group>"; };
 		0485564B24D9A32C00810C6D /* SFWTGeometryTypeInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFWTGeometryTypeInfo.m; sourceTree = "<group>"; };
 		0485564E24D9AD9000810C6D /* SFWTGeometryReader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFWTGeometryReader.h; sourceTree = "<group>"; };
@@ -60,7 +57,6 @@
 		0485565F24DDD0F400810C6D /* sf-wkt-iosTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "sf-wkt-iosTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		0485566024DDD0F500810C6D /* SFWTSwiftReadmeTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFWTSwiftReadmeTest.swift; sourceTree = "<group>"; };
 		0485566224DDEF7300810C6D /* SFWTTestCase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFWTTestCase.m; sourceTree = "<group>"; };
-		0493A59D2AE94176000B75E6 /* sf_wkt_ios.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = sf_wkt_ios.swift; sourceTree = "<group>"; };
 		192D9E5452A64EB6A7955A5A /* Pods-sf-wkt-ios.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sf-wkt-ios.release.xcconfig"; path = "Pods/Target Support Files/Pods-sf-wkt-ios/Pods-sf-wkt-ios.release.xcconfig"; sourceTree = "<group>"; };
 		457018C9103A514A78925D9E /* Pods-sf-wkt-ios.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sf-wkt-ios.debug.xcconfig"; path = "Pods/Target Support Files/Pods-sf-wkt-ios/Pods-sf-wkt-ios.debug.xcconfig"; sourceTree = "<group>"; };
 		499642A447440D35F38311C9 /* libPods-sf-wkt-iosTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-sf-wkt-iosTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -114,7 +110,6 @@
 			isa = PBXGroup;
 			children = (
 				042FC6D41B96453E00549A4B /* sf_wkt_ios.h */,
-				0493A59D2AE94176000B75E6 /* sf_wkt_ios.swift */,
 				0485564E24D9AD9000810C6D /* SFWTGeometryReader.h */,
 				0485564F24D9AD9000810C6D /* SFWTGeometryReader.m */,
 				0485564A24D9A32C00810C6D /* SFWTGeometryTypeInfo.h */,
@@ -123,7 +118,6 @@
 				0485565324D9ADC300810C6D /* SFWTGeometryWriter.m */,
 				042FC69E1B96421E00549A4B /* sf-wkt-ios-Prefix.pch */,
 				042FC64E1B963FE500549A4B /* Supporting Files */,
-				0472B51A1C03590500496B87 /* sf-wkt-ios-Bridging-Header.h */,
 			);
 			path = "sf-wkt-ios";
 			sourceTree = "<group>";
@@ -188,12 +182,11 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0472B51B1C03590500496B87 /* sf-wkt-ios-Bridging-Header.h in Headers */,
 				042FC6D51B96453E00549A4B /* sf_wkt_ios.h in Headers */,
 				0485564C24D9A32C00810C6D /* SFWTGeometryTypeInfo.h in Headers */,
 				0485565024D9AD9000810C6D /* SFWTGeometryReader.h in Headers */,
-				042FC6D31B96421E00549A4B /* sf-wkt-ios-Prefix.pch in Headers */,
 				0485565424D9ADC300810C6D /* SFWTGeometryWriter.h in Headers */,
+				042FC6D31B96421E00549A4B /* sf-wkt-ios-Prefix.pch in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -245,7 +238,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1500;
+				LastUpgradeCheck = 1620;
 				ORGANIZATIONNAME = NGA;
 				TargetAttributes = {
 					042FC64A1B963FE500549A4B = {
@@ -341,7 +334,6 @@
 				0485565524D9ADC300810C6D /* SFWTGeometryWriter.m in Sources */,
 				0485565124D9AD9000810C6D /* SFWTGeometryReader.m in Sources */,
 				0485564D24D9A32C00810C6D /* SFWTGeometryTypeInfo.m in Sources */,
-				0493A59E2AE94176000B75E6 /* sf_wkt_ios.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -372,6 +364,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -434,6 +427,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -543,7 +537,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 6179C77188B4A0E8D4DEDBEB /* Pods-sf-wkt-iosTests.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
@@ -570,7 +563,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = B17E59AE80997CC09DD740D6 /* Pods-sf-wkt-iosTests.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",

sf-wkt-ios.xcodeproj/xcshareddata/xcschemes/sf-wkt-ios.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

sf-wkt-ios/SFWTGeometryReader.h

@@ -6,16 +6,8 @@
 //  Copyright © 2020 NGA. All rights reserved.
 //
 
-#import "SFTextReader.h"
-#import "SFMultiPoint.h"
-#import "SFMultiLineString.h"
-#import "SFMultiPolygon.h"
-#import "SFCircularString.h"
-#import "SFCompoundCurve.h"
-#import "SFTIN.h"
-#import "SFTriangle.h"
+@import sf_ios;
 #import "SFWTGeometryTypeInfo.h"
-#import "SFGeometryFilter.h"
 
 /**
  * Well Known Text reader

sf-wkt-ios/SFWTGeometryTypeInfo.h

@@ -6,7 +6,8 @@
 //  Copyright © 2020 NGA. All rights reserved.
 //
 
-#import "SFGeometryTypes.h"
+@import Foundation;
+@import sf_ios;
 
 /**
  * Geometry type info

sf-wkt-ios/SFWTGeometryWriter.h

@@ -6,13 +6,7 @@
 //  Copyright © 2020 NGA. All rights reserved.
 //
 
-#import "SFMultiPoint.h"
-#import "SFMultiLineString.h"
-#import "SFMultiPolygon.h"
-#import "SFCircularString.h"
-#import "SFCompoundCurve.h"
-#import "SFTIN.h"
-#import "SFTriangle.h"
+@import sf_ios;
 
 /**
  * Well Known Text writer

sf-wkt-ios/SFWTGeometryWriter.m

@@ -121,7 +121,7 @@ -(void) write: (SFGeometry *) geometry{
             [self writeTriangle:(SFTriangle *)geometry];
             break;
         default:
-            [NSException raise:@"Geometry Not Supported" format:@"Geometry Type not supported: %d", geometryType];
+            [NSException raise:@"Geometry Not Supported" format:@"Geometry Type not supported: %ld", geometryType];
     }
 
 }

sf-wkt-ios/sf-wkt-ios-Bridging-Header.h

@@ -9,5 +9,8 @@
 #ifndef sf_wkt_ios_sf_wkt_ios_h
 #define sf_wkt_ios_sf_wkt_ios_h
 
+#import "SFWTGeometryReader.h"
+#import "SFWTGeometryTypeInfo.h"
+#import "SFWTGeometryWriter.h"
 
 #endif

sf-wkt-ios/sf_wkt_ios.h

@@ -6,11 +6,7 @@
 //  Copyright © 2020 NGA. All rights reserved.
 //
 
-#import "SFMultiPoint.h"
-#import "SFCircularString.h"
-#import "SFCompoundCurve.h"
-#import "SFTIN.h"
-#import "SFTriangle.h"
+@import sf_ios;
 
 @interface SFWTGeometryTestUtils : NSObject
 

sf-wkt-ios/sf_wkt_ios.swift

@@ -8,8 +8,9 @@
 
 #import "SFWTGeometryTestUtils.h"
 #import "SFWTTestUtils.h"
-#import "SFWTGeometryWriter.h"
-#import "SFWTGeometryReader.h"
+@import sf_ios;
+@import sf_wkt_ios;
+@import XCTest;
 
 @implementation SFWTGeometryTestUtils
 
@@ -118,15 +119,15 @@ +(void) compareGeometriesWithExpected: (SFGeometry *) expected andActual: (SFGeo
                 [self compareTriangleWithExpected:(SFTriangle *)expected andActual:(SFTriangle *)actual andDelta:delta];
                 break;
             default:
-                [NSException raise:@"Geometry Type Not Supported" format:@"Geometry Type not supported: %d", geometryType];
+                [NSException raise:@"Geometry Type Not Supported" format:@"Geometry Type not supported: %ld", geometryType];
         }
     }
 
     //[SFWTTestUtils assertEqualWithValue:expected andValue2:actual];
 }
 
 +(void) compareBaseGeometryAttributesWithExpected: (SFGeometry *) expected andActual: (SFGeometry *) actual{
-    [SFWTTestUtils assertEqualIntWithValue:expected.geometryType andValue2:actual.geometryType];
+    XCTAssertEqual(expected.geometryType, actual.geometryType);
     [SFWTTestUtils assertEqualBoolWithValue:expected.hasZ andValue2:actual.hasZ];
     [SFWTTestUtils assertEqualBoolWithValue:expected.hasM andValue2:actual.hasM];
 }
@@ -326,7 +327,7 @@ +(SFGeometry *) readGeometryWithText: (NSString *) text andValidateZM: (BOOL) va
         default:
             break;
     }
-    [SFWTTestUtils assertEqualIntWithValue:expectedGeometryType andValue2:geometry.geometryType];
+    XCTAssertEqual(expectedGeometryType, geometry.geometryType);
     if(validateZM){
         [SFWTTestUtils assertEqualBoolWithValue:[geometryTypeInfo hasZ] andValue2:geometry.hasZ];
         [SFWTTestUtils assertEqualBoolWithValue:[geometryTypeInfo hasM] andValue2:geometry.hasM];

sf-wkt-iosTests/SFWTGeometryTestUtils.h

@@ -6,7 +6,7 @@
 //  Copyright © 2020 NGA. All rights reserved.
 //
 
-#import <XCTest/XCTest.h>
+@import XCTest;
 
 /**
  * README example tests

sf-wkt-iosTests/SFWTGeometryTestUtils.m

@@ -8,9 +8,8 @@
 
 #import "SFWTReadmeTest.h"
 #import "SFWTTestUtils.h"
-#import "SFWTGeometryReader.h"
-#import "SFWTGeometryWriter.h"
 #import "SFWTGeometryTestUtils.h"
+@import sf_wkt_ios;
 
 @implementation SFWTReadmeTest
 
@@ -45,7 +44,7 @@ -(SFGeometry *) readTester: (NSString *) text{
     // NSString *text = ...
 
     SFGeometry *geometry = [SFWTGeometryReader readGeometryWithText:text];
-    SFGeometryType geometryType = geometry.geometryType;
+//    SFGeometryType geometryType = geometry.geometryType;
 
     return geometry;
 }

sf-wkt-iosTests/SFWTReadmeTest.h

@@ -7,7 +7,8 @@
 //
 
 import XCTest
-
+import sf_ios
+import sf_wkt_ios
 /**
 * README example tests
 */
@@ -39,7 +40,7 @@ class SFWTSwiftReadmeTest: XCTestCase{
         // var text: String = ...
 
         let geometry: SFGeometry = SFWTGeometryReader.readGeometry(withText: text)
-        let geometryType: SFGeometryType = geometry.geometryType
+//        let geometryType: SFGeometryType = geometry.geometryType
 
         return geometry
     }