Skip to content

Commit

Permalink
Update pastel example using swift 5
Browse files Browse the repository at this point in the history
  • Loading branch information
cruisediary committed Jul 27, 2019
1 parent aec0ba1 commit 1185004
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 30 deletions.
35 changes: 17 additions & 18 deletions Example/Pastel.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,10 @@
TargetAttributes = {
607FACCF1AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
DevelopmentTeam = 3YN6YPP3YC;
LastSwiftMigration = 0920;
};
607FACE41AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
DevelopmentTeam = 3YN6YPP3YC;
LastSwiftMigration = 0920;
TestTargetID = 607FACCF1AFB9204008FA782;
};
Expand All @@ -228,6 +226,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -269,7 +268,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Pastel_Example/Pods-Pastel_Example-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-Pastel_Example/Pods-Pastel_Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Pastel/Pastel.framework",
);
name = "[CP] Embed Pods Frameworks";
Expand All @@ -278,7 +277,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Pastel_Example/Pods-Pastel_Example-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Pastel_Example/Pods-Pastel_Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
408A916A556BF553CFBE03BD /* [CP] Check Pods Manifest.lock */ = {
Expand Down Expand Up @@ -323,7 +322,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Pastel_Tests/Pods-Pastel_Tests-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-Pastel_Tests/Pods-Pastel_Tests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/FBSnapshotTestCase/FBSnapshotTestCase.framework",
"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
Expand All @@ -336,7 +335,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Pastel_Tests/Pods-Pastel_Tests-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Pastel_Tests/Pods-Pastel_Tests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -430,12 +429,12 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand Down Expand Up @@ -471,11 +470,11 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand All @@ -485,15 +484,15 @@
baseConfigurationReference = CB20DB7554AFF5AF4D3FD8E9 /* Pods-Pastel_Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = 3YN6YPP3YC;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "Example for Pastel/Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -502,23 +501,23 @@
baseConfigurationReference = 5E01E37F1C25FDCAFB746FF8 /* Pods-Pastel_Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = 3YN6YPP3YC;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "Example for Pastel/Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
607FACF31AFB9204008FA782 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 8DA96A4B558C1F88A36AE271 /* Pods-Pastel_Tests.debug.xcconfig */;
buildSettings = {
DEVELOPMENT_TEAM = 3YN6YPP3YC;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
Expand All @@ -533,15 +532,15 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
607FACF41AFB9204008FA782 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = BB32B4E9AB1E131D60C3BFFE /* Pods-Pastel_Tests.release.xcconfig */;
buildSettings = {
DEVELOPMENT_TEAM = 3YN6YPP3YC;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
Expand All @@ -552,7 +551,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
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>
4 changes: 2 additions & 2 deletions Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ inhibit_all_warnings!

def test_pods
pod 'FBSnapshotTestCase'
pod 'Nimble', '~> 7.3.1'
pod 'Quick', '~> 1.3.2'
pod 'Nimble', '~> 8.0.2'
pod 'Quick', '~> 2.1.0'

end

Expand Down
20 changes: 10 additions & 10 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ PODS:
- FBSnapshotTestCase/Core (2.1.4)
- FBSnapshotTestCase/SwiftSupport (2.1.4):
- FBSnapshotTestCase/Core
- Nimble (7.3.1)
- Pastel (0.5.1)
- Quick (1.3.2)
- Nimble (8.0.2)
- Pastel (0.6.0)
- Quick (2.1.0)

DEPENDENCIES:
- FBSnapshotTestCase
- Nimble (~> 7.3.1)
- Nimble (~> 8.0.2)
- Pastel (from `../`)
- Quick (~> 1.3.2)
- Quick (~> 2.1.0)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
Expand All @@ -26,10 +26,10 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
Pastel: 64859011b6c472c685b5d01f103f7b28b06deaa4
Quick: 2623cb30d7a7f41ca62f684f679586558f483d46
Nimble: 622629381bda1dd5678162f21f1368cec7cbba60
Pastel: 814f081efbe2859c37e65ee44f396e6e5be88619
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d

PODFILE CHECKSUM: 721b0e7e917b4fce095b650311c7bd1bd58dda68
PODFILE CHECKSUM: baa26f90ab44178c551100a5f742133893ec01f6

COCOAPODS: 1.5.3
COCOAPODS: 1.7.3

0 comments on commit 1185004

Please sign in to comment.