Skip to content

Commit

Permalink
Merge pull request #80 from SwiftKitz/swift-3
Browse files Browse the repository at this point in the history
Swift 3
  • Loading branch information
Mazyod authored Sep 20, 2016
2 parents d969815 + 2a9eb12 commit 1144051
Show file tree
Hide file tree
Showing 321 changed files with 792 additions and 775 deletions.
10 changes: 3 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
language: objective-c
osx_image: xcode7.3
osx_image: xcode8
env:
global:
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8
- WORKSPACE=Appz.xcworkspace
- IOS_FRAMEWORK_SCHEME="Appz-ios"
- IOS_SDK=iphonesimulator9.3
- IOS_SDK=iphonesimulator10.0
matrix:
- DESTINATION="OS=8.1,name=iPhone 4S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES"
- DESTINATION="OS=8.2,name=iPhone 5" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES"
- DESTINATION="OS=8.3,name=iPhone 5S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES"
- DESTINATION="OS=8.4,name=iPhone 6" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES"
- DESTINATION="OS=9.1,name=iPhone 6S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES"
- DESTINATION="OS=10.0,name=iPhone 5S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES"
before_install:
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
script:
Expand Down
24 changes: 22 additions & 2 deletions Appz/Appz.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1724,17 +1724,19 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0720;
LastUpgradeCheck = 0710;
LastUpgradeCheck = 0800;
ORGANIZATIONNAME = kitz;
TargetAttributes = {
8254C79A1C2609FB009DB3BD = {
CreatedOnToolsVersion = 7.2;
};
826ACEDD1BF1B10A00B5FC5D = {
CreatedOnToolsVersion = 7.1;
LastSwiftMigration = 0800;
};
826ACEE71BF1B10A00B5FC5D = {
CreatedOnToolsVersion = 7.1;
LastSwiftMigration = 0800;
};
};
};
Expand Down Expand Up @@ -2659,6 +2661,7 @@
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
name = Debug;
Expand All @@ -2680,6 +2683,8 @@
PROVISIONING_PROFILE = "";
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
name = Release;
Expand All @@ -2693,6 +2698,7 @@
PRODUCT_MODULE_NAME = AppzTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_VERSION = 3.0;
TVOS_DEPLOYMENT_TARGET = 9.1;
};
name = Debug;
Expand All @@ -2706,6 +2712,8 @@
PRODUCT_MODULE_NAME = AppzTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
TVOS_DEPLOYMENT_TARGET = 9.1;
};
name = Release;
Expand All @@ -2729,6 +2737,7 @@
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
name = Debug;
Expand All @@ -2751,6 +2760,8 @@
PROVISIONING_PROFILE = "";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
name = Release;
Expand All @@ -2768,8 +2779,10 @@
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";
Expand Down Expand Up @@ -2818,8 +2831,10 @@
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";
Expand Down Expand Up @@ -2865,6 +2880,7 @@
PROVISIONING_PROFILE = "";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -2884,7 +2900,8 @@
PRODUCT_BUNDLE_IDENTIFIER = io.kitz.Appz;
PROVISIONING_PROFILE = "";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -2898,6 +2915,7 @@
PRODUCT_MODULE_NAME = AppzTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -2910,6 +2928,8 @@
PRODUCT_BUNDLE_IDENTIFIER = io.kitz.AppzTests;
PRODUCT_MODULE_NAME = AppzTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 2 additions & 2 deletions Appz/Appz/Apps/AirLaunch.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public extension Applications {
public extension Applications.AirLaunch {

public enum Action {
case Open
case open
}
}

Expand All @@ -34,7 +34,7 @@ extension Applications.AirLaunch.Action: ExternalApplicationAction {
public var paths: ActionPaths {

switch self {
case .Open:
case .open:
return ActionPaths(
app: Path(
pathComponents: ["app"],
Expand Down
4 changes: 2 additions & 2 deletions Appz/Appz/Apps/AliExpress.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public extension Applications {
public extension Applications.AliExpress {

public enum Action {
case Open
case open
}
}

Expand All @@ -34,7 +34,7 @@ extension Applications.AliExpress.Action: ExternalApplicationAction {
public var paths: ActionPaths {

switch self {
case .Open:
case .open:
return ActionPaths(
app: Path(
pathComponents: ["app"],
Expand Down
4 changes: 2 additions & 2 deletions Appz/Appz/Apps/AllCast.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public extension Applications {
public extension Applications.AllCast {

public enum Action {
case Open
case open
}
}

Expand All @@ -34,7 +34,7 @@ extension Applications.AllCast.Action: ExternalApplicationAction {
public var paths: ActionPaths {

switch self {
case .Open:
case .open:
return ActionPaths(
app: Path(
pathComponents: ["app"],
Expand Down
12 changes: 6 additions & 6 deletions Appz/Appz/Apps/AppStore.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ public extension Applications.AppStore {

public enum Action {

case Account(id: String)
case App(id: String)
case RateApp(id: String)
case account(id: String)
case app(id: String)
case rateApp(id: String)
}
}

Expand All @@ -38,7 +38,7 @@ extension Applications.AppStore.Action: ExternalApplicationAction {
public var paths: ActionPaths {

switch self {
case .Account(let id):
case .account(let id):
return ActionPaths(
app: Path(
pathComponents: ["itunes.apple.com", "developer", "id\(id)"],
Expand All @@ -47,7 +47,7 @@ extension Applications.AppStore.Action: ExternalApplicationAction {
web: Path()
)

case .App(let id):
case .app(let id):
return ActionPaths(
app: Path(
pathComponents: ["itunes.apple.com", "app","id\(id)"],
Expand All @@ -56,7 +56,7 @@ extension Applications.AppStore.Action: ExternalApplicationAction {
web: Path()
)

case .RateApp(let id):
case .rateApp(let id):
return ActionPaths(
app: Path(
pathComponents: ["itunes.apple.com", "WebObjects", "MZStore.woa", "wa", "viewContentsUserReviews"],
Expand Down
8 changes: 4 additions & 4 deletions Appz/Appz/Apps/AppleMaps.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ public extension Applications {
public extension Applications.AppleMaps {

public enum Action {
case Open
case DisplayDirections(saddr: String,
case open
case displayDirections(saddr: String,
daddr: String,
directionsmode: String)
}
Expand All @@ -39,15 +39,15 @@ extension Applications.AppleMaps.Action: ExternalApplicationAction {
public var paths: ActionPaths {

switch self {
case .Open:
case .open:
return ActionPaths(
app: Path(
pathComponents: ["app"],
queryParameters: [:]
),
web: Path()
)
case .DisplayDirections(let saddr, let daddr, let directionsmode):
case .displayDirections(let saddr, let daddr, let directionsmode):
return ActionPaths(
app: Path(
pathComponents: ["app"],
Expand Down
4 changes: 2 additions & 2 deletions Appz/Appz/Apps/Audible.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public extension Applications {
public extension Applications.Audible {

public enum Action {
case Open
case open
}
}

Expand All @@ -34,7 +34,7 @@ extension Applications.Audible.Action: ExternalApplicationAction {
public var paths: ActionPaths {

switch self {
case .Open:
case .open:
return ActionPaths(
app: Path(
pathComponents: ["app"],
Expand Down
4 changes: 2 additions & 2 deletions Appz/Appz/Apps/BNR.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public extension Applications {
public extension Applications.BNR {

public enum Action {
case Open
case open
}
}

Expand All @@ -34,7 +34,7 @@ extension Applications.BNR.Action: ExternalApplicationAction {
public var paths: ActionPaths {

switch self {
case .Open:
case .open:
return ActionPaths(
app: Path(
pathComponents: ["app"],
Expand Down
4 changes: 2 additions & 2 deletions Appz/Appz/Apps/Box.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public extension Applications {
public extension Applications.Box {

public enum Action {
case Open
case open
}
}

Expand All @@ -34,7 +34,7 @@ extension Applications.Box.Action: ExternalApplicationAction {
public var paths: ActionPaths {

switch self {
case .Open:
case .open:
return ActionPaths(
app: Path(
pathComponents: ["app"],
Expand Down
4 changes: 2 additions & 2 deletions Appz/Appz/Apps/Buzzfeed.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public extension Applications {
public extension Applications.Buzzfeed {

public enum Action {
case Open
case open
}
}

Expand All @@ -34,7 +34,7 @@ extension Applications.Buzzfeed.Action: ExternalApplicationAction {
public var paths: ActionPaths {

switch self {
case .Open:
case .open:
return ActionPaths(
app: Path(
pathComponents: ["app"],
Expand Down
4 changes: 2 additions & 2 deletions Appz/Appz/Apps/CNN.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public extension Applications {
public extension Applications.CNN {

public enum Action {
case Open
case open
}
}

Expand All @@ -34,7 +34,7 @@ extension Applications.CNN.Action: ExternalApplicationAction {
public var paths: ActionPaths {

switch self {
case .Open:
case .open:
return ActionPaths(
app: Path(
pathComponents: ["app"],
Expand Down
Loading

0 comments on commit 1144051

Please sign in to comment.