Skip to content
This repository was archived by the owner on Jul 14, 2020. It is now read-only.

Update to swift 3 #10

Open
xopen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to swift 3 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion FaceDetection.xcodeproj/project.pbxproj
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,14 +161,16 @@
attributes = {
LastSwiftMigration = 0720;
LastSwiftUpdateCheck = 0720;
LastUpgradeCheck = 0620;
LastUpgradeCheck = 0820;
ORGANIZATIONNAME = "Aaron Abentheuer";
TargetAttributes = {
80C316021A46F3F800E4493F = {
CreatedOnToolsVersion = 6.2;
ProvisioningStyle = Manual;
};
80C316171A46F3F800E4493F = {
CreatedOnToolsVersion = 6.2;
DevelopmentTeam = EMZ8C4N537;
TestTargetID = 80C316021A46F3F800E4493F;
};
};
Expand Down Expand Up @@ -274,15 +276,19 @@
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_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand All @@ -300,6 +306,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -317,15 +324,18 @@
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_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All @@ -335,6 +345,8 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand All @@ -344,8 +356,11 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = FaceDetection/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.camera.detection;
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = 1;
};
Expand All @@ -355,8 +370,11 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = FaceDetection/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.camera.detection;
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = 1;
};
Expand All @@ -366,6 +384,7 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
DEVELOPMENT_TEAM = EMZ8C4N537;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
Expand All @@ -376,6 +395,7 @@
);
INFOPLIST_FILE = FaceDetectionTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "aaab.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FaceDetection.app/FaceDetection";
};
Expand All @@ -385,12 +405,14 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
DEVELOPMENT_TEAM = EMZ8C4N537;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
INFOPLIST_FILE = FaceDetectionTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "aaab.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FaceDetection.app/FaceDetection";
};
Expand Down
Empty file modified FaceDetection.xcodeproj/project.xcworkspace/contents.xcworkspacedata
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified FaceDetection.xcodeproj/project.xcworkspace/xcshareddata/FaceDetection.xccheckout
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion FaceDetection.xcodeproj/project.xcworkspace/xcshareddata/FaceDetection.xcscmblueprint
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "1767FBA5-AB45-4A53-A8D7-767E6A8692B3",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"40D912770F74B782D271F42DA80123F1A9C2226A" : "AAFaceDetection",
"40D912770F74B782D271F42DA80123F1A9C2226A" : "face\/",
"0B0B95484AD488B8C39195A6DAF9FB3BE1F8A511" : "Visage"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "FaceDetection",
Expand Down
Empty file modified ....xcodeproj/project.xcworkspace/xcuserdata/aaab.xcuserdatad/UserInterfaceState.xcuserstate
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified ...roj/project.xcworkspace/xcuserdata/zaid.pathan.xcuserdatad/UserInterfaceState.xcuserstate
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified FaceDetection.xcodeproj/xcuserdata/aaab.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified FaceDetection.xcodeproj/xcuserdata/aaab.xcuserdatad/xcschemes/FaceDetection.xcscheme
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified FaceDetection.xcodeproj/xcuserdata/aaab.xcuserdatad/xcschemes/xcschememanagement.plist
100644 → 100755
View file
Open in desktop
Empty file.
101 changes: 101 additions & 0 deletions FaceDetection.xcodeproj/xcuserdata/diazj.xcuserdatad/xcschemes/FaceDetection.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "80C316021A46F3F800E4493F"
BuildableName = "FaceDetection.app"
BlueprintName = "FaceDetection"
ReferencedContainer = "container:FaceDetection.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "80C316171A46F3F800E4493F"
BuildableName = "FaceDetectionTests.xctest"
BlueprintName = "FaceDetectionTests"
ReferencedContainer = "container:FaceDetection.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "80C316021A46F3F800E4493F"
BuildableName = "FaceDetection.app"
BlueprintName = "FaceDetection"
ReferencedContainer = "container:FaceDetection.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "80C316021A46F3F800E4493F"
BuildableName = "FaceDetection.app"
BlueprintName = "FaceDetection"
ReferencedContainer = "container:FaceDetection.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "80C316021A46F3F800E4493F"
BuildableName = "FaceDetection.app"
BlueprintName = "FaceDetection"
ReferencedContainer = "container:FaceDetection.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Empty file modified FaceDetection.xcodeproj/xcuserdata/zaid.pathan.xcuserdatad/xcschemes/FaceDetection.xcscheme
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified ...Detection.xcodeproj/xcuserdata/zaid.pathan.xcuserdatad/xcschemes/xcschememanagement.plist
100644 → 100755
View file
Open in desktop
Empty file.
12 changes: 6 additions & 6 deletions FaceDetection/AppDelegate.swift
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var activeCornerRadius : CGFloat = 0
var incativeCornerRadius : CGFloat = 0

func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
private func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
window!.clipsToBounds = true

let animation : CABasicAnimation = CABasicAnimation(keyPath: "cornerRadius")
Expand All @@ -25,29 +25,29 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
animation.toValue = activeCornerRadius
animation.duration = 0.15
window!.layer.cornerRadius = activeCornerRadius
window!.layer.addAnimation(animation, forKey: "cornerRadius")
window!.layer.add(animation, forKey: "cornerRadius")

return true
}

func applicationWillResignActive(application: UIApplication) {
func applicationWillResignActive(_ application: UIApplication) {
let animation : CABasicAnimation = CABasicAnimation(keyPath: "cornerRadius")
animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
animation.fromValue = activeCornerRadius
animation.toValue = incativeCornerRadius
animation.duration = 0.15
window!.layer.cornerRadius = incativeCornerRadius
window!.layer.addAnimation(animation, forKey: "cornerRadius")
window!.layer.add(animation, forKey: "cornerRadius")
}

func applicationDidBecomeActive(application: UIApplication) {
func applicationDidBecomeActive(_ application: UIApplication) {
let animation : CABasicAnimation = CABasicAnimation(keyPath: "cornerRadius")
animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
animation.fromValue = incativeCornerRadius
animation.toValue = activeCornerRadius
animation.duration = 0.15
window!.layer.cornerRadius = activeCornerRadius
window!.layer.addAnimation(animation, forKey: "cornerRadius")
window!.layer.add(animation, forKey: "cornerRadius")
}
}

Empty file modified FaceDetection/Base.lproj/LaunchScreen.xib
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified FaceDetection/Base.lproj/Main.storyboard
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified FaceDetection/Images.xcassets/AppIcon.appiconset/Contents.json
100644 → 100755
View file
Open in desktop
Empty file.
12 changes: 7 additions & 5 deletions FaceDetection/Info.plist
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>aaab.$(PRODUCT_NAME:rfc1034identifier)</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand All @@ -20,8 +20,12 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSApplicationCategoryType</key>
<string></string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSCameraUsageDescription</key>
<string>This app needs to access your device's camera</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
Expand All @@ -34,16 +38,14 @@
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>LSApplicationCategoryType</key>
<string></string>
<key>UIViewControllerBasedStatusBarAppearance</key>
<true/>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<true/>
</dict>
</plist>
Loading