diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml deleted file mode 100644 index 712462b..0000000 --- a/.github/workflows/build-test.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Build & Test - -on: - push: - branches: - - master - pull_request: - -jobs: - - build: - - runs-on: macOS-latest - - steps: - - name: Checkout Repository - uses: actions/checkout@v3 - - 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' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 86dce83..5bdf601 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,8 +13,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-wkt-ios.xcworkspace -scheme sf-wkt-ios -destination 'platform=iOS Simulator,OS=latest,name=iPhone 14' + run: swift build + - name: Test + run: swift test \ No newline at end of file diff --git a/.gitignore b/.gitignore index 2384951..0b7626a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ Pods xcuserdata/ *.swp Carthage/ +.build/ \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index abedaa7..9860db1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,10 @@ Adheres to [Semantic Versioning](http://semver.org/). --- -## 2.1.5 (TBD) - -* TBD +## 3.0.0 (5-6-2025) +* Breaking changes for Swift interopability. Converted C `enum` types to Objective-C `NS_ENUM` for proper visibility in Swift. +* SimpleFeatures (sf-ios) 5.0.0 with NS_ENUM support for Objective-C and Swift interoperability. +* Adds Swift Package Manager (SPM) support and removes Cocoapods and Carthage ## [2.1.4](https://github.com/ngageoint/simple-features-wkt-ios/releases/tag/2.1.4) (04-08-2024) diff --git a/Cartfile b/Cartfile deleted file mode 100644 index e69de29..0000000 diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index e69de29..0000000 diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..4bc9f38 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,15 @@ +{ + "originHash" : "d2d9973597ce4fa8ad140762a1b8a340830f1004e00b0d72b609a362cde8b853", + "pins" : [ + { + "identity" : "simple-features-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ngageoint/simple-features-ios", + "state" : { + "branch" : "psolt/v5-NS_ENUM_Package", + "revision" : "7672b0950afa0fe7d9b26b5b369c33161b13b387" + } + } + ], + "version" : 3 +} diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..17c59dd --- /dev/null +++ b/Package.swift @@ -0,0 +1,49 @@ +// swift-tools-version: 5.10 + +import PackageDescription + +let package = Package( + name: "SimpleFeaturesWKT", + platforms: [.macOS(.v11), .iOS(.v13)], + products: [ + .library( + name: "SimpleFeaturesWKT", + targets: ["SimpleFeaturesWKT"]), + ], + dependencies: [ + .package(url: "https://github.com/ngageoint/simple-features-ios", branch: "psolt/v5-NS_ENUM_Package"), + // FIXME: Update to published release (5.0.0 version) + ], + targets: [ + .target( + name: "SimpleFeaturesWKT", + dependencies: [ + .product(name: "SimpleFeatures", package: "simple-features-ios") + ], + path: "sf-wkt-ios", + publicHeadersPath: "include" + ), + .testTarget( + name: "SimpleFeaturesWKTTests", + dependencies: [ + "SimpleFeaturesWKT", + "TestUtils" + ], + path: "sf-wkt-iosTests" + ), + .testTarget( + name: "SimpleFeaturesWKTTestsSwift", + dependencies: [ + "SimpleFeaturesWKT", + "TestUtils" + ], + path: "sf-wkt-iosTests-swift" + ), + .target( + name: "TestUtils", // Shared test code + dependencies: ["SimpleFeaturesWKT"], + path: "TestUtils", + publicHeadersPath: "" + ), + ] +) diff --git a/Podfile b/Podfile deleted file mode 100644 index fb9e5c2..0000000 --- a/Podfile +++ /dev/null @@ -1,10 +0,0 @@ -source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '12.0' - -target 'sf-wkt-ios' do - pod 'sf-ios', '~> 4.1.4' - - target 'sf-wkt-iosTests' do - inherit! :search_paths - end -end diff --git a/README.md b/README.md index 39a12c2..891f7ad 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ View the latest [Appledoc](http://ngageoint.github.io/simple-features-wkt-ios/do // NSString *text = ... SFGeometry *geometry = [SFWTGeometryReader readGeometryWithText:text]; -enum SFGeometryType geometryType = geometry.geometryType; +SFGeometryType geometryType = geometry.geometryType; ``` @@ -40,43 +40,48 @@ NSString *text = [SFWTGeometryWriter writeGeometry:geometry]; ### Build ### -[![Build & Test](https://github.com/ngageoint/simple-features-wkt-ios/workflows/Build%20&%20Test/badge.svg)](https://github.com/ngageoint/simple-features-wkt-ios/actions/workflows/build-test.yml) +[![Build](https://github.com/ngageoint/simple-features-wkt-ios/actions/workflows/build.yml/badge.svg)](https://github.com/ngageoint/simple-features-wkt-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-wkt-ios.xcworkspace in Xcode or build from command line: +Open the Swift Package in Xcode: - xcodebuild -workspace 'sf-wkt-ios.xcworkspace' -scheme sf-wkt-ios build + open Package.swift Run tests from Xcode or from command line: - xcodebuild test -workspace 'sf-wkt-ios.xcworkspace' -scheme sf-wkt-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-wkt-ios): + .package(url: "https://github.com/ngageoint/simple-features-wkt-ios", from: "3.0.0"), - pod 'sf-wkt-ios', '~> 2.1.4' + # Or specific branch: -Pull from GitHub: + .package(url: "https://github.com/ngageoint/simple-features-wkt-ios", branch: "release/3.0.0"), + + # Or as a local dependency: - pod 'sf-wkt-ios', :git => 'https://github.com/ngageoint/simple-features-wkt-ios.git', :branch => 'master' - pod 'sf-wkt-ios', :git => 'https://github.com/ngageoint/simple-features-wkt-ios.git', :tag => '2.1.4' + .package(name: "simple-features-wkt-ios", path: "../simple-features-wkt-ios"), -Include as local project: +Use it in a target: - pod 'sf-wkt-ios', :path => '../simple-features-wkt-ios' + .target( + name: "MyLibrary", + dependencies: [ + .product(name: "SimpleFeaturesWKT", package: "simple-features-wkt-ios") + ] + ) ### Swift ### -To use from Swift, import the sf-wkt-ios bridging header from the Swift project's bridging header +To use from Swift, import the framework: - #import "sf-wkt-ios-Bridging-Header.h" + import SimpleFeaturesWKT #### Read #### diff --git a/sf-wkt-iosTests/SFWTGeometryTestUtils.h b/TestUtils/SFWTGeometryTestUtils.h similarity index 97% rename from sf-wkt-iosTests/SFWTGeometryTestUtils.h rename to TestUtils/SFWTGeometryTestUtils.h index 7019a6a..7fe63c1 100644 --- a/sf-wkt-iosTests/SFWTGeometryTestUtils.h +++ b/TestUtils/SFWTGeometryTestUtils.h @@ -6,11 +6,8 @@ // Copyright © 2020 NGA. All rights reserved. // -#import "SFMultiPoint.h" -#import "SFCircularString.h" -#import "SFCompoundCurve.h" -#import "SFTIN.h" -#import "SFTriangle.h" +@import Foundation; +@import SimpleFeatures; @interface SFWTGeometryTestUtils : NSObject diff --git a/sf-wkt-iosTests/SFWTGeometryTestUtils.m b/TestUtils/SFWTGeometryTestUtils.m similarity index 98% rename from sf-wkt-iosTests/SFWTGeometryTestUtils.m rename to TestUtils/SFWTGeometryTestUtils.m index c252c51..5ceb5a6 100644 --- a/sf-wkt-iosTests/SFWTGeometryTestUtils.m +++ b/TestUtils/SFWTGeometryTestUtils.m @@ -6,10 +6,11 @@ // Copyright © 2020 NGA. All rights reserved. // +@import XCTest; +@import SimpleFeaturesWKT; + #import "SFWTGeometryTestUtils.h" #import "SFWTTestUtils.h" -#import "SFWTGeometryWriter.h" -#import "SFWTGeometryReader.h" @implementation SFWTGeometryTestUtils @@ -62,7 +63,7 @@ +(void) compareGeometriesWithExpected: (SFGeometry *) expected andActual: (SFGeo }else{ [SFWTTestUtils assertNotNil:actual]; - enum SFGeometryType geometryType = expected.geometryType; + SFGeometryType geometryType = expected.geometryType; switch(geometryType){ case SF_GEOMETRY: [NSException raise:@"Unexpected Geometry Type" format:@"Unexpected Geometry Type of %@ which is abstract", [SFGeometryTypes name:geometryType]]; @@ -118,7 +119,7 @@ +(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]; } } @@ -126,7 +127,7 @@ +(void) compareGeometriesWithExpected: (SFGeometry *) expected andActual: (SFGeo } +(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]; } @@ -317,7 +318,7 @@ +(SFGeometry *) readGeometryWithText: (NSString *) text andValidateZM: (BOOL) va SFTextReader *reader = [[SFTextReader alloc] initWithText:text]; SFWTGeometryTypeInfo *geometryTypeInfo = [SFWTGeometryReader readGeometryTypeWithReader:reader]; - enum SFGeometryType expectedGeometryType = [geometryTypeInfo geometryType]; + SFGeometryType expectedGeometryType = [geometryTypeInfo geometryType]; switch (expectedGeometryType) { case SF_MULTICURVE: case SF_MULTISURFACE: @@ -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]; diff --git a/sf-wkt-iosTests/SFWTTestUtils.h b/TestUtils/SFWTTestUtils.h similarity index 96% rename from sf-wkt-iosTests/SFWTTestUtils.h rename to TestUtils/SFWTTestUtils.h index 51d118a..92ba260 100644 --- a/sf-wkt-iosTests/SFWTTestUtils.h +++ b/TestUtils/SFWTTestUtils.h @@ -6,7 +6,7 @@ // Copyright © 2020 NGA. All rights reserved. // -#import +@import Foundation; @interface SFWTTestUtils : NSObject diff --git a/sf-wkt-iosTests/SFWTTestUtils.m b/TestUtils/SFWTTestUtils.m similarity index 100% rename from sf-wkt-iosTests/SFWTTestUtils.m rename to TestUtils/SFWTTestUtils.m diff --git a/docs/release.txt b/docs/release.txt index 545f164..e8b10fd 100644 --- a/docs/release.txt +++ b/docs/release.txt @@ -5,7 +5,7 @@ xcodebuild -workspace 'sf-wkt-ios.xcworkspace' -scheme sf-wkt-ios build Xcode Test: -xcodebuild test -workspace 'sf-wkt-ios.xcworkspace' -scheme sf-wkt-ios -destination 'platform=iOS Simulator,name=iPhone 15' +xcodebuild test -workspace 'sf-wkt-ios.xcworkspace' -scheme sf-wkt-ios -destination 'platform=iOS Simulator,name=iPhone 16' CocoaPods Local Lint: diff --git a/sf-wkt-ios.podspec b/sf-wkt-ios.podspec deleted file mode 100644 index b1e5a83..0000000 --- a/sf-wkt-ios.podspec +++ /dev/null @@ -1,21 +0,0 @@ -Pod::Spec.new do |s| - s.name = 'sf-wkt-ios' - s.version = '2.1.5' - s.license = {:type => 'MIT', :file => 'LICENSE' } - s.summary = 'iOS SDK for Simple Features Well-Known Text' - s.homepage = 'https://github.com/ngageoint/simple-features-wkt-ios' - s.authors = { 'NGA' => '', 'BIT Systems' => '', 'Brian Osborn' => 'bosborn@caci.com' } - s.social_media_url = 'https://twitter.com/NGA_GEOINT' - s.source = { :git => 'https://github.com/ngageoint/simple-features-wkt-ios.git', :tag => s.version } - s.requires_arc = true - s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } - - s.platform = :ios, '12.0' - s.ios.deployment_target = '12.0' - - s.source_files = 'sf-wkt-ios/**/*.{h,m}' - - s.frameworks = 'Foundation' - - s.dependency 'sf-ios', '~> 4.1.4' -end diff --git a/sf-wkt-ios.xcodeproj/project.pbxproj b/sf-wkt-ios.xcodeproj/project.pbxproj deleted file mode 100644 index 609c813..0000000 --- a/sf-wkt-ios.xcodeproj/project.pbxproj +++ /dev/null @@ -1,624 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 54; - objects = { - -/* 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 */; }; - 0485564D24D9A32C00810C6D /* SFWTGeometryTypeInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 0485564B24D9A32C00810C6D /* SFWTGeometryTypeInfo.m */; }; - 0485565024D9AD9000810C6D /* SFWTGeometryReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0485564E24D9AD9000810C6D /* SFWTGeometryReader.h */; }; - 0485565124D9AD9000810C6D /* SFWTGeometryReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 0485564F24D9AD9000810C6D /* SFWTGeometryReader.m */; }; - 0485565424D9ADC300810C6D /* SFWTGeometryWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 0485565224D9ADC300810C6D /* SFWTGeometryWriter.h */; }; - 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 */ - -/* Begin PBXContainerItemProxy section */ - 042FC6581B963FE500549A4B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 042FC6421B963FE500549A4B /* Project object */; - proxyType = 1; - remoteGlobalIDString = 042FC64A1B963FE500549A4B; - remoteInfo = "sf-wkt-ios"; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXFileReference section */ - 042FC64B1B963FE500549A4B /* sf_wkt_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = sf_wkt_ios.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 042FC64F1B963FE500549A4B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 042FC6561B963FE500549A4B /* sf_wkt_iosTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = sf_wkt_iosTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 042FC65C1B963FE500549A4B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 042FC69E1B96421E00549A4B /* sf-wkt-ios-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sf-wkt-ios-Prefix.pch"; sourceTree = ""; }; - 042FC6D41B96453E00549A4B /* sf_wkt_ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sf_wkt_ios.h; sourceTree = ""; }; - 0472B51A1C03590500496B87 /* sf-wkt-ios-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sf-wkt-ios-Bridging-Header.h"; sourceTree = ""; }; - 0485564A24D9A32C00810C6D /* SFWTGeometryTypeInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFWTGeometryTypeInfo.h; sourceTree = ""; }; - 0485564B24D9A32C00810C6D /* SFWTGeometryTypeInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFWTGeometryTypeInfo.m; sourceTree = ""; }; - 0485564E24D9AD9000810C6D /* SFWTGeometryReader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFWTGeometryReader.h; sourceTree = ""; }; - 0485564F24D9AD9000810C6D /* SFWTGeometryReader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFWTGeometryReader.m; sourceTree = ""; }; - 0485565224D9ADC300810C6D /* SFWTGeometryWriter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFWTGeometryWriter.h; sourceTree = ""; }; - 0485565324D9ADC300810C6D /* SFWTGeometryWriter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFWTGeometryWriter.m; sourceTree = ""; }; - 0485565624DD6A9F00810C6D /* SFWTTestUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFWTTestUtils.h; sourceTree = ""; }; - 0485565724DD6A9F00810C6D /* SFWTTestUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFWTTestUtils.m; sourceTree = ""; }; - 0485565924DD6C9500810C6D /* SFWTGeometryTestUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFWTGeometryTestUtils.h; sourceTree = ""; }; - 0485565A24DD6C9500810C6D /* SFWTGeometryTestUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFWTGeometryTestUtils.m; sourceTree = ""; }; - 0485565C24DD8B4700810C6D /* SFWTReadmeTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFWTReadmeTest.h; sourceTree = ""; }; - 0485565D24DD8B4700810C6D /* SFWTReadmeTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFWTReadmeTest.m; sourceTree = ""; }; - 0485565F24DDD0F400810C6D /* sf-wkt-iosTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "sf-wkt-iosTests-Bridging-Header.h"; sourceTree = ""; }; - 0485566024DDD0F500810C6D /* SFWTSwiftReadmeTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFWTSwiftReadmeTest.swift; sourceTree = ""; }; - 0485566224DDEF7300810C6D /* SFWTTestCase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFWTTestCase.m; sourceTree = ""; }; - 0493A59D2AE94176000B75E6 /* sf_wkt_ios.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = sf_wkt_ios.swift; sourceTree = ""; }; - 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 = ""; }; - 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 = ""; }; - 499642A447440D35F38311C9 /* libPods-sf-wkt-iosTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-sf-wkt-iosTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 6179C77188B4A0E8D4DEDBEB /* Pods-sf-wkt-iosTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sf-wkt-iosTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-sf-wkt-iosTests/Pods-sf-wkt-iosTests.debug.xcconfig"; sourceTree = ""; }; - B17E59AE80997CC09DD740D6 /* Pods-sf-wkt-iosTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-sf-wkt-iosTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-sf-wkt-iosTests/Pods-sf-wkt-iosTests.release.xcconfig"; sourceTree = ""; }; - F9A70C9172FC5893F17C0FB6 /* libPods-sf-wkt-ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-sf-wkt-ios.a"; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 042FC6471B963FE500549A4B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - B4B9C5C590F6D09B45DC2BDB /* libPods-sf-wkt-ios.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 042FC6531B963FE500549A4B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 042FC6571B963FE500549A4B /* sf_wkt_ios.framework in Frameworks */, - B5D94958E350F092F31540ED /* libPods-sf-wkt-iosTests.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 042FC6411B963FE500549A4B = { - isa = PBXGroup; - children = ( - 042FC64D1B963FE500549A4B /* sf-wkt-ios */, - 042FC65A1B963FE500549A4B /* sf-wkt-iosTests */, - 042FC64C1B963FE500549A4B /* Products */, - 987AE7974D8B4ECED7B3FB6B /* Pods */, - 63206AE083C9F99B2058A9EE /* Frameworks */, - ); - sourceTree = ""; - }; - 042FC64C1B963FE500549A4B /* Products */ = { - isa = PBXGroup; - children = ( - 042FC64B1B963FE500549A4B /* sf_wkt_ios.framework */, - 042FC6561B963FE500549A4B /* sf_wkt_iosTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 042FC64D1B963FE500549A4B /* sf-wkt-ios */ = { - isa = PBXGroup; - children = ( - 042FC6D41B96453E00549A4B /* sf_wkt_ios.h */, - 0493A59D2AE94176000B75E6 /* sf_wkt_ios.swift */, - 0485564E24D9AD9000810C6D /* SFWTGeometryReader.h */, - 0485564F24D9AD9000810C6D /* SFWTGeometryReader.m */, - 0485564A24D9A32C00810C6D /* SFWTGeometryTypeInfo.h */, - 0485564B24D9A32C00810C6D /* SFWTGeometryTypeInfo.m */, - 0485565224D9ADC300810C6D /* SFWTGeometryWriter.h */, - 0485565324D9ADC300810C6D /* SFWTGeometryWriter.m */, - 042FC69E1B96421E00549A4B /* sf-wkt-ios-Prefix.pch */, - 042FC64E1B963FE500549A4B /* Supporting Files */, - 0472B51A1C03590500496B87 /* sf-wkt-ios-Bridging-Header.h */, - ); - path = "sf-wkt-ios"; - sourceTree = ""; - }; - 042FC64E1B963FE500549A4B /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 042FC64F1B963FE500549A4B /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - 042FC65A1B963FE500549A4B /* sf-wkt-iosTests */ = { - isa = PBXGroup; - children = ( - 042FC65B1B963FE500549A4B /* Supporting Files */, - 0485565C24DD8B4700810C6D /* SFWTReadmeTest.h */, - 0485565D24DD8B4700810C6D /* SFWTReadmeTest.m */, - 0485566024DDD0F500810C6D /* SFWTSwiftReadmeTest.swift */, - 0485565F24DDD0F400810C6D /* sf-wkt-iosTests-Bridging-Header.h */, - 0485566224DDEF7300810C6D /* SFWTTestCase.m */, - 0485565624DD6A9F00810C6D /* SFWTTestUtils.h */, - 0485565724DD6A9F00810C6D /* SFWTTestUtils.m */, - 0485565924DD6C9500810C6D /* SFWTGeometryTestUtils.h */, - 0485565A24DD6C9500810C6D /* SFWTGeometryTestUtils.m */, - ); - path = "sf-wkt-iosTests"; - sourceTree = ""; - }; - 042FC65B1B963FE500549A4B /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 042FC65C1B963FE500549A4B /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - 63206AE083C9F99B2058A9EE /* Frameworks */ = { - isa = PBXGroup; - children = ( - 499642A447440D35F38311C9 /* libPods-sf-wkt-iosTests.a */, - F9A70C9172FC5893F17C0FB6 /* libPods-sf-wkt-ios.a */, - ); - name = Frameworks; - sourceTree = ""; - }; - 987AE7974D8B4ECED7B3FB6B /* Pods */ = { - isa = PBXGroup; - children = ( - 6179C77188B4A0E8D4DEDBEB /* Pods-sf-wkt-iosTests.debug.xcconfig */, - B17E59AE80997CC09DD740D6 /* Pods-sf-wkt-iosTests.release.xcconfig */, - 457018C9103A514A78925D9E /* Pods-sf-wkt-ios.debug.xcconfig */, - 192D9E5452A64EB6A7955A5A /* Pods-sf-wkt-ios.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 042FC6481B963FE500549A4B /* Headers */ = { - 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 */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 042FC64A1B963FE500549A4B /* sf-wkt-ios */ = { - isa = PBXNativeTarget; - buildConfigurationList = 042FC6611B963FE500549A4B /* Build configuration list for PBXNativeTarget "sf-wkt-ios" */; - buildPhases = ( - 61CC2D3C723ED627843718C0 /* [CP] Check Pods Manifest.lock */, - 042FC6461B963FE500549A4B /* Sources */, - 042FC6471B963FE500549A4B /* Frameworks */, - 042FC6481B963FE500549A4B /* Headers */, - 042FC6491B963FE500549A4B /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "sf-wkt-ios"; - productName = "sf-wkt-ios"; - productReference = 042FC64B1B963FE500549A4B /* sf_wkt_ios.framework */; - productType = "com.apple.product-type.framework"; - }; - 042FC6551B963FE500549A4B /* sf-wkt-iosTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 042FC6641B963FE500549A4B /* Build configuration list for PBXNativeTarget "sf-wkt-iosTests" */; - buildPhases = ( - A047BB626AE642B283582B82 /* [CP] Check Pods Manifest.lock */, - 042FC6521B963FE500549A4B /* Sources */, - 042FC6531B963FE500549A4B /* Frameworks */, - 042FC6541B963FE500549A4B /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 042FC6591B963FE500549A4B /* PBXTargetDependency */, - ); - name = "sf-wkt-iosTests"; - productName = "sf-wkt-iosTests"; - productReference = 042FC6561B963FE500549A4B /* sf_wkt_iosTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 042FC6421B963FE500549A4B /* Project object */ = { - isa = PBXProject; - attributes = { - BuildIndependentTargetsInParallel = YES; - LastUpgradeCheck = 1500; - ORGANIZATIONNAME = NGA; - TargetAttributes = { - 042FC64A1B963FE500549A4B = { - CreatedOnToolsVersion = 6.4; - LastSwiftMigration = 1500; - }; - 042FC6551B963FE500549A4B = { - CreatedOnToolsVersion = 6.4; - LastSwiftMigration = 1160; - }; - }; - }; - buildConfigurationList = 042FC6451B963FE500549A4B /* Build configuration list for PBXProject "sf-wkt-ios" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 042FC6411B963FE500549A4B; - productRefGroup = 042FC64C1B963FE500549A4B /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 042FC64A1B963FE500549A4B /* sf-wkt-ios */, - 042FC6551B963FE500549A4B /* sf-wkt-iosTests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 042FC6491B963FE500549A4B /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 042FC6541B963FE500549A4B /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 61CC2D3C723ED627843718C0 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-sf-wkt-ios-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - A047BB626AE642B283582B82 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-sf-wkt-iosTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 042FC6461B963FE500549A4B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 0485565524D9ADC300810C6D /* SFWTGeometryWriter.m in Sources */, - 0485565124D9AD9000810C6D /* SFWTGeometryReader.m in Sources */, - 0485564D24D9A32C00810C6D /* SFWTGeometryTypeInfo.m in Sources */, - 0493A59E2AE94176000B75E6 /* sf_wkt_ios.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 042FC6521B963FE500549A4B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 0485565E24DD8B4700810C6D /* SFWTReadmeTest.m in Sources */, - 0485566324DDEF7300810C6D /* SFWTTestCase.m in Sources */, - 0485565824DD6A9F00810C6D /* SFWTTestUtils.m in Sources */, - 0485565B24DD6C9500810C6D /* SFWTGeometryTestUtils.m in Sources */, - 0485566124DDD0F500810C6D /* SFWTSwiftReadmeTest.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 042FC6591B963FE500549A4B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 042FC64A1B963FE500549A4B /* sf-wkt-ios */; - targetProxy = 042FC6581B963FE500549A4B /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - 042FC65F1B963FE500549A4B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_NAME = ""; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 042FC6601B963FE500549A4B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = ""; - SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - 042FC6621B963FE500549A4B /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 457018C9103A514A78925D9E /* Pods-sf-wkt-ios.debug.xcconfig */; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = ""; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = YES; - INFOPLIST_FILE = "sf-wkt-ios/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; - PRODUCT_NAME = sf_wkt_ios; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - }; - name = Debug; - }; - 042FC6631B963FE500549A4B /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 192D9E5452A64EB6A7955A5A /* Pods-sf-wkt-ios.release.xcconfig */; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = ""; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = YES; - INFOPLIST_FILE = "sf-wkt-ios/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; - PRODUCT_NAME = sf_wkt_ios; - SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; - }; - name = Release; - }; - 042FC6651B963FE500549A4B /* Debug */ = { - 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", - "$(inherited)", - ); - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = "sf-wkt-iosTests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_NAME = sf_wkt_iosTests; - SWIFT_OBJC_BRIDGING_HEADER = "sf-wkt-iosTests/sf-wkt-iosTests-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - }; - name = Debug; - }; - 042FC6661B963FE500549A4B /* Release */ = { - 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", - "$(inherited)", - ); - INFOPLIST_FILE = "sf-wkt-iosTests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_NAME = sf_wkt_iosTests; - SWIFT_OBJC_BRIDGING_HEADER = "sf-wkt-iosTests/sf-wkt-iosTests-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 042FC6451B963FE500549A4B /* Build configuration list for PBXProject "sf-wkt-ios" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 042FC65F1B963FE500549A4B /* Debug */, - 042FC6601B963FE500549A4B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 042FC6611B963FE500549A4B /* Build configuration list for PBXNativeTarget "sf-wkt-ios" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 042FC6621B963FE500549A4B /* Debug */, - 042FC6631B963FE500549A4B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 042FC6641B963FE500549A4B /* Build configuration list for PBXNativeTarget "sf-wkt-iosTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 042FC6651B963FE500549A4B /* Debug */, - 042FC6661B963FE500549A4B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 042FC6421B963FE500549A4B /* Project object */; -} diff --git a/sf-wkt-ios.xcodeproj/xcshareddata/xcschemes/sf-wkt-ios.xcscheme b/sf-wkt-ios.xcodeproj/xcshareddata/xcschemes/sf-wkt-ios.xcscheme deleted file mode 100644 index ff3ee34..0000000 --- a/sf-wkt-ios.xcodeproj/xcshareddata/xcschemes/sf-wkt-ios.xcscheme +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sf-wkt-ios/Info.plist b/sf-wkt-ios/Info.plist deleted file mode 100644 index ae6787f..0000000 --- a/sf-wkt-ios/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - - - diff --git a/sf-wkt-ios/SFWTGeometryReader.m b/sf-wkt-ios/SFWTGeometryReader.m index e8e3389..5d7318d 100644 --- a/sf-wkt-ios/SFWTGeometryReader.m +++ b/sf-wkt-ios/SFWTGeometryReader.m @@ -6,7 +6,7 @@ // Copyright © 2020 NGA. All rights reserved. // -#import "SFWTGeometryReader.h" +#import @interface SFWTGeometryReader() @@ -68,7 +68,7 @@ -(SFGeometry *) readWithFilter: (NSObject *) filter andExpecte return [self readWithFilter:filter inType:SF_NONE andExpectedType:expectedType]; } --(SFGeometry *) readWithFilter: (NSObject *) filter inType: (enum SFGeometryType) containingType andExpectedType: (Class) expectedType{ +-(SFGeometry *) readWithFilter: (NSObject *) filter inType: (SFGeometryType) containingType andExpectedType: (Class) expectedType{ SFGeometry *geometry = nil; @@ -77,7 +77,7 @@ -(SFGeometry *) readWithFilter: (NSObject *) filter inType: (e if(geometryTypeInfo != nil){ - enum SFGeometryType geometryType = [geometryTypeInfo geometryType]; + SFGeometryType geometryType = [geometryTypeInfo geometryType]; BOOL hasZ = [geometryTypeInfo hasZ]; BOOL hasM = [geometryTypeInfo hasM]; @@ -167,7 +167,7 @@ -(SFWTGeometryTypeInfo *) readGeometryType{ BOOL hasM = NO; // Determine the geometry type - enum SFGeometryType geometryType = [SFGeometryTypes fromName:geometryTypeValue]; + SFGeometryType geometryType = [SFGeometryTypes fromName:geometryTypeValue]; // If not found, check if the geometry type has Z and/or M suffix if (geometryType == SF_NONE) { @@ -702,7 +702,7 @@ +(SFGeometry *) readGeometryWithReader: (SFTextReader *) reader andFilter: (NSOb return [self readGeometryWithReader:reader andFilter:filter inType:SF_NONE andExpectedType:expectedType]; } -+(SFGeometry *) readGeometryWithReader: (SFTextReader *) reader andFilter: (NSObject *) filter inType: (enum SFGeometryType) containingType andExpectedType: (Class) expectedType{ ++(SFGeometry *) readGeometryWithReader: (SFTextReader *) reader andFilter: (NSObject *) filter inType: (SFGeometryType) containingType andExpectedType: (Class) expectedType{ SFWTGeometryReader *geometryReader = [[SFWTGeometryReader alloc] initWithReader:reader]; return [geometryReader readWithFilter:filter inType:containingType andExpectedType:expectedType]; } @@ -950,7 +950,7 @@ +(BOOL) isCommaOrRightParenthesis: (SFTextReader *) reader{ * geometry or null * @return true if passes filter */ -+(BOOL) filter: (NSObject *) filter geometry: (SFGeometry *) geometry inType: (enum SFGeometryType) containingType{ ++(BOOL) filter: (NSObject *) filter geometry: (SFGeometry *) geometry inType: (SFGeometryType) containingType{ return filter == nil || geometry == nil || [filter filterGeometry:geometry inType:containingType]; } diff --git a/sf-wkt-ios/SFWTGeometryTypeInfo.m b/sf-wkt-ios/SFWTGeometryTypeInfo.m index 29169e8..dff5da1 100644 --- a/sf-wkt-ios/SFWTGeometryTypeInfo.m +++ b/sf-wkt-ios/SFWTGeometryTypeInfo.m @@ -6,14 +6,14 @@ // Copyright © 2020 NGA. All rights reserved. // -#import "SFWTGeometryTypeInfo.h" +#import @interface SFWTGeometryTypeInfo() /** * Geometry type */ -@property (nonatomic) enum SFGeometryType geometryType; +@property (nonatomic) SFGeometryType geometryType; /** * Has Z values flag @@ -29,7 +29,7 @@ @interface SFWTGeometryTypeInfo() @implementation SFWTGeometryTypeInfo --(instancetype) initWithType: (enum SFGeometryType) geometryType andHasZ: (BOOL) hasZ andHasM: (BOOL) hasM{ +-(instancetype) initWithType: (SFGeometryType) geometryType andHasZ: (BOOL) hasZ andHasM: (BOOL) hasM{ self = [super init]; if(self != nil){ self.geometryType = geometryType; @@ -39,7 +39,7 @@ -(instancetype) initWithType: (enum SFGeometryType) geometryType andHasZ: (BOOL) return self; } --(enum SFGeometryType) geometryType{ +-(SFGeometryType) geometryType{ return _geometryType; } diff --git a/sf-wkt-ios/SFWTGeometryWriter.m b/sf-wkt-ios/SFWTGeometryWriter.m index 9c652cc..ebd2428 100644 --- a/sf-wkt-ios/SFWTGeometryWriter.m +++ b/sf-wkt-ios/SFWTGeometryWriter.m @@ -6,7 +6,7 @@ // Copyright © 2020 NGA. All rights reserved. // -#import "SFWTGeometryWriter.h" +#import @interface SFWTGeometryWriter() @@ -69,7 +69,7 @@ -(void) write: (SFGeometry *) geometry{ [_text appendString:@" "]; } - enum SFGeometryType geometryType = geometry.geometryType; + SFGeometryType geometryType = geometry.geometryType; switch (geometryType) { @@ -121,13 +121,13 @@ -(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]; } } -(NSString *) name: (SFGeometry *) geometry{ - enum SFGeometryType type = geometry.geometryType; + SFGeometryType type = geometry.geometryType; if(![geometry isEmpty]){ switch (type){ case SF_MULTILINESTRING: diff --git a/sf-wkt-ios/SFWTGeometryReader.h b/sf-wkt-ios/include/SimpleFeaturesWKT/SFWTGeometryReader.h similarity index 97% rename from sf-wkt-ios/SFWTGeometryReader.h rename to sf-wkt-ios/include/SimpleFeaturesWKT/SFWTGeometryReader.h index b95a301..c16a8eb 100644 --- a/sf-wkt-ios/SFWTGeometryReader.h +++ b/sf-wkt-ios/include/SimpleFeaturesWKT/SFWTGeometryReader.h @@ -6,16 +6,9 @@ // 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 "SFWTGeometryTypeInfo.h" -#import "SFGeometryFilter.h" +#import +#import +#import /** * Well Known Text reader @@ -127,7 +120,7 @@ * * @return geometry */ --(SFGeometry *) readWithFilter: (NSObject *) filter inType: (enum SFGeometryType) containingType andExpectedType: (Class) expectedType; +-(SFGeometry *) readWithFilter: (NSObject *) filter inType: (SFGeometryType) containingType andExpectedType: (Class) expectedType; /** * Read the geometry type info @@ -480,7 +473,7 @@ * * @return geometry */ -+(SFGeometry *) readGeometryWithReader: (SFTextReader *) reader andFilter: (NSObject *) filter inType: (enum SFGeometryType) containingType andExpectedType: (Class) expectedType; ++(SFGeometry *) readGeometryWithReader: (SFTextReader *) reader andFilter: (NSObject *) filter inType: (SFGeometryType) containingType andExpectedType: (Class) expectedType; /** * Read the geometry type info diff --git a/sf-wkt-ios/SFWTGeometryTypeInfo.h b/sf-wkt-ios/include/SimpleFeaturesWKT/SFWTGeometryTypeInfo.h similarity index 73% rename from sf-wkt-ios/SFWTGeometryTypeInfo.h rename to sf-wkt-ios/include/SimpleFeaturesWKT/SFWTGeometryTypeInfo.h index 46e589f..d844665 100644 --- a/sf-wkt-ios/SFWTGeometryTypeInfo.h +++ b/sf-wkt-ios/include/SimpleFeaturesWKT/SFWTGeometryTypeInfo.h @@ -6,8 +6,8 @@ // Copyright © 2020 NGA. All rights reserved. // -#import "SFGeometryTypes.h" - +#import +#import /** * Geometry type info */ @@ -23,14 +23,14 @@ * @param hasM * has m */ --(instancetype) initWithType: (enum SFGeometryType) geometryType andHasZ: (BOOL) hasZ andHasM: (BOOL) hasM; +-(instancetype) initWithType: (SFGeometryType) geometryType andHasZ: (BOOL) hasZ andHasM: (BOOL) hasM; /** * Get the geometry type * * @return geometry type */ --(enum SFGeometryType) geometryType; +-(SFGeometryType) geometryType; /** * Has z values diff --git a/sf-wkt-ios/SFWTGeometryWriter.h b/sf-wkt-ios/include/SimpleFeaturesWKT/SFWTGeometryWriter.h similarity index 97% rename from sf-wkt-ios/SFWTGeometryWriter.h rename to sf-wkt-ios/include/SimpleFeaturesWKT/SFWTGeometryWriter.h index 7396835..a317da0 100644 --- a/sf-wkt-ios/SFWTGeometryWriter.h +++ b/sf-wkt-ios/include/SimpleFeaturesWKT/SFWTGeometryWriter.h @@ -6,13 +6,8 @@ // 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 +#import /** * Well Known Text writer diff --git a/sf-wkt-ios/sf_wkt_ios.h b/sf-wkt-ios/include/SimpleFeaturesWKT/SimpleFeaturesWKT.h similarity index 51% rename from sf-wkt-ios/sf_wkt_ios.h rename to sf-wkt-ios/include/SimpleFeaturesWKT/SimpleFeaturesWKT.h index ca24feb..e9d6e02 100644 --- a/sf-wkt-ios/sf_wkt_ios.h +++ b/sf-wkt-ios/include/SimpleFeaturesWKT/SimpleFeaturesWKT.h @@ -1,5 +1,5 @@ // -// sf-wkt-ios.h +// SimpleFeaturesWKT.h // sf-wkt-ios // // Created by Brian Osborn on 7/16/20. @@ -9,5 +9,8 @@ #ifndef sf_wkt_ios_sf_wkt_ios_h #define sf_wkt_ios_sf_wkt_ios_h +#import +#import +#import #endif diff --git a/sf-wkt-ios/sf-wkt-ios-Bridging-Header.h b/sf-wkt-ios/sf-wkt-ios-Bridging-Header.h deleted file mode 100644 index dab3083..0000000 --- a/sf-wkt-ios/sf-wkt-ios-Bridging-Header.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// sf-wkt-ios-Bridging-Header.h -// sf-wkt-ios -// -// Created by Brian Osborn on 7/16/20. -// Copyright © 2020 NGA. All rights reserved. -// - -#ifndef sf_wkt_ios_Bridging_Header_h -#define sf_wkt_ios_Bridging_Header_h - -#import "sf-ios-Bridging-Header.h" -#import "sf_wkt_ios.h" -#import "SFWTGeometryReader.h" -#import "SFWTGeometryTypeInfo.h" -#import "SFWTGeometryWriter.h" - -#endif /* sf_wkt_ios_Bridging_Header_h */ diff --git a/sf-wkt-ios/sf-wkt-ios-Prefix.pch b/sf-wkt-ios/sf-wkt-ios-Prefix.pch deleted file mode 100644 index fbe8d11..0000000 --- a/sf-wkt-ios/sf-wkt-ios-Prefix.pch +++ /dev/null @@ -1,6 +0,0 @@ -// -// Prefix header -// -// The contents of this file are implicitly included at the beginning of every source file. -// - diff --git a/sf-wkt-ios/sf_wkt_ios.swift b/sf-wkt-ios/sf_wkt_ios.swift deleted file mode 100644 index ad75a8a..0000000 --- a/sf-wkt-ios/sf_wkt_ios.swift +++ /dev/null @@ -1,9 +0,0 @@ -// -// sf_wkt_ios.swift -// sf-wkt-ios -// -// Created by Brian Osborn on 10/25/23. -// Copyright © 2023 NGA. All rights reserved. -// - -import Foundation diff --git a/sf-wkt-iosTests/SFWTSwiftReadmeTest.swift b/sf-wkt-iosTests-swift/SFWTSwiftReadmeTest.swift similarity index 92% rename from sf-wkt-iosTests/SFWTSwiftReadmeTest.swift rename to sf-wkt-iosTests-swift/SFWTSwiftReadmeTest.swift index 1088188..7ba4319 100644 --- a/sf-wkt-iosTests/SFWTSwiftReadmeTest.swift +++ b/sf-wkt-iosTests-swift/SFWTSwiftReadmeTest.swift @@ -7,6 +7,9 @@ // import XCTest +import SimpleFeatures +import SimpleFeaturesWKT +import TestUtils /** * README example tests @@ -39,7 +42,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 } diff --git a/sf-wkt-iosTests/Info.plist b/sf-wkt-iosTests/Info.plist deleted file mode 100644 index ba72822..0000000 --- a/sf-wkt-iosTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/sf-wkt-iosTests/SFWTReadmeTest.h b/sf-wkt-iosTests/SFWTReadmeTest.h index e548e45..dfdc3a0 100644 --- a/sf-wkt-iosTests/SFWTReadmeTest.h +++ b/sf-wkt-iosTests/SFWTReadmeTest.h @@ -6,10 +6,10 @@ // Copyright © 2020 NGA. All rights reserved. // -#import +@import XCTest; /** - * README example tests + * README.md example tests */ @interface SFWTReadmeTest : XCTestCase diff --git a/sf-wkt-iosTests/SFWTReadmeTest.m b/sf-wkt-iosTests/SFWTReadmeTest.m index cf56849..2412e89 100644 --- a/sf-wkt-iosTests/SFWTReadmeTest.m +++ b/sf-wkt-iosTests/SFWTReadmeTest.m @@ -7,10 +7,9 @@ // #import "SFWTReadmeTest.h" -#import "SFWTTestUtils.h" -#import "SFWTGeometryReader.h" -#import "SFWTGeometryWriter.h" -#import "SFWTGeometryTestUtils.h" +@import SimpleFeatures; +@import SimpleFeaturesWKT; +@import TestUtils; @implementation SFWTReadmeTest @@ -45,7 +44,7 @@ -(SFGeometry *) readTester: (NSString *) text{ // NSString *text = ... SFGeometry *geometry = [SFWTGeometryReader readGeometryWithText:text]; - enum SFGeometryType geometryType = geometry.geometryType; +// SFGeometryType geometryType = geometry.geometryType; return geometry; } diff --git a/sf-wkt-iosTests/SFWTTestCase.m b/sf-wkt-iosTests/SFWTTestCase.m index 7e98ce0..457361a 100644 --- a/sf-wkt-iosTests/SFWTTestCase.m +++ b/sf-wkt-iosTests/SFWTTestCase.m @@ -6,12 +6,10 @@ // Copyright © 2020 NGA. All rights reserved. // -#import -#import "SFWTTestUtils.h" -#import "SFWTGeometryTestUtils.h" -#import "SFExtendedGeometryCollection.h" -#import "SFPointFiniteFilter.h" -#import "SFWTGeometryReader.h" +@import XCTest; +@import SimpleFeatures; +@import SimpleFeaturesWKT; +@import TestUtils; @interface SFWTTestCase : XCTestCase @@ -96,7 +94,7 @@ -(void) testMultiCurveWithLineStrings{ SFGeometry *geometry = [SFWTGeometryTestUtils readGeometryWithText:text]; [SFWTTestUtils assertTrue:[geometry isKindOfClass:[SFGeometryCollection class]]]; - [SFWTTestUtils assertEqualIntWithValue:geometry.geometryType andValue2:SF_GEOMETRYCOLLECTION]; + XCTAssertEqual(geometry.geometryType, SF_GEOMETRYCOLLECTION); SFGeometryCollection *multiCurve = (SFGeometryCollection *) geometry; [SFWTTestUtils assertEqualIntWithValue:2 andValue2:[multiCurve numGeometries]]; SFGeometry *geometry1 = [multiCurve geometryAtIndex:0]; @@ -115,7 +113,7 @@ -(void) testMultiCurveWithLineStrings{ [SFWTTestUtils assertEqualDoubleWithValue:44.2390383216843 andValue2:[point2.y doubleValue] andDelta:0.0000000000001]; SFExtendedGeometryCollection *extendedMultiCurve = [SFExtendedGeometryCollection extendedGeometryCollectionWithGeometryCollection:multiCurve]; - [SFWTTestUtils assertEqualIntWithValue:SF_MULTICURVE andValue2:extendedMultiCurve.geometryType]; + XCTAssertEqual(SF_MULTICURVE, extendedMultiCurve.geometryType); [self geometryTester:extendedMultiCurve withCompare:multiCurve andDelta:0.000000000001]; @@ -136,7 +134,7 @@ -(void) testMultiCurveWithCompoundCurve{ SFGeometry *geometry = [SFWTGeometryTestUtils readGeometryWithText:text]; [SFWTTestUtils assertTrue:[geometry isKindOfClass:[SFGeometryCollection class]]]; - [SFWTTestUtils assertEqualIntWithValue:geometry.geometryType andValue2:SF_GEOMETRYCOLLECTION]; + XCTAssertEqual(geometry.geometryType, SF_GEOMETRYCOLLECTION); SFGeometryCollection *multiCurve = (SFGeometryCollection *) geometry; [SFWTTestUtils assertEqualIntWithValue:1 andValue2:[multiCurve numGeometries]]; SFGeometry *geometry1 = [multiCurve geometryAtIndex:0]; @@ -156,7 +154,7 @@ -(void) testMultiCurveWithCompoundCurve{ [SFWTTestUtils assertEqualWithValue:[SFPoint pointWithXValue:3451418.006 andYValue:5481808.951] andValue2:[lineString2 pointAtIndex:1]]; SFExtendedGeometryCollection *extendedMultiCurve = [SFExtendedGeometryCollection extendedGeometryCollectionWithGeometryCollection:multiCurve]; - [SFWTTestUtils assertEqualIntWithValue:SF_MULTICURVE andValue2:extendedMultiCurve.geometryType]; + XCTAssertEqual(SF_MULTICURVE, extendedMultiCurve.geometryType); [self geometryTester:extendedMultiCurve withCompare:multiCurve]; @@ -175,7 +173,7 @@ -(void) testMultiCurve{ NSString *text = [SFWTGeometryTestUtils writeTextWithGeometry:multiCurve]; SFExtendedGeometryCollection *extendedMultiCurve = [SFExtendedGeometryCollection extendedGeometryCollectionWithGeometryCollection:multiCurve]; - [SFWTTestUtils assertEqualIntWithValue:SF_MULTICURVE andValue2:extendedMultiCurve.geometryType]; + XCTAssertEqual(SF_MULTICURVE, extendedMultiCurve.geometryType); NSString *extendedText = [SFWTGeometryTestUtils writeTextWithGeometry:extendedMultiCurve]; @@ -187,8 +185,9 @@ -(void) testMultiCurve{ [SFWTTestUtils assertTrue:[geometry1 isKindOfClass:[SFGeometryCollection class]]]; [SFWTTestUtils assertTrue:[geometry2 isKindOfClass:[SFGeometryCollection class]]]; - [SFWTTestUtils assertEqualIntWithValue:SF_GEOMETRYCOLLECTION andValue2:geometry1.geometryType]; - [SFWTTestUtils assertEqualIntWithValue:SF_GEOMETRYCOLLECTION andValue2:geometry2.geometryType]; + XCTAssertEqual(SF_GEOMETRYCOLLECTION, geometry1.geometryType); + XCTAssertEqual(SF_GEOMETRYCOLLECTION, geometry1.geometryType); + [SFWTTestUtils assertEqualWithValue:multiCurve andValue2:geometry1]; [SFWTTestUtils assertEqualWithValue:geometry1 andValue2:geometry2]; @@ -211,8 +210,8 @@ -(void) testMultiSurface{ NSString *text = [SFWTGeometryTestUtils writeTextWithGeometry:multiSurface]; SFExtendedGeometryCollection *extendedMultiSurface = [SFExtendedGeometryCollection extendedGeometryCollectionWithGeometryCollection:multiSurface]; - [SFWTTestUtils assertEqualIntWithValue:SF_MULTISURFACE andValue2:extendedMultiSurface.geometryType]; - + XCTAssertEqual(SF_MULTISURFACE, extendedMultiSurface.geometryType); + NSString *extendedText = [SFWTGeometryTestUtils writeTextWithGeometry:extendedMultiSurface]; [SFWTTestUtils assertTrue:[text hasPrefix:[SFGeometryTypes name:SF_GEOMETRYCOLLECTION]]]; @@ -223,8 +222,8 @@ -(void) testMultiSurface{ [SFWTTestUtils assertTrue:[geometry1 isKindOfClass:[SFGeometryCollection class]]]; [SFWTTestUtils assertTrue:[geometry2 isKindOfClass:[SFGeometryCollection class]]]; - [SFWTTestUtils assertEqualIntWithValue:SF_GEOMETRYCOLLECTION andValue2:geometry1.geometryType]; - [SFWTTestUtils assertEqualIntWithValue:SF_GEOMETRYCOLLECTION andValue2:geometry2.geometryType]; + XCTAssertEqual(SF_GEOMETRYCOLLECTION, geometry1.geometryType); + XCTAssertEqual(SF_GEOMETRYCOLLECTION, geometry2.geometryType); [SFWTTestUtils assertEqualWithValue:multiSurface andValue2:geometry1]; [SFWTTestUtils assertEqualWithValue:geometry1 andValue2:geometry2]; @@ -264,7 +263,7 @@ -(void) testMultiPolygon25{ SFGeometry *geometry = [SFWTGeometryTestUtils readGeometryWithText:text]; [SFWTTestUtils assertTrue:[geometry isKindOfClass:[SFMultiPolygon class]]]; - [SFWTTestUtils assertEqualIntWithValue:SF_MULTIPOLYGON andValue2:geometry.geometryType]; + XCTAssertEqual(SF_MULTIPOLYGON, geometry.geometryType); SFMultiPolygon *multiPolygon = (SFMultiPolygon *) geometry; [SFWTTestUtils assertTrue:multiPolygon.hasZ]; [SFWTTestUtils assertFalse:multiPolygon.hasM]; @@ -554,7 +553,7 @@ +(void) finiteFilterTester: (NSString *) text andFilter: (SFPointFiniteFilter *) [points addObjectsFromArray:[((SFPolygon *) geometry) ringAtIndex:0].points]; break; default: - [SFWTTestUtils fail:[NSString stringWithFormat:@"Unexpected test case: %u", geometry.geometryType]]; + [SFWTTestUtils fail:[NSString stringWithFormat:@"Unexpected test case: %ld", geometry.geometryType]]; } for(SFPoint *point in points){ diff --git a/sf-wkt-iosTests/sf-wkt-iosTests-Bridging-Header.h b/sf-wkt-iosTests/sf-wkt-iosTests-Bridging-Header.h deleted file mode 100644 index 3f033e8..0000000 --- a/sf-wkt-iosTests/sf-wkt-iosTests-Bridging-Header.h +++ /dev/null @@ -1,11 +0,0 @@ -// -// sf-wkt-iosTests-Bridging-Header.h -// sf-wkt-ios -// -// Created by Brian Osborn on 08/07/20. -// Copyright © 2020 NGA. All rights reserved. -// - -#import "sf-wkt-ios-Bridging-Header.h" -#import "SFWTTestUtils.h" -#import "SFWTGeometryTestUtils.h"