From 78e1aa949040759c701aed5ad515d70c93a54369 Mon Sep 17 00:00:00 2001 From: Vincent Tourraine Date: Tue, 15 May 2018 10:43:59 +0200 Subject: [PATCH] Update to Swift 3.2, bump to version 1.1 --- .gitignore | 1 + .swift-version | 2 +- CHANGELOG.md | 5 ++++ README.md | 3 +-- .../project.pbxproj | 25 ++++++++++++++++--- .../ThirdPartyMailerExample.xcscheme | 4 ++- .../ThirdPartyMailerExample/AppDelegate.swift | 2 +- .../ViewController.swift | 4 +-- ThirdPartyMailer.podspec.json | 7 +++--- 9 files changed, 40 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 9bce6af..74259c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xcuserdata +.DS_Store diff --git a/.swift-version b/.swift-version index 9f55b2c..a3ec5a4 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -3.0 +3.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 43d727a..6d7e0df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # ThirdPartyMailer changelog +## 1.1 + +- Update to Swift 3.2 + + ## 1.0 - Update to Swift 3 diff --git a/README.md b/README.md index 543bc54..b38990c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ _Interact with third-party iOS mail clients, using custom URL schemes._ ![Platform iOS](https://img.shields.io/badge/platform-iOS-blue.svg) [![Build Status](https://travis-ci.org/vtourraine/ThirdPartyMailer.svg?branch=master)](https://travis-ci.org/vtourraine/ThirdPartyMailer) [![CocoaPods compatible](https://img.shields.io/cocoapods/v/ThirdPartyMailer.svg)](https://cocoapods.org/pods/ThirdPartyMailer) -[![CocoaPods documentation](https://img.shields.io/cocoapods/metrics/doc-percent/ThirdPartyMailer.svg)](http://cocoadocs.org/docsets/ThirdPartyMailer) [![MIT license](http://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/vtourraine/ThirdPartyMailer/raw/master/LICENSE.md) @@ -62,7 +61,7 @@ ThirdPartyMailer.application(application, openMailClient: client, recipient: nil ## Requirements -ThirdPartyMailer is written in Swift 3.0, requires iOS 8.0 and above, Xcode 8.0 and above. +ThirdPartyMailer is written in Swift 3.2, requires iOS 8.0 and above, Xcode 8.0 and above. ## Credits diff --git a/Tests/ThirdPartyMailerExample.xcodeproj/project.pbxproj b/Tests/ThirdPartyMailerExample.xcodeproj/project.pbxproj index 043fd9a..bf8333c 100644 --- a/Tests/ThirdPartyMailerExample.xcodeproj/project.pbxproj +++ b/Tests/ThirdPartyMailerExample.xcodeproj/project.pbxproj @@ -222,7 +222,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0730; + LastUpgradeCheck = 0920; ORGANIZATIONNAME = "Vincent Tourraine"; TargetAttributes = { 1426E2741CB3DA7700238C1D = { @@ -353,6 +353,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -376,6 +377,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -403,13 +405,21 @@ 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_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_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; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -449,13 +459,21 @@ 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_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_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; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -474,6 +492,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -482,9 +501,9 @@ 1FB5199C1CA99D0F00E2977A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = ""; - EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; INFOPLIST_FILE = ThirdPartyMailerExample/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = net.vtourraine.ThirdPartyMailerExample; @@ -496,9 +515,9 @@ 1FB5199D1CA99D0F00E2977A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = ""; - EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; INFOPLIST_FILE = ThirdPartyMailerExample/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = net.vtourraine.ThirdPartyMailerExample; diff --git a/Tests/ThirdPartyMailerExample.xcodeproj/xcshareddata/xcschemes/ThirdPartyMailerExample.xcscheme b/Tests/ThirdPartyMailerExample.xcodeproj/xcshareddata/xcschemes/ThirdPartyMailerExample.xcscheme index d477cf8..58095b2 100644 --- a/Tests/ThirdPartyMailerExample.xcodeproj/xcshareddata/xcschemes/ThirdPartyMailerExample.xcscheme +++ b/Tests/ThirdPartyMailerExample.xcodeproj/xcshareddata/xcschemes/ThirdPartyMailerExample.xcscheme @@ -1,6 +1,6 @@