Skip to content
This repository was archived by the owner on Dec 13, 2023. It is now read-only.

Commit be12229

Browse files
author
atsushi
authored
Merge pull request #6 from ogasawara-atsushi/feature-swift4
Support Swift4.2
2 parents fa6ad78 + a25faa5 commit be12229

17 files changed

Lines changed: 363 additions & 307 deletions

File tree

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
4.2

Example/LoadMoreTableViewController.xcodeproj/project.pbxproj

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@
177177
607FACCD1AFB9204008FA782 /* Frameworks */,
178178
607FACCE1AFB9204008FA782 /* Resources */,
179179
7A7FEF8CA1AF140553AC6B17 /* [CP] Embed Pods Frameworks */,
180-
F29B2257A4A37670F962CDB6 /* [CP] Copy Pods Resources */,
181180
);
182181
buildRules = (
183182
);
@@ -197,7 +196,6 @@
197196
607FACE21AFB9204008FA782 /* Frameworks */,
198197
607FACE31AFB9204008FA782 /* Resources */,
199198
2E5B4ED6227761D543B81B14 /* [CP] Embed Pods Frameworks */,
200-
9C076C47FEDA36BB1AA24DCF /* [CP] Copy Pods Resources */,
201199
);
202200
buildRules = (
203201
);
@@ -233,6 +231,7 @@
233231
developmentRegion = English;
234232
hasScannedForEncodings = 0;
235233
knownRegions = (
234+
English,
236235
en,
237236
Base,
238237
);
@@ -324,21 +323,6 @@
324323
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LoadMoreTableViewController_Example/Pods-LoadMoreTableViewController_Example-frameworks.sh\"\n";
325324
showEnvVarsInLog = 0;
326325
};
327-
9C076C47FEDA36BB1AA24DCF /* [CP] Copy Pods Resources */ = {
328-
isa = PBXShellScriptBuildPhase;
329-
buildActionMask = 2147483647;
330-
files = (
331-
);
332-
inputPaths = (
333-
);
334-
name = "[CP] Copy Pods Resources";
335-
outputPaths = (
336-
);
337-
runOnlyForDeploymentPostprocessing = 0;
338-
shellPath = /bin/sh;
339-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LoadMoreTableViewController_Tests/Pods-LoadMoreTableViewController_Tests-resources.sh\"\n";
340-
showEnvVarsInLog = 0;
341-
};
342326
D23E087F9D39876E9446D3E0 /* [CP] Check Pods Manifest.lock */ = {
343327
isa = PBXShellScriptBuildPhase;
344328
buildActionMask = 2147483647;
@@ -357,21 +341,6 @@
357341
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";
358342
showEnvVarsInLog = 0;
359343
};
360-
F29B2257A4A37670F962CDB6 /* [CP] Copy Pods Resources */ = {
361-
isa = PBXShellScriptBuildPhase;
362-
buildActionMask = 2147483647;
363-
files = (
364-
);
365-
inputPaths = (
366-
);
367-
name = "[CP] Copy Pods Resources";
368-
outputPaths = (
369-
);
370-
runOnlyForDeploymentPostprocessing = 0;
371-
shellPath = /bin/sh;
372-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LoadMoreTableViewController_Example/Pods-LoadMoreTableViewController_Example-resources.sh\"\n";
373-
showEnvVarsInLog = 0;
374-
};
375344
/* End PBXShellScriptBuildPhase section */
376345

377346
/* Begin PBXSourcesBuildPhase section */
@@ -466,7 +435,7 @@
466435
ONLY_ACTIVE_ARCH = YES;
467436
SDKROOT = iphoneos;
468437
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
469-
SWIFT_VERSION = 3.0;
438+
SWIFT_VERSION = 4.2;
470439
};
471440
name = Debug;
472441
};
@@ -506,7 +475,7 @@
506475
MTL_ENABLE_DEBUG_INFO = NO;
507476
SDKROOT = iphoneos;
508477
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
509-
SWIFT_VERSION = 3.0;
478+
SWIFT_VERSION = 4.2;
510479
VALIDATE_PRODUCT = YES;
511480
};
512481
name = Release;
@@ -522,7 +491,7 @@
522491
MODULE_NAME = ExampleApp;
523492
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.LoadMoreTableViewController-Example";
524493
PRODUCT_NAME = "$(TARGET_NAME)";
525-
SWIFT_VERSION = 3.0;
494+
SWIFT_VERSION = 4.2;
526495
};
527496
name = Debug;
528497
};
@@ -537,7 +506,7 @@
537506
MODULE_NAME = ExampleApp;
538507
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.LoadMoreTableViewController-Example";
539508
PRODUCT_NAME = "$(TARGET_NAME)";
540-
SWIFT_VERSION = 3.0;
509+
SWIFT_VERSION = 4.2;
541510
};
542511
name = Release;
543512
};
@@ -556,7 +525,7 @@
556525
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)";
557526
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
558527
PRODUCT_NAME = "$(TARGET_NAME)";
559-
SWIFT_VERSION = 3.0;
528+
SWIFT_VERSION = 4.2;
560529
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LoadMoreTableViewController_Example.app/LoadMoreTableViewController_Example";
561530
};
562531
name = Debug;
@@ -572,7 +541,7 @@
572541
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)";
573542
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
574543
PRODUCT_NAME = "$(TARGET_NAME)";
575-
SWIFT_VERSION = 3.0;
544+
SWIFT_VERSION = 4.2;
576545
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LoadMoreTableViewController_Example.app/LoadMoreTableViewController_Example";
577546
};
578547
name = Release;
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/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ end
1313
post_install do |installer|
1414
installer.pods_project.targets.each do |target|
1515
target.build_configurations.each do |config|
16-
config.build_settings['SWIFT_VERSION'] = '3.0'
16+
config.build_settings['SWIFT_VERSION'] = '4.2'
1717
end
1818
end
1919
end

Example/Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
PODS:
2-
- LoadMoreTableViewController (1.3.1)
2+
- LoadMoreTableViewController (2.0.0)
33

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

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

1111
SPEC CHECKSUMS:
12-
LoadMoreTableViewController: 325c1be56d959f58de933359a9e2ec85b4fdfde8
12+
LoadMoreTableViewController: d2d1a6c4337a42ee3436f99e93214ecc52835d2c
1313

14-
PODFILE CHECKSUM: 74bded010c43af9975c141a12f5ef6a5cbf88069
14+
PODFILE CHECKSUM: 933ae57a68d158cdc4d22297144458d9fdd3b53c
1515

16-
COCOAPODS: 1.4.0
16+
COCOAPODS: 1.5.3

Example/Pods/Local Podspecs/LoadMoreTableViewController.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: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)