Skip to content

Commit 1185004

Browse files
committed
Update pastel example using swift 5
1 parent aec0ba1 commit 1185004

File tree

4 files changed

+37
-30
lines changed

4 files changed

+37
-30
lines changed

Example/Pastel.xcodeproj/project.pbxproj

+17-18
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,10 @@
212212
TargetAttributes = {
213213
607FACCF1AFB9204008FA782 = {
214214
CreatedOnToolsVersion = 6.3.1;
215-
DevelopmentTeam = 3YN6YPP3YC;
216215
LastSwiftMigration = 0920;
217216
};
218217
607FACE41AFB9204008FA782 = {
219218
CreatedOnToolsVersion = 6.3.1;
220-
DevelopmentTeam = 3YN6YPP3YC;
221219
LastSwiftMigration = 0920;
222220
TestTargetID = 607FACCF1AFB9204008FA782;
223221
};
@@ -228,6 +226,7 @@
228226
developmentRegion = English;
229227
hasScannedForEncodings = 0;
230228
knownRegions = (
229+
English,
231230
en,
232231
Base,
233232
);
@@ -269,7 +268,7 @@
269268
files = (
270269
);
271270
inputPaths = (
272-
"${SRCROOT}/Pods/Target Support Files/Pods-Pastel_Example/Pods-Pastel_Example-frameworks.sh",
271+
"${PODS_ROOT}/Target Support Files/Pods-Pastel_Example/Pods-Pastel_Example-frameworks.sh",
273272
"${BUILT_PRODUCTS_DIR}/Pastel/Pastel.framework",
274273
);
275274
name = "[CP] Embed Pods Frameworks";
@@ -278,7 +277,7 @@
278277
);
279278
runOnlyForDeploymentPostprocessing = 0;
280279
shellPath = /bin/sh;
281-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Pastel_Example/Pods-Pastel_Example-frameworks.sh\"\n";
280+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Pastel_Example/Pods-Pastel_Example-frameworks.sh\"\n";
282281
showEnvVarsInLog = 0;
283282
};
284283
408A916A556BF553CFBE03BD /* [CP] Check Pods Manifest.lock */ = {
@@ -323,7 +322,7 @@
323322
files = (
324323
);
325324
inputPaths = (
326-
"${SRCROOT}/Pods/Target Support Files/Pods-Pastel_Tests/Pods-Pastel_Tests-frameworks.sh",
325+
"${PODS_ROOT}/Target Support Files/Pods-Pastel_Tests/Pods-Pastel_Tests-frameworks.sh",
327326
"${BUILT_PRODUCTS_DIR}/FBSnapshotTestCase/FBSnapshotTestCase.framework",
328327
"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
329328
"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
@@ -336,7 +335,7 @@
336335
);
337336
runOnlyForDeploymentPostprocessing = 0;
338337
shellPath = /bin/sh;
339-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Pastel_Tests/Pods-Pastel_Tests-frameworks.sh\"\n";
338+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Pastel_Tests/Pods-Pastel_Tests-frameworks.sh\"\n";
340339
showEnvVarsInLog = 0;
341340
};
342341
/* End PBXShellScriptBuildPhase section */
@@ -430,12 +429,12 @@
430429
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
431430
GCC_WARN_UNUSED_FUNCTION = YES;
432431
GCC_WARN_UNUSED_VARIABLE = YES;
433-
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
432+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
434433
MTL_ENABLE_DEBUG_INFO = YES;
435434
ONLY_ACTIVE_ARCH = YES;
436435
SDKROOT = iphoneos;
437436
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
438-
SWIFT_VERSION = 4.2;
437+
SWIFT_VERSION = 5.0;
439438
};
440439
name = Debug;
441440
};
@@ -471,11 +470,11 @@
471470
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
472471
GCC_WARN_UNUSED_FUNCTION = YES;
473472
GCC_WARN_UNUSED_VARIABLE = YES;
474-
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
473+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
475474
MTL_ENABLE_DEBUG_INFO = NO;
476475
SDKROOT = iphoneos;
477476
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
478-
SWIFT_VERSION = 4.2;
477+
SWIFT_VERSION = 5.0;
479478
VALIDATE_PRODUCT = YES;
480479
};
481480
name = Release;
@@ -485,15 +484,15 @@
485484
baseConfigurationReference = CB20DB7554AFF5AF4D3FD8E9 /* Pods-Pastel_Example.debug.xcconfig */;
486485
buildSettings = {
487486
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
488-
DEVELOPMENT_TEAM = 3YN6YPP3YC;
487+
DEVELOPMENT_TEAM = "";
489488
INFOPLIST_FILE = "Example for Pastel/Supporting Files/Info.plist";
490489
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
491490
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
492491
MODULE_NAME = ExampleApp;
493492
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
494493
PRODUCT_NAME = "$(TARGET_NAME)";
495494
SWIFT_SWIFT3_OBJC_INFERENCE = On;
496-
SWIFT_VERSION = 4.2;
495+
SWIFT_VERSION = 5.0;
497496
};
498497
name = Debug;
499498
};
@@ -502,23 +501,23 @@
502501
baseConfigurationReference = 5E01E37F1C25FDCAFB746FF8 /* Pods-Pastel_Example.release.xcconfig */;
503502
buildSettings = {
504503
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
505-
DEVELOPMENT_TEAM = 3YN6YPP3YC;
504+
DEVELOPMENT_TEAM = "";
506505
INFOPLIST_FILE = "Example for Pastel/Supporting Files/Info.plist";
507506
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
508507
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
509508
MODULE_NAME = ExampleApp;
510509
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
511510
PRODUCT_NAME = "$(TARGET_NAME)";
512511
SWIFT_SWIFT3_OBJC_INFERENCE = On;
513-
SWIFT_VERSION = 4.2;
512+
SWIFT_VERSION = 5.0;
514513
};
515514
name = Release;
516515
};
517516
607FACF31AFB9204008FA782 /* Debug */ = {
518517
isa = XCBuildConfiguration;
519518
baseConfigurationReference = 8DA96A4B558C1F88A36AE271 /* Pods-Pastel_Tests.debug.xcconfig */;
520519
buildSettings = {
521-
DEVELOPMENT_TEAM = 3YN6YPP3YC;
520+
DEVELOPMENT_TEAM = "";
522521
FRAMEWORK_SEARCH_PATHS = (
523522
"$(SDKROOT)/Developer/Library/Frameworks",
524523
"$(inherited)",
@@ -533,15 +532,15 @@
533532
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
534533
PRODUCT_NAME = "$(TARGET_NAME)";
535534
SWIFT_SWIFT3_OBJC_INFERENCE = On;
536-
SWIFT_VERSION = 4.2;
535+
SWIFT_VERSION = 5.0;
537536
};
538537
name = Debug;
539538
};
540539
607FACF41AFB9204008FA782 /* Release */ = {
541540
isa = XCBuildConfiguration;
542541
baseConfigurationReference = BB32B4E9AB1E131D60C3BFFE /* Pods-Pastel_Tests.release.xcconfig */;
543542
buildSettings = {
544-
DEVELOPMENT_TEAM = 3YN6YPP3YC;
543+
DEVELOPMENT_TEAM = "";
545544
FRAMEWORK_SEARCH_PATHS = (
546545
"$(SDKROOT)/Developer/Library/Frameworks",
547546
"$(inherited)",
@@ -552,7 +551,7 @@
552551
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
553552
PRODUCT_NAME = "$(TARGET_NAME)";
554553
SWIFT_SWIFT3_OBJC_INFERENCE = On;
555-
SWIFT_VERSION = 4.2;
554+
SWIFT_VERSION = 5.0;
556555
};
557556
name = Release;
558557
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

Example/Podfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ inhibit_all_warnings!
44

55
def test_pods
66
pod 'FBSnapshotTestCase'
7-
pod 'Nimble', '~> 7.3.1'
8-
pod 'Quick', '~> 1.3.2'
7+
pod 'Nimble', '~> 8.0.2'
8+
pod 'Quick', '~> 2.1.0'
99

1010
end
1111

Example/Podfile.lock

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ PODS:
44
- FBSnapshotTestCase/Core (2.1.4)
55
- FBSnapshotTestCase/SwiftSupport (2.1.4):
66
- FBSnapshotTestCase/Core
7-
- Nimble (7.3.1)
8-
- Pastel (0.5.1)
9-
- Quick (1.3.2)
7+
- Nimble (8.0.2)
8+
- Pastel (0.6.0)
9+
- Quick (2.1.0)
1010

1111
DEPENDENCIES:
1212
- FBSnapshotTestCase
13-
- Nimble (~> 7.3.1)
13+
- Nimble (~> 8.0.2)
1414
- Pastel (from `../`)
15-
- Quick (~> 1.3.2)
15+
- Quick (~> 2.1.0)
1616

1717
SPEC REPOS:
1818
https://github.com/cocoapods/specs.git:
@@ -26,10 +26,10 @@ EXTERNAL SOURCES:
2626

2727
SPEC CHECKSUMS:
2828
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
29-
Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
30-
Pastel: 64859011b6c472c685b5d01f103f7b28b06deaa4
31-
Quick: 2623cb30d7a7f41ca62f684f679586558f483d46
29+
Nimble: 622629381bda1dd5678162f21f1368cec7cbba60
30+
Pastel: 814f081efbe2859c37e65ee44f396e6e5be88619
31+
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
3232

33-
PODFILE CHECKSUM: 721b0e7e917b4fce095b650311c7bd1bd58dda68
33+
PODFILE CHECKSUM: baa26f90ab44178c551100a5f742133893ec01f6
3434

35-
COCOAPODS: 1.5.3
35+
COCOAPODS: 1.7.3

0 commit comments

Comments
 (0)