diff --git a/.travis.yml b/.travis.yml index 608bf4d..ebb98c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,11 +17,9 @@ env: - DESTINATION="OS=12.2,name=iPhone XS" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="YES" - DESTINATION="OS=11.4,name=iPhone X" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="NO" - DESTINATION="OS=10.3.1,name=iPhone 7" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="NO" - - DESTINATION="OS=9.3,name=iPhone 5S" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="NO" - - DESTINATION="OS=8.4,name=iPhone 5" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" POD_LINT="NO" - DESTINATION="arch=x86_64" SCHEME="$MACOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="NO" - - DESTINATION="OS=12.0,name=Apple TV 4K" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="NO" - - DESTINATION="OS=5.0,name=Apple Watch Series 4 - 44mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" POD_LINT="NO" + - DESTINATION="OS=12.2,name=Apple TV 4K" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="NO" + - DESTINATION="OS=5.2,name=Apple Watch Series 4 - 44mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" POD_LINT="NO" before_install: - gem update bundler diff --git a/CHANGELOG.md b/CHANGELOG.md index 49d5ac2..c6a38f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,13 @@ All notable changes to this project will be documented in this file. `Elevate` adheres to [Semantic Versioning](http://semver.org/). +#### 4.x Releases + +* `4.0.x` Releases = [4.0.0](#400) + #### 3.x Releases +* `3.1.x` Releases = [3.1.0](#310) * `3.0.x` Releases = [3.0.0](#300) | [3.0.1](#301) | [3.0.2](#302) #### 2.x Releases @@ -20,6 +25,21 @@ All notable changes to this project will be documented in this file. --- +## [4.0.0](https://github.com/Nike-Inc/Elevate/releases/tag/4.0.0) + +Released on 2019-04-30. All issues associated with this milestone can be found using this +[filter](https://github.com/Nike-Inc/Elevate/milestone/8?closed=1). + +#### Updated + +- Dropped Swift 4.2 Support +- ios depoyment target updated to 10.0 +- macOS deployment target updated to 10.12 +- tvOS deployment target updated to 10.0 +- watchOS deployment target update to 3.0 +- Updated by [Dmitri Fuerle](https://github.com/dfuerle) in Pull Request +[#38](https://github.com/Nike-Inc/Elevate/pull/38). + ## [3.1.0](https://github.com/Nike-Inc/Elevate/releases/tag/3.1.0) Released on 2019-04-30. All issues associated with this milestone can be found using this diff --git a/Elevate.podspec b/Elevate.podspec index 96df1a4..69a6faa 100644 --- a/Elevate.podspec +++ b/Elevate.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Elevate" - s.version = "3.1.0" + s.version = "4.0.0" s.summary = "Elevate is a JSON parsing framework that leverages Swift to make parsing simple, reliable and composable." s.homepage = "https://github.com/Nike-Inc/Elevate" s.license = "MIT" @@ -8,10 +8,10 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/Nike-Inc/Elevate.git", :tag => s.version } s.source_files = "Source/*.swift" - s.swift_versions = ["4.2", "5.0"] + s.swift_version = "5.0" - s.ios.deployment_target = "8.0" - s.osx.deployment_target = "10.11" - s.tvos.deployment_target = "9.0" - s.watchos.deployment_target = "2.0" + s.ios.deployment_target = "10.0" + s.osx.deployment_target = "10.12" + s.tvos.deployment_target = "10.0" + s.watchos.deployment_target = "3.0" end diff --git a/Elevate.xcodeproj/project.pbxproj b/Elevate.xcodeproj/project.pbxproj index b715887..aa19318 100644 --- a/Elevate.xcodeproj/project.pbxproj +++ b/Elevate.xcodeproj/project.pbxproj @@ -166,7 +166,6 @@ E99C82031B55E3380090FA56 /* DecodableTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DecodableTests.swift; sourceTree = ""; }; E99C82061B55E5B50090FA56 /* ParserTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParserTests.swift; sourceTree = ""; }; E9CDF95F1D7F833200639059 /* Elevate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Elevate.swift; sourceTree = ""; }; - F6D1E6A62278C7D000D4C674 /* Package@swift-4.2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Package@swift-4.2.swift"; sourceTree = ""; }; FC79DCD71DCD2EDC0081379C /* RootObjectTest.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = RootObjectTest.json; sourceTree = ""; }; /* End PBXFileReference section */ @@ -269,7 +268,6 @@ 4CA7AB9F1F5604DD004CE3F3 /* Elevate.podspec */, 4CA7ABA01F5604DD004CE3F3 /* LICENSE */, 4CA7AB981F560466004CE3F3 /* Package.swift */, - F6D1E6A62278C7D000D4C674 /* Package@swift-4.2.swift */, ); name = Deployment; sourceTree = ""; @@ -998,18 +996,18 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACOSX_DEPLOYMENT_TARGET = 10.10; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 10.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; + WATCHOS_DEPLOYMENT_TARGET = 3.0; }; name = Debug; }; @@ -1056,18 +1054,18 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACOSX_DEPLOYMENT_TARGET = 10.10; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 10.0; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; + WATCHOS_DEPLOYMENT_TARGET = 3.0; }; name = Release; }; diff --git a/Package@swift-4.2.swift b/Package@swift-4.2.swift deleted file mode 100644 index 26c2c20..0000000 --- a/Package@swift-4.2.swift +++ /dev/null @@ -1,41 +0,0 @@ -// swift-tools-version:4.2 -// -// Package@swift-4.2.swift -// -// Copyright (c) 2015-present Nike, Inc. (https://www.nike.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// - -import PackageDescription - -let package = Package( - name: "Elevate", - products: [ - .library( - name: "Elevate", - targets: ["Elevate"]) - ], - targets: [ - .target( - name: "Elevate", - path: "Source") - ], - swiftLanguageVersions: [.v4_2] -) diff --git a/README.md b/README.md index 6b70eed..f80525e 100644 --- a/README.md +++ b/README.md @@ -22,9 +22,9 @@ Elevate is a JSON parsing framework that leverages Swift to make parsing simple, ## Requirements -- iOS 8.0+ / macOS 10.10+ / tvOS 9.0+ / watchOS 2.0+ -- Xcode 9.3+ -- Swift 4.2+ +- iOS 10.0+ / macOS 10.12+ / tvOS 10.0+ / watchOS 3.0+ +- Xcode 10.2+ +- Swift 5.0+ ## Communication diff --git a/Source/Info.plist b/Source/Info.plist index 543e5f9..1bcfa6d 100644 --- a/Source/Info.plist +++ b/Source/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.1.0 + 4.0.0 CFBundleSignature ???? CFBundleVersion