From c7b62c33751b46aa20cff16fa54817eb6eb4c646 Mon Sep 17 00:00:00 2001 From: Zachary Khan Date: Mon, 17 Jun 2019 22:47:51 -0700 Subject: [PATCH] Updated for Swift 5 and iOS10+ --- .../Former-Demo.xcodeproj/project.pbxproj | 50 ++++++++++++++----- .../AppIcon.appiconset/Contents.json | 15 ++++++ .../EditProfileViewController.swift | 2 +- .../Controllers/ExampleViewController.swift | 4 +- Former.xcodeproj/project.pbxproj | 8 +-- 5 files changed, 59 insertions(+), 20 deletions(-) diff --git a/Former-Demo/Former-Demo.xcodeproj/project.pbxproj b/Former-Demo/Former-Demo.xcodeproj/project.pbxproj index 7ddfaff..63b1af5 100644 --- a/Former-Demo/Former-Demo.xcodeproj/project.pbxproj +++ b/Former-Demo/Former-Demo.xcodeproj/project.pbxproj @@ -247,18 +247,20 @@ 2AC380E11BA44366009C7EFF /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0800; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = "Ryo Aoyama"; TargetAttributes = { 2AC380E81BA44366009C7EFF = { CreatedOnToolsVersion = 7.0; - LastSwiftMigration = 0800; + DevelopmentTeam = BGS96F4S7T; + LastSwiftMigration = 1020; + ProvisioningStyle = Automatic; }; }; }; buildConfigurationList = 2AC380E41BA44366009C7EFF /* Build configuration list for PBXProject "Former-Demo" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -362,18 +364,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; 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_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = 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; @@ -397,7 +408,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -409,18 +420,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; 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_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = 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; @@ -438,7 +458,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -451,14 +471,16 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = ""; - DEVELOPMENT_TEAM = ""; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = BGS96F4S7T; INFOPLIST_FILE = "Former-Demo/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.ryo.Former-Demo"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; }; name = Debug; @@ -468,14 +490,16 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = ""; - DEVELOPMENT_TEAM = ""; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = BGS96F4S7T; INFOPLIST_FILE = "Former-Demo/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.ryo.Former-Demo"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; }; name = Release; diff --git a/Former-Demo/Former-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json b/Former-Demo/Former-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json index af87619..9ca65a9 100644 --- a/Former-Demo/Former-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Former-Demo/Former-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "size" : "29x29", "idiom" : "iphone", @@ -35,6 +45,11 @@ "idiom" : "iphone", "filename" : "appicon-60@3x.png", "scale" : "3x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" } ], "info" : { diff --git a/Former-Demo/Former-Demo/Controllers/EditProfileViewController.swift b/Former-Demo/Former-Demo/Controllers/EditProfileViewController.swift index 9d76c50..7e3fb5a 100644 --- a/Former-Demo/Former-Demo/Controllers/EditProfileViewController.swift +++ b/Former-Demo/Former-Demo/Controllers/EditProfileViewController.swift @@ -99,7 +99,7 @@ final class EditProfileViewController: FormViewController { InlinePickerItem(title: $0) } if let gender = Profile.sharedInstance.gender { - $0.selectedRow = genders.index(of: gender) ?? 0 + $0.selectedRow = genders.firstIndex(of: gender) ?? 0 } }.onValueChanged { Profile.sharedInstance.gender = $0.title diff --git a/Former-Demo/Former-Demo/Controllers/ExampleViewController.swift b/Former-Demo/Former-Demo/Controllers/ExampleViewController.swift index 5b841b9..2bba3b9 100644 --- a/Former-Demo/Former-Demo/Controllers/ExampleViewController.swift +++ b/Former-Demo/Former-Demo/Controllers/ExampleViewController.swift @@ -106,7 +106,7 @@ final class ExampleViewController: FormViewController { $0.pickerItems = UITableView.RowAnimation.names().enumerated().map { InlinePickerItem(title: $0.element, value: UITableView.RowAnimation.all()[$0.offset]) } - $0.selectedRow = UITableView.RowAnimation.all().index(of: insertRowAnimation) ?? 0 + $0.selectedRow = UITableView.RowAnimation.all().firstIndex(of: insertRowAnimation) ?? 0 $0.displayEditingColor = .formerHighlightedSubColor() }.onValueChanged { [weak self] in self?.insertRowAnimation = $0.value! @@ -147,7 +147,7 @@ final class ExampleViewController: FormViewController { $0.pickerItems = UITableView.RowAnimation.names().enumerated().map { InlinePickerItem(title: $0.element, value: UITableView.RowAnimation.all()[$0.offset]) } - $0.selectedRow = UITableView.RowAnimation.all().index(of: insertSectionAnimation) ?? 0 + $0.selectedRow = UITableView.RowAnimation.all().firstIndex(of: insertSectionAnimation) ?? 0 $0.displayEditingColor = .formerHighlightedSubColor() }.onValueChanged { [weak self] in self?.insertSectionAnimation = $0.value! diff --git a/Former.xcodeproj/project.pbxproj b/Former.xcodeproj/project.pbxproj index cb567f7..432cdb9 100644 --- a/Former.xcodeproj/project.pbxproj +++ b/Former.xcodeproj/project.pbxproj @@ -413,7 +413,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -467,7 +467,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -488,7 +488,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Former/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.ryo.Former; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -507,7 +507,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Former/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.ryo.Former; PRODUCT_NAME = "$(TARGET_NAME)";