From b52cd43c5d6aead1e26072529d62074f4be8e55d Mon Sep 17 00:00:00 2001 From: bigjosh91 Date: Thu, 5 Sep 2019 23:25:13 -0400 Subject: [PATCH] Update --- ArrayChallenge.xcodeproj/project.pbxproj | 40 +++++++++++++++---- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++ .../xcschemes/ArrayChallenge.xcscheme | 2 +- ArrayChallenge/AppDelegate.swift | 2 +- ArrayChallenge/ShoppingList.swift | 9 ++++- 5 files changed, 50 insertions(+), 11 deletions(-) create mode 100644 ArrayChallenge.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/ArrayChallenge.xcodeproj/project.pbxproj b/ArrayChallenge.xcodeproj/project.pbxproj index e22a3a3..d9374e9 100644 --- a/ArrayChallenge.xcodeproj/project.pbxproj +++ b/ArrayChallenge.xcodeproj/project.pbxproj @@ -84,7 +84,7 @@ 7D19FAEB1D8D6CB1003F74FE /* Supporting Files */, ); path = ArrayChallenge; - sourceTree = ""; + sourceTree = SOURCE_ROOT; }; 5B9D1C921D0B31E500522058 /* ArrayChallengeTests */ = { isa = PBXGroup; @@ -160,11 +160,12 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0730; + LastUpgradeCheck = 1030; ORGANIZATIONNAME = "Flatiron School"; TargetAttributes = { 5B9D1C7A1D0B31E500522058 = { CreatedOnToolsVersion = 7.3.1; + DevelopmentTeam = MJ68T75WZN; LastSwiftMigration = 0800; }; 5B9D1C8E1D0B31E500522058 = { @@ -176,7 +177,7 @@ }; buildConfigurationList = 5B9D1C761D0B31E500522058 /* Build configuration list for PBXProject "ArrayChallenge" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -266,18 +267,29 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = 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; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -311,18 +323,29 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = 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; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -341,6 +364,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; VALIDATE_PRODUCT = YES; }; name = Release; @@ -350,11 +374,12 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = MJ68T75WZN; INFOPLIST_FILE = ArrayChallenge/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.flatironSchool.ArrayChallenge; + PRODUCT_BUNDLE_IDENTIFIER = bigjosh91; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -363,11 +388,12 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = MJ68T75WZN; INFOPLIST_FILE = ArrayChallenge/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.flatironSchool.ArrayChallenge; + PRODUCT_BUNDLE_IDENTIFIER = bigjosh91; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/ArrayChallenge.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ArrayChallenge.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ArrayChallenge.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ArrayChallenge.xcodeproj/xcshareddata/xcschemes/ArrayChallenge.xcscheme b/ArrayChallenge.xcodeproj/xcshareddata/xcschemes/ArrayChallenge.xcscheme index 5a94ee9..6491cc1 100644 --- a/ArrayChallenge.xcodeproj/xcshareddata/xcschemes/ArrayChallenge.xcscheme +++ b/ArrayChallenge.xcodeproj/xcshareddata/xcschemes/ArrayChallenge.xcscheme @@ -1,6 +1,6 @@ Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. return true } diff --git a/ArrayChallenge/ShoppingList.swift b/ArrayChallenge/ShoppingList.swift index 646e1db..d35a2b3 100644 --- a/ArrayChallenge/ShoppingList.swift +++ b/ArrayChallenge/ShoppingList.swift @@ -12,10 +12,15 @@ class ShoppingList { func createShoppingList(withItems items: [String], amountOfEachItem amounts: [String]) -> [String] { - + var finalShoppingList: [String] = [] + for (index, item) in finalShoppingList.enumerated() { + let amount = amounts[index] + let shoppingItem = "\(index + 1). \(item) \(amount))" + finalShoppingList.append(shoppingItem) + } // Implement this function - + return finalShoppingList }