diff --git a/.gitignore b/.gitignore index d5340449..c4a4b2de 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,7 @@ playground.xcworkspace # Packages/ # Package.pins .build/ +.swiftpm/ # CocoaPods # diff --git a/Package.swift b/Package.swift index e92db734..b9cbdee9 100644 --- a/Package.swift +++ b/Package.swift @@ -1,10 +1,13 @@ -// swift-tools-version:4.0 +// swift-tools-version:5.0 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription let package = Package( name: "Turf", + platforms: [ + .macOS(.v10_12), .iOS(.v10), .watchOS(.v3), .tvOS(.v12), + ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( @@ -20,9 +23,11 @@ let package = Package( // Targets can depend on other targets in this package, and on products in packages which this package depends on. .target( name: "Turf", - dependencies: []), + dependencies: [], + exclude: ["Info.plist"]), .testTarget( name: "TurfTests", - dependencies: ["Turf"]), + dependencies: ["Turf"], + exclude: ["Info.plist"]), ] ) diff --git a/Sources/Turf/Info.plist b/Sources/Turf/Info.plist index 397899aa..923f5d11 100644 --- a/Sources/Turf/Info.plist +++ b/Sources/Turf/Info.plist @@ -17,7 +17,7 @@ CFBundleShortVersionString 2.0.0 CFBundleVersion - 16 + 17 NSPrincipalClass diff --git a/Tests/TurfTests/Info.plist b/Tests/TurfTests/Info.plist index b250c750..03fc52a0 100644 --- a/Tests/TurfTests/Info.plist +++ b/Tests/TurfTests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 2.0.0 CFBundleVersion - 16 + 17 diff --git a/Turf.podspec b/Turf.podspec index 71428ca3..ace197c3 100644 --- a/Turf.podspec +++ b/Turf.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| # ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # s.name = "Turf" - s.version = "2.0.0-alpha.3" + s.version = "2.0.0-beta.1" s.summary = "Simple spatial analysis." s.description = "A spatial analysis library written in Swift for native iOS, macOS, tvOS, watchOS, and Linux applications, ported from Turf.js." diff --git a/Turf.xcodeproj/project.pbxproj b/Turf.xcodeproj/project.pbxproj index e862777b..b33a3c15 100644 --- a/Turf.xcodeproj/project.pbxproj +++ b/Turf.xcodeproj/project.pbxproj @@ -925,7 +925,7 @@ COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 16; + DYLIB_CURRENT_VERSION = 17; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; INFOPLIST_FILE = Sources/Turf/Info.plist; @@ -948,7 +948,7 @@ COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 16; + DYLIB_CURRENT_VERSION = 17; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; INFOPLIST_FILE = Sources/Turf/Info.plist; @@ -1033,7 +1033,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 16; + CURRENT_PROJECT_VERSION = 17; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1103,7 +1103,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 16; + CURRENT_PROJECT_VERSION = 17; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -1138,7 +1138,7 @@ CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 16; + DYLIB_CURRENT_VERSION = 17; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Sources/Turf/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1159,7 +1159,7 @@ CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 16; + DYLIB_CURRENT_VERSION = 17; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Sources/Turf/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1203,11 +1203,11 @@ buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 16; + CURRENT_PROJECT_VERSION = 17; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = GJZR2MEM28; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 16; + DYLIB_CURRENT_VERSION = 17; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Sources/Turf/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1226,11 +1226,11 @@ buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 16; + CURRENT_PROJECT_VERSION = 17; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = GJZR2MEM28; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 16; + DYLIB_CURRENT_VERSION = 17; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Sources/Turf/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1280,11 +1280,11 @@ APPLICATION_EXTENSION_API_ONLY = YES; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 16; + CURRENT_PROJECT_VERSION = 17; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = GJZR2MEM28; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 16; + DYLIB_CURRENT_VERSION = 17; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Sources/Turf/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1304,11 +1304,11 @@ APPLICATION_EXTENSION_API_ONLY = YES; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 16; + CURRENT_PROJECT_VERSION = 17; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = GJZR2MEM28; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 16; + DYLIB_CURRENT_VERSION = 17; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Sources/Turf/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";