Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrated to Xcode 11 and swift 5.1 Version #67

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
5.0
4 changes: 2 additions & 2 deletions Example/Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Quick/Nimble" "v5.0.0"
github "Quick/Quick" "v0.10.0"
github "Quick/Nimble" "v8.0.4"
github "Quick/Quick" "v2.2.0"
4 changes: 2 additions & 2 deletions Example/Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Quick/Nimble" "v5.0.0"
github "Quick/Quick" "v0.10.0"
github "Quick/Nimble" "v8.0.4"
github "Quick/Quick" "v2.2.0"
106 changes: 98 additions & 8 deletions Example/Example/RazzleDazzleDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,20 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
1836320B233B3E8D0017B95C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 18363206233B3E8D0017B95C /* RazzleDazzle.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = FACD9C5D1B2A554100AC1614;
remoteInfo = RazzleDazzle;
};
1836320D233B3E8D0017B95C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 18363206233B3E8D0017B95C /* RazzleDazzle.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = FACD9C681B2A554100AC1614;
remoteInfo = RazzleDazzleTests;
};
FAD1C75E1B2F57D60053D880 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = FAD1C7401B2F57D60053D880 /* Project object */;
Expand All @@ -42,6 +56,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
18363206233B3E8D0017B95C /* RazzleDazzle.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RazzleDazzle.xcodeproj; path = ../RazzleDazzle.xcodeproj; sourceTree = "<group>"; };
FA0895741B3F1A37002460BB /* RazzleDazzle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RazzleDazzle.framework; sourceTree = BUILT_PRODUCTS_DIR; };
FA6AC6DC1B3DF6690053688A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
FAD1C7481B2F57D60053D880 /* RazzleDazzleDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RazzleDazzleDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -74,13 +89,31 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
18363205233B3E8D0017B95C /* Frameworks */ = {
isa = PBXGroup;
children = (
18363206233B3E8D0017B95C /* RazzleDazzle.xcodeproj */,
);
name = Frameworks;
sourceTree = "<group>";
};
18363207233B3E8D0017B95C /* Products */ = {
isa = PBXGroup;
children = (
1836320C233B3E8D0017B95C /* RazzleDazzle.framework */,
1836320E233B3E8D0017B95C /* RazzleDazzleTests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
FAD1C73F1B2F57D60053D880 = {
isa = PBXGroup;
children = (
FA0895741B3F1A37002460BB /* RazzleDazzle.framework */,
FAD1C74A1B2F57D60053D880 /* RazzleDazzleDemo */,
FAD1C7601B2F57D60053D880 /* RazzleDazzleDemoTests */,
FAD1C7491B2F57D60053D880 /* Products */,
18363205233B3E8D0017B95C /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -177,24 +210,26 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 1100;
ORGANIZATIONNAME = IFTTT;
TargetAttributes = {
FAD1C7471B2F57D60053D880 = {
CreatedOnToolsVersion = 6.3.2;
DevelopmentTeamName = "Raphael Cruzeiro (Personal Team)";
LastSwiftMigration = 0800;
ProvisioningStyle = Automatic;
};
FAD1C75C1B2F57D60053D880 = {
CreatedOnToolsVersion = 6.3.2;
LastSwiftMigration = 0800;
ProvisioningStyle = Manual;
TestTargetID = FAD1C7471B2F57D60053D880;
};
};
};
buildConfigurationList = FAD1C7431B2F57D60053D880 /* Build configuration list for PBXProject "RazzleDazzleDemo" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand All @@ -203,6 +238,12 @@
mainGroup = FAD1C73F1B2F57D60053D880;
productRefGroup = FAD1C7491B2F57D60053D880 /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 18363207233B3E8D0017B95C /* Products */;
ProjectRef = 18363206233B3E8D0017B95C /* RazzleDazzle.xcodeproj */;
},
);
projectRoot = "";
targets = (
FAD1C7471B2F57D60053D880 /* RazzleDazzleDemo */,
Expand All @@ -211,6 +252,23 @@
};
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
1836320C233B3E8D0017B95C /* RazzleDazzle.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = RazzleDazzle.framework;
remoteRef = 1836320B233B3E8D0017B95C /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
1836320E233B3E8D0017B95C /* RazzleDazzleTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = RazzleDazzleTests.xctest;
remoteRef = 1836320D233B3E8D0017B95C /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */

/* Begin PBXResourcesBuildPhase section */
FAD1C7461B2F57D60053D880 /* Resources */ = {
isa = PBXResourcesBuildPhase;
Expand Down Expand Up @@ -283,22 +341,33 @@
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;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -323,29 +392,41 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
FAD1C7661B2F57D60053D880 /* Release */ = {
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;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
Expand All @@ -362,6 +443,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand All @@ -370,12 +452,15 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = RazzleDazzleDemo/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "ifttt.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -384,12 +469,15 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = RazzleDazzleDemo/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "ifttt.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand All @@ -398,6 +486,7 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
Expand All @@ -410,7 +499,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "ifttt.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RazzleDazzleDemo.app/RazzleDazzleDemo";
};
name = Debug;
Expand All @@ -419,6 +508,7 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
Expand All @@ -427,7 +517,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "ifttt.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RazzleDazzleDemo.app/RazzleDazzleDemo";
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion Example/Example/RazzleDazzleDemo/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
// Override point for customization after application launch.
return true
}
Expand Down
2 changes: 1 addition & 1 deletion Example/Example/RazzleDazzleDemo/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ class ViewController: AnimatedPagingScrollViewController {
shapeLayer.lineWidth = 4
shapeLayer.miterLimit = 4
shapeLayer.fillColor = nil
shapeLayer.fillRule = kCAFillRuleEvenOdd
shapeLayer.fillRule = .evenOdd
return shapeLayer
}

Expand Down
Loading