From f4d18b4a803f686beb4b4966cd9de346ce42f82e Mon Sep 17 00:00:00 2001 From: Nick O'Neill Date: Fri, 10 Apr 2015 15:44:37 -0700 Subject: [PATCH] Updated examples. --- Example/ViewController.swift | 6 +++--- Source/Armchair.swift | 2 +- iOS Example.xcodeproj/project.pbxproj | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Example/ViewController.swift b/Example/ViewController.swift index c48555b..b1f7e34 100644 --- a/Example/ViewController.swift +++ b/Example/ViewController.swift @@ -55,12 +55,12 @@ extension ViewController { // Only set it if we are using Armchair localizations if !Armchair.useMainAppBundleForLocalizations() { - var currentLocalization: NSString = NSBundle.mainBundle().preferredLocalizations[0] as NSString + var currentLocalization: NSString = NSBundle.mainBundle().preferredLocalizations[0] as! NSString // Only set it if we are using a different language than this apps development language if let developmentLocalization = NSBundle.mainBundle().developmentLocalization { if currentLocalization != developmentLocalization { - languageLabelText = currentLocalization - if let displayName = NSLocale(localeIdentifier: currentLocalization).displayNameForKey(NSLocaleIdentifier, value:currentLocalization) { + languageLabelText = currentLocalization as String + if let displayName = NSLocale(localeIdentifier: currentLocalization as String).displayNameForKey(NSLocaleIdentifier, value:currentLocalization) { languageLabelText = "\(displayName): \(currentLocalization)" } } diff --git a/Source/Armchair.swift b/Source/Armchair.swift index b61c3c4..c91cd68 100644 --- a/Source/Armchair.swift +++ b/Source/Armchair.swift @@ -27,7 +27,7 @@ import SystemConfiguration #if os(iOS) import UIKit #elseif os(OSX) -import Appkit +import AppKit #else // Not yet supported #endif diff --git a/iOS Example.xcodeproj/project.pbxproj b/iOS Example.xcodeproj/project.pbxproj index b5f82cf..169a99a 100644 --- a/iOS Example.xcodeproj/project.pbxproj +++ b/iOS Example.xcodeproj/project.pbxproj @@ -421,7 +421,7 @@ EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/Example/Info-iOS.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_SWIFT_FLAGS = ""; PRODUCT_NAME = "iOS Example"; @@ -438,7 +438,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; INFOPLIST_FILE = "$(SRCROOT)/Example/Info-iOS.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "iOS Example"; PROVISIONING_PROFILE = "";