From 005f758c37c95900c4b08daf9fd90232fd4eb95e Mon Sep 17 00:00:00 2001 From: Jeremy Osterhoudt Date: Thu, 4 Apr 2019 12:02:29 -0700 Subject: [PATCH] Swift 5 Support --- DynamicJSON.podspec | 4 +- DynamicJSON.xcodeproj/project.pbxproj | 88 +++++++++++++++---- .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcschemes/DynamicJSON iOS.xcscheme | 2 +- .../xcschemes/DynamicJSON macOS.xcscheme | 2 +- .../xcschemes/DynamicJSON tvOS.xcscheme | 2 +- .../xcschemes/DynamicJSON watchOS.xcscheme | 2 +- .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 README.md | 4 +- Sources/Info-iOS.plist | 2 +- Sources/Info-macOS.plist | 2 +- Sources/Info-tvOS.plist | 2 +- Sources/Info-watchOS.plist | 2 +- 15 files changed, 83 insertions(+), 29 deletions(-) mode change 100644 => 100755 DynamicJSON.podspec mode change 100644 => 100755 DynamicJSON.xcodeproj/project.pbxproj mode change 100644 => 100755 DynamicJSON.xcodeproj/project.xcworkspace/contents.xcworkspacedata mode change 100644 => 100755 DynamicJSON.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist mode change 100644 => 100755 DynamicJSON.xcodeproj/xcshareddata/xcschemes/DynamicJSON iOS.xcscheme mode change 100644 => 100755 DynamicJSON.xcodeproj/xcshareddata/xcschemes/DynamicJSON macOS.xcscheme mode change 100644 => 100755 DynamicJSON.xcodeproj/xcshareddata/xcschemes/DynamicJSON tvOS.xcscheme mode change 100644 => 100755 DynamicJSON.xcodeproj/xcshareddata/xcschemes/DynamicJSON watchOS.xcscheme mode change 100644 => 100755 DynamicJSON.xcworkspace/contents.xcworkspacedata mode change 100644 => 100755 DynamicJSON.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist mode change 100644 => 100755 Sources/Info-iOS.plist mode change 100644 => 100755 Sources/Info-macOS.plist mode change 100644 => 100755 Sources/Info-tvOS.plist mode change 100644 => 100755 Sources/Info-watchOS.plist diff --git a/DynamicJSON.podspec b/DynamicJSON.podspec old mode 100644 new mode 100755 index 35f1352..444266a --- a/DynamicJSON.podspec +++ b/DynamicJSON.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "DynamicJSON" - s.version = "2.0.2" + s.version = "2.1.0" s.license = { :type => "MIT", :file => "LICENSE" } s.summary = "A dynamically typed JSON parser for Swift using the new @dynamicMemberLookup feature" s.description = <<-DESC @@ -12,7 +12,7 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/saoudrizwan/DynamicJSON.git", :tag => s.version } s.documentation_url = "https://github.com/saoudrizwan/DynamicJSON" - s.swift_version = "4.2" + s.swift_version = "5.0" s.ios.deployment_target = "9.0" s.osx.deployment_target = "10.10" s.tvos.deployment_target = "9.0" diff --git a/DynamicJSON.xcodeproj/project.pbxproj b/DynamicJSON.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index c440998..14fd9c8 --- a/DynamicJSON.xcodeproj/project.pbxproj +++ b/DynamicJSON.xcodeproj/project.pbxproj @@ -293,26 +293,27 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1010; - LastUpgradeCheck = 1010; + LastUpgradeCheck = 1020; TargetAttributes = { 103108BD21DC55EB00979FE8 = { CreatedOnToolsVersion = 10.1; - LastSwiftMigration = 1010; + LastSwiftMigration = 1020; }; 103108CB21DC561400979FE8 = { CreatedOnToolsVersion = 10.1; - LastSwiftMigration = 1010; + LastSwiftMigration = 1020; }; 103108D821DC562E00979FE8 = { CreatedOnToolsVersion = 10.1; - LastSwiftMigration = 1010; + LastSwiftMigration = 1020; }; 103108E521DC564900979FE8 = { CreatedOnToolsVersion = 10.1; - LastSwiftMigration = 1010; + LastSwiftMigration = 1020; }; 1031090021DC58B800979FE8 = { CreatedOnToolsVersion = 10.1; + LastSwiftMigration = 1020; }; }; }; @@ -322,6 +323,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 103108B221DC55C500979FE8; productRefGroup = 103108BF21DC55EB00979FE8 /* Products */; @@ -432,6 +434,33 @@ 103108B721DC55C500979FE8 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + 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_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_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; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(PROJECT_NAME)"; }; name = Debug; @@ -439,6 +468,31 @@ 103108B821DC55C500979FE8 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + 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_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_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; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; PRODUCT_NAME = "$(PROJECT_NAME)"; }; name = Release; @@ -475,7 +529,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; @@ -516,7 +570,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -555,7 +609,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; @@ -589,7 +643,7 @@ SKIP_INSTALL = YES; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -670,7 +724,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -744,7 +798,7 @@ SKIP_INSTALL = YES; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -825,7 +879,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; @@ -898,7 +952,7 @@ SKIP_INSTALL = YES; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; @@ -982,7 +1036,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1056,7 +1110,7 @@ SKIP_INSTALL = YES; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1129,7 +1183,7 @@ SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -1194,7 +1248,7 @@ SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; diff --git a/DynamicJSON.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/DynamicJSON.xcodeproj/project.xcworkspace/contents.xcworkspacedata old mode 100644 new mode 100755 diff --git a/DynamicJSON.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/DynamicJSON.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist old mode 100644 new mode 100755 diff --git a/DynamicJSON.xcodeproj/xcshareddata/xcschemes/DynamicJSON iOS.xcscheme b/DynamicJSON.xcodeproj/xcshareddata/xcschemes/DynamicJSON iOS.xcscheme old mode 100644 new mode 100755 index 0907687..136fce9 --- a/DynamicJSON.xcodeproj/xcshareddata/xcschemes/DynamicJSON iOS.xcscheme +++ b/DynamicJSON.xcodeproj/xcshareddata/xcschemes/DynamicJSON iOS.xcscheme @@ -1,6 +1,6 @@

Platform: iOS, macOS, watchOS, tvOS - Language: Swift 4.2 + Language: Swift 5.0 License: MIT

@@ -37,7 +37,7 @@ let username = JSON(data).user.username.string - CocoaPods: ```ruby -pod 'DynamicJSON', '~> 2.0.2' +pod 'DynamicJSON', '~> 2.1.0' ``` *(if you run into problems, `pod repo update` and try again)* diff --git a/Sources/Info-iOS.plist b/Sources/Info-iOS.plist old mode 100644 new mode 100755 index 9e6eebb..21b19d1 --- a/Sources/Info-iOS.plist +++ b/Sources/Info-iOS.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.2 + 2.1.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/Sources/Info-macOS.plist b/Sources/Info-macOS.plist old mode 100644 new mode 100755 index 9e6eebb..21b19d1 --- a/Sources/Info-macOS.plist +++ b/Sources/Info-macOS.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.2 + 2.1.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/Sources/Info-tvOS.plist b/Sources/Info-tvOS.plist old mode 100644 new mode 100755 index 9e6eebb..21b19d1 --- a/Sources/Info-tvOS.plist +++ b/Sources/Info-tvOS.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.2 + 2.1.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/Sources/Info-watchOS.plist b/Sources/Info-watchOS.plist old mode 100644 new mode 100755 index 9e6eebb..21b19d1 --- a/Sources/Info-watchOS.plist +++ b/Sources/Info-watchOS.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.2 + 2.1.0 CFBundleVersion $(CURRENT_PROJECT_VERSION)