From 6e75c86890f7796237b60151ec1a305b85dadcc2 Mon Sep 17 00:00:00 2001 From: Victor Peschenkov Date: Sat, 4 Nov 2017 16:12:58 +0300 Subject: [PATCH] Swift 3.2 --- .swift-version | 2 +- LetterAvatarKit.xcodeproj/project.pbxproj | 4 +- .../Extensions/String+LetterAvatarKit.swift | 2 +- .../project.pbxproj | 4 +- LetterAvatarKitExample/Podfile.lock | 2 +- .../LetterAvatarKit.podspec.json | 2 +- LetterAvatarKitExample/Pods/Manifest.lock | 2 +- .../Pods/Pods.xcodeproj/project.pbxproj | 102 +++++++++--------- LetterAvatarKitObjcExample/Podfile.lock | 2 +- .../LetterAvatarKit.podspec.json | 2 +- LetterAvatarKitObjcExample/Pods/Manifest.lock | 2 +- .../Pods/Pods.xcodeproj/project.pbxproj | 4 +- 12 files changed, 65 insertions(+), 65 deletions(-) diff --git a/.swift-version b/.swift-version index 5186d07..a3ec5a4 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 +3.2 diff --git a/LetterAvatarKit.xcodeproj/project.pbxproj b/LetterAvatarKit.xcodeproj/project.pbxproj index 6b70ca3..136eaa5 100644 --- a/LetterAvatarKit.xcodeproj/project.pbxproj +++ b/LetterAvatarKit.xcodeproj/project.pbxproj @@ -459,7 +459,7 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -482,7 +482,7 @@ PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/LetterAvatarKit/Extensions/String+LetterAvatarKit.swift b/LetterAvatarKit/Extensions/String+LetterAvatarKit.swift index 407b23c..3f5a20d 100644 --- a/LetterAvatarKit/Extensions/String+LetterAvatarKit.swift +++ b/LetterAvatarKit/Extensions/String+LetterAvatarKit.swift @@ -25,7 +25,7 @@ import Foundation -extension String{ +extension String { /// The the first element of the collection. /// /// If the collection is empty, the value of this property is `nil`. diff --git a/LetterAvatarKitExample/LetterAvatarKitExample.xcodeproj/project.pbxproj b/LetterAvatarKitExample/LetterAvatarKitExample.xcodeproj/project.pbxproj index 73a4ca4..a18836a 100644 --- a/LetterAvatarKitExample/LetterAvatarKitExample.xcodeproj/project.pbxproj +++ b/LetterAvatarKitExample/LetterAvatarKitExample.xcodeproj/project.pbxproj @@ -362,7 +362,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = org.peschenkov.LetterAvatarKitExample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -378,7 +378,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = org.peschenkov.LetterAvatarKitExample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/LetterAvatarKitExample/Podfile.lock b/LetterAvatarKitExample/Podfile.lock index df94080..611bbad 100644 --- a/LetterAvatarKitExample/Podfile.lock +++ b/LetterAvatarKitExample/Podfile.lock @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - LetterAvatarKit: 168b23d9bfa986bef142357b7bab18461c90313c + LetterAvatarKit: 737f27af2da5ebd5678cb17df4e4fd8af6280973 PODFILE CHECKSUM: 407d67c5c51bb4907e98b407342cb20aaddc7148 diff --git a/LetterAvatarKitExample/Pods/Local Podspecs/LetterAvatarKit.podspec.json b/LetterAvatarKitExample/Pods/Local Podspecs/LetterAvatarKit.podspec.json index 235ce88..d0ff0e4 100644 --- a/LetterAvatarKitExample/Pods/Local Podspecs/LetterAvatarKit.podspec.json +++ b/LetterAvatarKitExample/Pods/Local Podspecs/LetterAvatarKit.podspec.json @@ -11,7 +11,7 @@ "authors": { "Victor Peschenkov": "nerevarxx@gmail.com" }, - "summary": "UIImage extension that generates letter-based avatars written in Swift.", + "summary": "A UIImage extension that generates letter-based avatars written in Swift.", "source": { "git": "https://github.com/vpeschenkov/LetterAvatarKit.git", "tag": "1.1.1" diff --git a/LetterAvatarKitExample/Pods/Manifest.lock b/LetterAvatarKitExample/Pods/Manifest.lock index df94080..611bbad 100644 --- a/LetterAvatarKitExample/Pods/Manifest.lock +++ b/LetterAvatarKitExample/Pods/Manifest.lock @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - LetterAvatarKit: 168b23d9bfa986bef142357b7bab18461c90313c + LetterAvatarKit: 737f27af2da5ebd5678cb17df4e4fd8af6280973 PODFILE CHECKSUM: 407d67c5c51bb4907e98b407342cb20aaddc7148 diff --git a/LetterAvatarKitExample/Pods/Pods.xcodeproj/project.pbxproj b/LetterAvatarKitExample/Pods/Pods.xcodeproj/project.pbxproj index 3df8a21..7cf4d83 100644 --- a/LetterAvatarKitExample/Pods/Pods.xcodeproj/project.pbxproj +++ b/LetterAvatarKitExample/Pods/Pods.xcodeproj/project.pbxproj @@ -345,6 +345,37 @@ }; name = Debug; }; + 7AC7D505577D4A5133487BF2BEB1139F /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = CCE7DCAC7F3C14E8EADB9F63930ED4C4 /* LetterAvatarKit.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREFIX_HEADER = "Target Support Files/LetterAvatarKit/LetterAvatarKit-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/LetterAvatarKit/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/LetterAvatarKit/LetterAvatarKit.modulemap"; + PRODUCT_NAME = LetterAvatarKit; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; B254DAA6CF0CE39F4A3D11B90A7E059A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { @@ -400,37 +431,6 @@ }; name = Release; }; - C17DE3DB8DE88523E87671F5C5EC9B65 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = CCE7DCAC7F3C14E8EADB9F63930ED4C4 /* LetterAvatarKit.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/LetterAvatarKit/LetterAvatarKit-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/LetterAvatarKit/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/LetterAvatarKit/LetterAvatarKit.modulemap"; - PRODUCT_NAME = LetterAvatarKit; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; E4B68EE12B21C47CB798D9B1ECA6D7A7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -491,9 +491,9 @@ }; name = Debug; }; - FDE8AC800F745942AC44E80B90548B39 /* Release */ = { + F62EB78F973C8EAD65BB9B55CBA8F52A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 67CF0750AC8FFD2002C92A4BCEAF95CB /* Pods-LetterAvatarKitExample.release.xcconfig */; + baseConfigurationReference = CCE7DCAC7F3C14E8EADB9F63930ED4C4 /* LetterAvatarKit.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -504,20 +504,18 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-LetterAvatarKitExample/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/LetterAvatarKit/LetterAvatarKit-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/LetterAvatarKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-LetterAvatarKitExample/Pods-LetterAvatarKitExample.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_LetterAvatarKitExample; + MODULEMAP_FILE = "Target Support Files/LetterAvatarKit/LetterAvatarKit.modulemap"; + PRODUCT_NAME = LetterAvatarKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -525,9 +523,9 @@ }; name = Release; }; - FE8BBDC735C6CE2BB8C375F8ACB83C6E /* Release */ = { + FDE8AC800F745942AC44E80B90548B39 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CCE7DCAC7F3C14E8EADB9F63930ED4C4 /* LetterAvatarKit.xcconfig */; + baseConfigurationReference = 67CF0750AC8FFD2002C92A4BCEAF95CB /* Pods-LetterAvatarKitExample.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -538,18 +536,20 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/LetterAvatarKit/LetterAvatarKit-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/LetterAvatarKit/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-LetterAvatarKitExample/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/LetterAvatarKit/LetterAvatarKit.modulemap"; - PRODUCT_NAME = LetterAvatarKit; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-LetterAvatarKitExample/Pods-LetterAvatarKitExample.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = Pods_LetterAvatarKitExample; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -581,8 +581,8 @@ 8D0335526ED95A48306C1632289F32A4 /* Build configuration list for PBXNativeTarget "LetterAvatarKit" */ = { isa = XCConfigurationList; buildConfigurations = ( - C17DE3DB8DE88523E87671F5C5EC9B65 /* Debug */, - FE8BBDC735C6CE2BB8C375F8ACB83C6E /* Release */, + 7AC7D505577D4A5133487BF2BEB1139F /* Debug */, + F62EB78F973C8EAD65BB9B55CBA8F52A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/LetterAvatarKitObjcExample/Podfile.lock b/LetterAvatarKitObjcExample/Podfile.lock index 0dcdcb5..6847452 100644 --- a/LetterAvatarKitObjcExample/Podfile.lock +++ b/LetterAvatarKitObjcExample/Podfile.lock @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - LetterAvatarKit: 168b23d9bfa986bef142357b7bab18461c90313c + LetterAvatarKit: 737f27af2da5ebd5678cb17df4e4fd8af6280973 PODFILE CHECKSUM: acab86cc8cc5517bd2b945abae924096efac0c35 diff --git a/LetterAvatarKitObjcExample/Pods/Local Podspecs/LetterAvatarKit.podspec.json b/LetterAvatarKitObjcExample/Pods/Local Podspecs/LetterAvatarKit.podspec.json index 235ce88..d0ff0e4 100644 --- a/LetterAvatarKitObjcExample/Pods/Local Podspecs/LetterAvatarKit.podspec.json +++ b/LetterAvatarKitObjcExample/Pods/Local Podspecs/LetterAvatarKit.podspec.json @@ -11,7 +11,7 @@ "authors": { "Victor Peschenkov": "nerevarxx@gmail.com" }, - "summary": "UIImage extension that generates letter-based avatars written in Swift.", + "summary": "A UIImage extension that generates letter-based avatars written in Swift.", "source": { "git": "https://github.com/vpeschenkov/LetterAvatarKit.git", "tag": "1.1.1" diff --git a/LetterAvatarKitObjcExample/Pods/Manifest.lock b/LetterAvatarKitObjcExample/Pods/Manifest.lock index 0dcdcb5..6847452 100644 --- a/LetterAvatarKitObjcExample/Pods/Manifest.lock +++ b/LetterAvatarKitObjcExample/Pods/Manifest.lock @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - LetterAvatarKit: 168b23d9bfa986bef142357b7bab18461c90313c + LetterAvatarKit: 737f27af2da5ebd5678cb17df4e4fd8af6280973 PODFILE CHECKSUM: acab86cc8cc5517bd2b945abae924096efac0c35 diff --git a/LetterAvatarKitObjcExample/Pods/Pods.xcodeproj/project.pbxproj b/LetterAvatarKitObjcExample/Pods/Pods.xcodeproj/project.pbxproj index 41a0687..98beb9a 100644 --- a/LetterAvatarKitObjcExample/Pods/Pods.xcodeproj/project.pbxproj +++ b/LetterAvatarKitObjcExample/Pods/Pods.xcodeproj/project.pbxproj @@ -369,7 +369,6 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -427,6 +426,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_VERSION = 3.0; SYMROOT = "${SRCROOT}/../build"; }; name = Release; @@ -487,6 +487,7 @@ PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_VERSION = 3.0; SYMROOT = "${SRCROOT}/../build"; }; name = Debug; @@ -515,7 +516,6 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic";