-
Notifications
You must be signed in to change notification settings - Fork 98
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #35 from superpeteblaze/psmith/v2.2
Psmith/v2.2
- Loading branch information
Showing
14 changed files
with
113 additions
and
87 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
4 changes: 1 addition & 3 deletions
4
Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/ScalingCarousel.xcscheme
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,6 +15,7 @@ | |
607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; }; | ||
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; }; | ||
607FACEC1AFB9204008FA782 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* Tests.swift */; }; | ||
65678AFE206FEAF900A0ED42 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 65678AFD206FEAF900A0ED42 /* [email protected] */; }; | ||
65E99FA11E1519D50026BEC4 /* CodeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65E99FA01E1519D50026BEC4 /* CodeViewController.swift */; }; | ||
/* End PBXBuildFile section */ | ||
|
||
|
@@ -43,6 +44,7 @@ | |
607FACE51AFB9204008FA782 /* ScalingCarousel_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ScalingCarousel_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; | ||
607FACEA1AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; | ||
607FACEB1AFB9204008FA782 /* Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests.swift; sourceTree = "<group>"; }; | ||
65678AFD206FEAF900A0ED42 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; }; | ||
659A02AC202F775500587C36 /* ScalingCarousel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScalingCarousel.h; sourceTree = "<group>"; }; | ||
659A02AD202F775500587C36 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; | ||
65E99FA01E1519D50026BEC4 /* CodeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CodeViewController.swift; sourceTree = "<group>"; }; | ||
|
@@ -85,6 +87,7 @@ | |
607FACC71AFB9204008FA782 = { | ||
isa = PBXGroup; | ||
children = ( | ||
65678AFD206FEAF900A0ED42 /* [email protected] */, | ||
607FACF51AFB993E008FA782 /* Podspec Metadata */, | ||
607FACD21AFB9204008FA782 /* Example */, | ||
607FACE81AFB9204008FA782 /* Tests */, | ||
|
@@ -257,15 +260,17 @@ | |
isa = PBXProject; | ||
attributes = { | ||
LastSwiftUpdateCheck = 0720; | ||
LastUpgradeCheck = 0900; | ||
LastUpgradeCheck = 0930; | ||
ORGANIZATIONNAME = CocoaPods; | ||
TargetAttributes = { | ||
607FACCF1AFB9204008FA782 = { | ||
CreatedOnToolsVersion = 6.3.1; | ||
DevelopmentTeam = 49CJ89TL4W; | ||
LastSwiftMigration = 0900; | ||
}; | ||
607FACE41AFB9204008FA782 = { | ||
CreatedOnToolsVersion = 6.3.1; | ||
DevelopmentTeam = 49CJ89TL4W; | ||
LastSwiftMigration = 0900; | ||
TestTargetID = 607FACCF1AFB9204008FA782; | ||
}; | ||
|
@@ -296,6 +301,7 @@ | |
buildActionMask = 2147483647; | ||
files = ( | ||
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */, | ||
65678AFE206FEAF900A0ED42 /* [email protected] in Resources */, | ||
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */, | ||
607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */, | ||
); | ||
|
@@ -473,12 +479,14 @@ | |
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; | ||
|
@@ -526,12 +534,14 @@ | |
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; | ||
|
@@ -566,6 +576,7 @@ | |
buildSettings = { | ||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; | ||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | ||
DEVELOPMENT_TEAM = 49CJ89TL4W; | ||
INFOPLIST_FILE = ScalingCarousel/Info.plist; | ||
IPHONEOS_DEPLOYMENT_TARGET = 9.0; | ||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; | ||
|
@@ -583,6 +594,7 @@ | |
buildSettings = { | ||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; | ||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | ||
DEVELOPMENT_TEAM = 49CJ89TL4W; | ||
INFOPLIST_FILE = ScalingCarousel/Info.plist; | ||
IPHONEOS_DEPLOYMENT_TARGET = 9.0; | ||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; | ||
|
@@ -598,6 +610,7 @@ | |
isa = XCBuildConfiguration; | ||
baseConfigurationReference = BA63361010B0F437C40DBABF /* Pods-ScalingCarousel_Tests.debug.xcconfig */; | ||
buildSettings = { | ||
DEVELOPMENT_TEAM = 49CJ89TL4W; | ||
FRAMEWORK_SEARCH_PATHS = ( | ||
"$(SDKROOT)/Developer/Library/Frameworks", | ||
"$(inherited)", | ||
|
@@ -619,6 +632,7 @@ | |
isa = XCBuildConfiguration; | ||
baseConfigurationReference = 2AC39C6CC3E82205FC41C768 /* Pods-ScalingCarousel_Tests.release.xcconfig */; | ||
buildSettings = { | ||
DEVELOPMENT_TEAM = 49CJ89TL4W; | ||
FRAMEWORK_SEARCH_PATHS = ( | ||
"$(SDKROOT)/Developer/Library/Frameworks", | ||
"$(inherited)", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
Example/ScalingCarousel.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
<plist version="1.0"> | ||
<dict> | ||
<key>IDEDidComputeMac32BitWarning</key> | ||
<true/> | ||
</dict> | ||
</plist> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.