Skip to content

Commit 354b740

Browse files
luiscampaniluiscampani
authored
Merge pull request #14 from luis-agibank/swift5
swift5
2 parents e770a94 + 2b87e7a commit 354b740

22 files changed

+590
-403
lines changed

‎Example/GeneralFormatter.xcodeproj/project.pbxproj‎

Lines changed: 31 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
8812A59DCCD945A12BF709DA /* Pods_GeneralFormatter_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GeneralFormatter_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4646
90BFE6D4AA5C10A73448A493 /* Pods-GeneralFormatter_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GeneralFormatter_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-GeneralFormatter_Tests/Pods-GeneralFormatter_Tests.debug.xcconfig"; sourceTree = "<group>"; };
4747
9D6648DEFD7CD7715B4659D0 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
48-
B319D7BEE10A2EB56BEF2E10 /* GeneralFormatter.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = GeneralFormatter.podspec; path = ../GeneralFormatter.podspec; sourceTree = "<group>"; };
48+
B319D7BEE10A2EB56BEF2E10 /* GeneralFormatter.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = GeneralFormatter.podspec; path = ../GeneralFormatter.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
4949
F4ED8244D2F25111589A8EDE /* Pods_GeneralFormatter_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GeneralFormatter_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5050
/* End PBXFileReference section */
5151

@@ -171,7 +171,6 @@
171171
607FACCD1AFB9204008FA782 /* Frameworks */,
172172
607FACCE1AFB9204008FA782 /* Resources */,
173173
50AC15B7082441C4F48BBF5B /* [CP] Embed Pods Frameworks */,
174-
1825808C5EF5BED5D7A0DA65 /* [CP] Copy Pods Resources */,
175174
);
176175
buildRules = (
177176
);
@@ -190,8 +189,6 @@
190189
607FACE11AFB9204008FA782 /* Sources */,
191190
607FACE21AFB9204008FA782 /* Frameworks */,
192191
607FACE31AFB9204008FA782 /* Resources */,
193-
BA92AA7D3CB6FC511AEA6D9C /* [CP] Embed Pods Frameworks */,
194-
B9F282E8CC63BDFAC39DE5F0 /* [CP] Copy Pods Resources */,
195192
);
196193
buildRules = (
197194
);
@@ -210,25 +207,25 @@
210207
isa = PBXProject;
211208
attributes = {
212209
LastSwiftUpdateCheck = 0720;
213-
LastUpgradeCheck = 0820;
210+
LastUpgradeCheck = 1010;
214211
ORGANIZATIONNAME = CocoaPods;
215212
TargetAttributes = {
216213
607FACCF1AFB9204008FA782 = {
217214
CreatedOnToolsVersion = 6.3.1;
218215
DevelopmentTeam = U4D7MD5WUL;
219-
LastSwiftMigration = 0820;
216+
LastSwiftMigration = 1110;
220217
};
221218
607FACE41AFB9204008FA782 = {
222219
CreatedOnToolsVersion = 6.3.1;
223220
DevelopmentTeam = U4D7MD5WUL;
224-
LastSwiftMigration = 0820;
221+
LastSwiftMigration = 1110;
225222
TestTargetID = 607FACCF1AFB9204008FA782;
226223
};
227224
};
228225
};
229226
buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "GeneralFormatter" */;
230227
compatibilityVersion = "Xcode 3.2";
231-
developmentRegion = English;
228+
developmentRegion = en;
232229
hasScannedForEncodings = 0;
233230
knownRegions = (
234231
en,
@@ -266,21 +263,6 @@
266263
/* End PBXResourcesBuildPhase section */
267264

268265
/* Begin PBXShellScriptBuildPhase section */
269-
1825808C5EF5BED5D7A0DA65 /* [CP] Copy Pods Resources */ = {
270-
isa = PBXShellScriptBuildPhase;
271-
buildActionMask = 2147483647;
272-
files = (
273-
);
274-
inputPaths = (
275-
);
276-
name = "[CP] Copy Pods Resources";
277-
outputPaths = (
278-
);
279-
runOnlyForDeploymentPostprocessing = 0;
280-
shellPath = /bin/sh;
281-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GeneralFormatter_Example/Pods-GeneralFormatter_Example-resources.sh\"\n";
282-
showEnvVarsInLog = 0;
283-
};
284266
4FC8C456A017B20882B818F2 /* [CP] Check Pods Manifest.lock */ = {
285267
isa = PBXShellScriptBuildPhase;
286268
buildActionMask = 2147483647;
@@ -305,7 +287,7 @@
305287
files = (
306288
);
307289
inputPaths = (
308-
"${SRCROOT}/Pods/Target Support Files/Pods-GeneralFormatter_Example/Pods-GeneralFormatter_Example-frameworks.sh",
290+
"${PODS_ROOT}/Target Support Files/Pods-GeneralFormatter_Example/Pods-GeneralFormatter_Example-frameworks.sh",
309291
"${BUILT_PRODUCTS_DIR}/GeneralFormatter/GeneralFormatter.framework",
310292
);
311293
name = "[CP] Embed Pods Frameworks";
@@ -314,7 +296,7 @@
314296
);
315297
runOnlyForDeploymentPostprocessing = 0;
316298
shellPath = /bin/sh;
317-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GeneralFormatter_Example/Pods-GeneralFormatter_Example-frameworks.sh\"\n";
299+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GeneralFormatter_Example/Pods-GeneralFormatter_Example-frameworks.sh\"\n";
318300
showEnvVarsInLog = 0;
319301
};
320302
58C4AEF06168DE9F3260495F /* [CP] Check Pods Manifest.lock */ = {
@@ -335,36 +317,6 @@
335317
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
336318
showEnvVarsInLog = 0;
337319
};
338-
B9F282E8CC63BDFAC39DE5F0 /* [CP] Copy Pods Resources */ = {
339-
isa = PBXShellScriptBuildPhase;
340-
buildActionMask = 2147483647;
341-
files = (
342-
);
343-
inputPaths = (
344-
);
345-
name = "[CP] Copy Pods Resources";
346-
outputPaths = (
347-
);
348-
runOnlyForDeploymentPostprocessing = 0;
349-
shellPath = /bin/sh;
350-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GeneralFormatter_Tests/Pods-GeneralFormatter_Tests-resources.sh\"\n";
351-
showEnvVarsInLog = 0;
352-
};
353-
BA92AA7D3CB6FC511AEA6D9C /* [CP] Embed Pods Frameworks */ = {
354-
isa = PBXShellScriptBuildPhase;
355-
buildActionMask = 2147483647;
356-
files = (
357-
);
358-
inputPaths = (
359-
);
360-
name = "[CP] Embed Pods Frameworks";
361-
outputPaths = (
362-
);
363-
runOnlyForDeploymentPostprocessing = 0;
364-
shellPath = /bin/sh;
365-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GeneralFormatter_Tests/Pods-GeneralFormatter_Tests-frameworks.sh\"\n";
366-
showEnvVarsInLog = 0;
367-
};
368320
/* End PBXShellScriptBuildPhase section */
369321

370322
/* Begin PBXSourcesBuildPhase section */
@@ -423,14 +375,22 @@
423375
CLANG_CXX_LIBRARY = "libc++";
424376
CLANG_ENABLE_MODULES = YES;
425377
CLANG_ENABLE_OBJC_ARC = YES;
378+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
426379
CLANG_WARN_BOOL_CONVERSION = YES;
380+
CLANG_WARN_COMMA = YES;
427381
CLANG_WARN_CONSTANT_CONVERSION = YES;
382+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
428383
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
429384
CLANG_WARN_EMPTY_BODY = YES;
430385
CLANG_WARN_ENUM_CONVERSION = YES;
431386
CLANG_WARN_INFINITE_RECURSION = YES;
432387
CLANG_WARN_INT_CONVERSION = YES;
388+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
389+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
390+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
433391
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
392+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
393+
CLANG_WARN_STRICT_PROTOTYPES = YES;
434394
CLANG_WARN_SUSPICIOUS_MOVE = YES;
435395
CLANG_WARN_UNREACHABLE_CODE = YES;
436396
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -470,14 +430,22 @@
470430
CLANG_CXX_LIBRARY = "libc++";
471431
CLANG_ENABLE_MODULES = YES;
472432
CLANG_ENABLE_OBJC_ARC = YES;
433+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
473434
CLANG_WARN_BOOL_CONVERSION = YES;
435+
CLANG_WARN_COMMA = YES;
474436
CLANG_WARN_CONSTANT_CONVERSION = YES;
437+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
475438
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
476439
CLANG_WARN_EMPTY_BODY = YES;
477440
CLANG_WARN_ENUM_CONVERSION = YES;
478441
CLANG_WARN_INFINITE_RECURSION = YES;
479442
CLANG_WARN_INT_CONVERSION = YES;
443+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
444+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
445+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
480446
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
447+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
448+
CLANG_WARN_STRICT_PROTOTYPES = YES;
481449
CLANG_WARN_SUSPICIOUS_MOVE = YES;
482450
CLANG_WARN_UNREACHABLE_CODE = YES;
483451
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -513,7 +481,8 @@
513481
MODULE_NAME = ExampleApp;
514482
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
515483
PRODUCT_NAME = "$(TARGET_NAME)";
516-
SWIFT_VERSION = 3.0;
484+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
485+
SWIFT_VERSION = 5.0;
517486
};
518487
name = Debug;
519488
};
@@ -528,7 +497,8 @@
528497
MODULE_NAME = ExampleApp;
529498
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
530499
PRODUCT_NAME = "$(TARGET_NAME)";
531-
SWIFT_VERSION = 3.0;
500+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
501+
SWIFT_VERSION = 5.0;
532502
};
533503
name = Release;
534504
};
@@ -549,7 +519,8 @@
549519
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
550520
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
551521
PRODUCT_NAME = "$(TARGET_NAME)";
552-
SWIFT_VERSION = 3.0;
522+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
523+
SWIFT_VERSION = 5.0;
553524
};
554525
name = Debug;
555526
};
@@ -566,7 +537,8 @@
566537
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
567538
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
568539
PRODUCT_NAME = "$(TARGET_NAME)";
569-
SWIFT_VERSION = 3.0;
540+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
541+
SWIFT_VERSION = 5.0;
570542
};
571543
name = Release;
572544
};

‎Example/GeneralFormatter.xcodeproj/xcshareddata/xcschemes/GeneralFormatter-Example.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Example/GeneralFormatter.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
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/GeneralFormatter/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

17-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
17+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1818
// Override point for customization after application launch.
1919
return true
2020
}

‎Example/Podfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
PODS:
2-
- GeneralFormatter (2.2.2)
2+
- GeneralFormatter (2.2.3)
33

44
DEPENDENCIES:
55
- GeneralFormatter (from `../`)
66

77
EXTERNAL SOURCES:
88
GeneralFormatter:
9-
:path: ../
9+
:path: "../"
1010

1111
SPEC CHECKSUMS:
12-
GeneralFormatter: 4867686897098e89327b21397867707d64f1d194
12+
GeneralFormatter: a6dac537cb677c192637cfeb07ca2ba5c904f978
1313

1414
PODFILE CHECKSUM: ec4a3bc57021d94ba554319e839e0fcdacabf704
1515

16-
COCOAPODS: 1.3.1
16+
COCOAPODS: 1.8.3

‎Example/Pods/Local Podspecs/GeneralFormatter.podspec.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Manifest.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)