From f7bba466fd0c9f59be04c2ca06908e698add9aa0 Mon Sep 17 00:00:00 2001 From: Peter Zignego Date: Tue, 23 Jan 2018 19:04:34 -0500 Subject: [PATCH 1/2] Swift 4 tools --- Package.swift | 14 ++++++--- Podfile | 6 ++-- README.md | 6 ++-- SKClient.podspec | 31 ++++++++++--------- SKClient.xcodeproj/project.pbxproj | 26 +++++++++++----- .../xcschemes/SKClient iOS.xcscheme | 4 ++- .../xcschemes/SKClient macOS.xcscheme | 4 ++- .../xcschemes/SKClient tvOS.xcscheme | 4 ++- Supporting Files/Info.plist | 2 +- 9 files changed, 61 insertions(+), 36 deletions(-) diff --git a/Package.swift b/Package.swift index 74732e8..ebabd1e 100644 --- a/Package.swift +++ b/Package.swift @@ -1,11 +1,17 @@ +// swift-tools-version:4.0 import PackageDescription let package = Package( name: "SKClient", - targets: [ - Target(name: "SKClient") + products: [ + .library(name: "SKClient", targets: ["SKClient"]), ], dependencies: [ - .Package(url: "https://github.com/SlackKit/SKCore", majorVersion: 4) + .package(url: "https://github.com/SlackKit/SKCore", .upToNextMinor(from: "4.0.0")) + ], + targets: [ + .target(name: "SKClient", + dependencies: ["SKCore"], + path: "Sources") ] -) +) \ No newline at end of file diff --git a/Podfile b/Podfile index e40e694..71ed25b 100644 --- a/Podfile +++ b/Podfile @@ -2,15 +2,15 @@ use_frameworks! target 'SKClient macOS' do platform :osx, '10.11' - pod 'SKCore' + pod 'SKCore', ~> '4.1.0' end target 'SKClient iOS' do platform :ios, '9.0' - pod 'SKCore' + pod 'SKCore', ~> '4.1.0' end target 'SKClient tvOS' do platform :tvos, '9.0' - pod 'SKCore' + pod 'SKCore', ~> '4.1.0' end diff --git a/README.md b/README.md index fdc2252..119ce34 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # SKClient: SlackKit Client Module -![Swift Version](https://img.shields.io/badge/Swift-3.1.1-orange.svg) +![Swift Version](https://img.shields.io/badge/Swift-4.0.3-orange.svg) ![Plaforms](https://img.shields.io/badge/Platforms-macOS,iOS,tvOS,Linux-lightgrey.svg) ![License MIT](https://img.shields.io/badge/License-MIT-lightgrey.svg) [![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager) @@ -21,7 +21,7 @@ pod 'SKClient' and run ``` -# Use CocoaPods version >= 1.1.0 +# Use CocoaPods version >= 1.4.0 pod install ``` @@ -49,7 +49,7 @@ import PackageDescription let package = Package( dependencies: [ - .Package(url: "https://github.com/SlackKit/SKClient.git", majorVersion: 4) + .package(url: "https://github.com/SlackKit/SKClient.git", .upToNextMinor(from: "4.0.0")) ] ) ``` diff --git a/SKClient.podspec b/SKClient.podspec index 7e8ba6e..386a98a 100644 --- a/SKClient.podspec +++ b/SKClient.podspec @@ -1,17 +1,18 @@ Pod::Spec.new do |s| - s.name = "SKClient" - s.version = "4.0.0" - s.summary = "The client implementation for use with SlackKit" - s.homepage = "https://github.com/SlackKit/SKClient" - s.license = 'MIT' - s.author = { "Peter Zignego" => "peter@launchsoft.co" } - s.source = { :git => "https://github.com/SlackKit/SKClient.git", :tag => s.version.to_s } - s.social_media_url = 'https://twitter.com/pvzig' - s.ios.deployment_target = '9.0' - s.osx.deployment_target = '10.11' - s.tvos.deployment_target = '9.0' - s.requires_arc = true - s.source_files = 'Sources/*.swift' - s.frameworks = 'Foundation' - s.dependency 'SKCore' + s.name = "SKClient" + s.version = "4.1.0" + s.summary = "The client implementation for use with SlackKit" + s.homepage = "https://github.com/SlackKit/SKClient" + s.license = 'MIT' + s.author = { "Peter Zignego" => "peter@launchsoft.co" } + s.source = { :git => "https://github.com/SlackKit/SKClient.git", :tag => s.version.to_s } + s.social_media_url = 'https://twitter.com/pvzig' + s.swift_version = '4.0' + s.ios.deployment_target = '9.0' + s.osx.deployment_target = '10.11' + s.tvos.deployment_target = '9.0' + s.requires_arc = true + s.source_files = 'Sources/*.swift' + s.frameworks = 'Foundation' + s.dependency 'SKCore' end diff --git a/SKClient.xcodeproj/project.pbxproj b/SKClient.xcodeproj/project.pbxproj index 6a1ab02..9d58354 100644 --- a/SKClient.xcodeproj/project.pbxproj +++ b/SKClient.xcodeproj/project.pbxproj @@ -199,7 +199,7 @@ 2684F1741E95AA6900536DCC /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0830; + LastUpgradeCheck = 0920; ORGANIZATIONNAME = "Peter Zignego"; TargetAttributes = { 2684F17C1E95AA6900536DCC = { @@ -340,7 +340,9 @@ 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_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -348,7 +350,11 @@ 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_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + 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; @@ -393,7 +399,9 @@ 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_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -401,7 +409,11 @@ 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_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + 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; @@ -451,7 +463,7 @@ PRODUCT_NAME = SKClient; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -478,7 +490,7 @@ PRODUCT_NAME = SKClient; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Release; }; @@ -505,7 +517,7 @@ PRODUCT_NAME = SKClient; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -532,7 +544,7 @@ PRODUCT_NAME = SKClient; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Release; }; @@ -558,7 +570,7 @@ PRODUCT_NAME = SKClient; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; @@ -585,7 +597,7 @@ PRODUCT_NAME = SKClient; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Release; diff --git a/SKClient.xcodeproj/xcshareddata/xcschemes/SKClient iOS.xcscheme b/SKClient.xcodeproj/xcshareddata/xcschemes/SKClient iOS.xcscheme index 4ababc4..e9e4142 100644 --- a/SKClient.xcodeproj/xcshareddata/xcschemes/SKClient iOS.xcscheme +++ b/SKClient.xcodeproj/xcshareddata/xcschemes/SKClient iOS.xcscheme @@ -1,6 +1,6 @@ @@ -36,6 +37,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/SKClient.xcodeproj/xcshareddata/xcschemes/SKClient macOS.xcscheme b/SKClient.xcodeproj/xcshareddata/xcschemes/SKClient macOS.xcscheme index e6e47e2..590568e 100644 --- a/SKClient.xcodeproj/xcshareddata/xcschemes/SKClient macOS.xcscheme +++ b/SKClient.xcodeproj/xcshareddata/xcschemes/SKClient macOS.xcscheme @@ -1,6 +1,6 @@ @@ -36,6 +37,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/SKClient.xcodeproj/xcshareddata/xcschemes/SKClient tvOS.xcscheme b/SKClient.xcodeproj/xcshareddata/xcschemes/SKClient tvOS.xcscheme index fcb9841..d8ee9dd 100644 --- a/SKClient.xcodeproj/xcshareddata/xcschemes/SKClient tvOS.xcscheme +++ b/SKClient.xcodeproj/xcshareddata/xcschemes/SKClient tvOS.xcscheme @@ -1,6 +1,6 @@ @@ -36,6 +37,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Supporting Files/Info.plist b/Supporting Files/Info.plist index b6a0235..020969e 100644 --- a/Supporting Files/Info.plist +++ b/Supporting Files/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.0 + 4.1.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright From a37bc7092c4a69a21f48268107c1785d0f25bc31 Mon Sep 17 00:00:00 2001 From: Peter Zignego Date: Tue, 23 Jan 2018 19:18:16 -0500 Subject: [PATCH 2/2] Update versions --- Cartfile | 2 +- Package.swift | 12 ++++++------ Podfile | 6 +++--- README.md | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cartfile b/Cartfile index c598467..0721639 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "SlackKit/SKCore" >= 4.0.0 \ No newline at end of file +github "SlackKit/SKCore" >= 4.1.0 \ No newline at end of file diff --git a/Package.swift b/Package.swift index ebabd1e..8c81def 100644 --- a/Package.swift +++ b/Package.swift @@ -4,14 +4,14 @@ import PackageDescription let package = Package( name: "SKClient", products: [ - .library(name: "SKClient", targets: ["SKClient"]), + .library(name: "SKClient", targets: ["SKClient"]) ], dependencies: [ - .package(url: "https://github.com/SlackKit/SKCore", .upToNextMinor(from: "4.0.0")) + .package(url: "https://github.com/SlackKit/SKCore", .upToNextMinor(from: "4.1.0")) ], targets: [ - .target(name: "SKClient", - dependencies: ["SKCore"], - path: "Sources") + .target(name: "SKClient", + dependencies: ["SKCore"], + path: "Sources") ] -) \ No newline at end of file +) diff --git a/Podfile b/Podfile index 71ed25b..268922d 100644 --- a/Podfile +++ b/Podfile @@ -2,15 +2,15 @@ use_frameworks! target 'SKClient macOS' do platform :osx, '10.11' - pod 'SKCore', ~> '4.1.0' + pod 'SKCore', '~> 4.1.0' end target 'SKClient iOS' do platform :ios, '9.0' - pod 'SKCore', ~> '4.1.0' + pod 'SKCore', '~> 4.1.0' end target 'SKClient tvOS' do platform :tvos, '9.0' - pod 'SKCore', ~> '4.1.0' + pod 'SKCore', '~> 4.1.0' end diff --git a/README.md b/README.md index 119ce34..b385f4c 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ import PackageDescription let package = Package( dependencies: [ - .package(url: "https://github.com/SlackKit/SKClient.git", .upToNextMinor(from: "4.0.0")) + .package(url: "https://github.com/SlackKit/SKClient.git", .upToNextMinor(from: "4.1.0")) ] ) ```