Skip to content

Commit 24da791

Browse files
devxouldevxoul
committed
Update example project to Swift 4
1 parent dbe43f4 commit 24da791

File tree

4 files changed

+49
-11
lines changed

4 files changed

+49
-11
lines changed

‎Example/Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- CGFloatLiteral (0.3.0)
2+
- CGFloatLiteral (0.4.0)
33
- ManualLayout (1.3.0)
44
- ReusableKit (1.3.0):
55
- ReusableKit/Core (= 1.3.0)
@@ -18,7 +18,7 @@ PODS:
1818
- SnapKit (4.0.0)
1919
- SwiftyColor (1.0.0)
2020
- SwiftyImage (1.2.0)
21-
- Then (2.1.1)
21+
- Then (2.2.0)
2222
- UITextView+Placeholder (1.2.0)
2323

2424
DEPENDENCIES:
@@ -37,16 +37,16 @@ EXTERNAL SOURCES:
3737
:path: ../
3838

3939
SPEC CHECKSUMS:
40-
CGFloatLiteral: faba125ab2bb8fa90142c414f876b83099c26f25
40+
CGFloatLiteral: 2ab558b74124b584dd023a35b7e41795a61d8140
4141
ManualLayout: 68ac8cfa6b5f656f7a9fadec3730208b95986880
4242
ReusableKit: 4e4f45128985987555bde17abbf261c0a604f9f2
4343
RxCocoa: 8d809675f4e89c5c4c5a6900bbd11fe632ad5d86
44-
RxKeyboard: 47be2ee793a7fd39e683b8ac86c610c02f5e49b5
44+
RxKeyboard: 4167b1f005745a4178c3ac4adfc8177482b87675
4545
RxSwift: e0899fae37065c16db976cc5e3c957e4e388869c
4646
SnapKit: a42d492c16e80209130a3379f73596c3454b7694
4747
SwiftyColor: 7fa09db14051bc5d7f539e1c4576665975225992
4848
SwiftyImage: ebaa7c7b6163cd4ad102f3bb05a8fb276d35b4f3
49-
Then: 823a7503a851737269ba8d40e688b4db874dbd2d
49+
Then: 823f9813e1d4d0a814a5ba15e9c9d33ec7aca631
5050
UITextView+Placeholder: 77680995fcdd07c3f52ec92fe1150874a2ac89ff
5151

5252
PODFILE CHECKSUM: 49cf5def62bcfa2dfbe0c5118a9372a4162ec992

‎Example/RxKeyboardExample.xcodeproj/project.pbxproj

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
isa = PBXProject;
168168
attributes = {
169169
LastSwiftUpdateCheck = 0820;
170-
LastUpgradeCheck = 0820;
170+
LastUpgradeCheck = 0900;
171171
ORGANIZATIONNAME = "Suyeol Jeon";
172172
TargetAttributes = {
173173
03E8A71D1E35A95B00F7A3EC = {
@@ -228,13 +228,16 @@
228228
files = (
229229
);
230230
inputPaths = (
231+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
232+
"${PODS_ROOT}/Manifest.lock",
231233
);
232234
name = "[CP] Check Pods Manifest.lock";
233235
outputPaths = (
236+
"$(DERIVED_FILE_DIR)/Pods-RxKeyboardExample-checkManifestLockResult.txt",
234237
);
235238
runOnlyForDeploymentPostprocessing = 0;
236239
shellPath = /bin/sh;
237-
shellScript = "diff \"${PODS_ROOT}/../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";
240+
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";
238241
showEnvVarsInLog = 0;
239242
};
240243
E857CEA8F03D723AC93BD7A1 /* [CP] Embed Pods Frameworks */ = {
@@ -243,9 +246,32 @@
243246
files = (
244247
);
245248
inputPaths = (
249+
"${SRCROOT}/Pods/Target Support Files/Pods-RxKeyboardExample/Pods-RxKeyboardExample-frameworks.sh",
250+
"${BUILT_PRODUCTS_DIR}/CGFloatLiteral/CGFloatLiteral.framework",
251+
"${BUILT_PRODUCTS_DIR}/ManualLayout/ManualLayout.framework",
252+
"${BUILT_PRODUCTS_DIR}/ReusableKit/ReusableKit.framework",
253+
"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
254+
"${BUILT_PRODUCTS_DIR}/RxKeyboard/RxKeyboard.framework",
255+
"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
256+
"${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework",
257+
"${BUILT_PRODUCTS_DIR}/SwiftyColor/SwiftyColor.framework",
258+
"${BUILT_PRODUCTS_DIR}/SwiftyImage/SwiftyImage.framework",
259+
"${BUILT_PRODUCTS_DIR}/Then/Then.framework",
260+
"${BUILT_PRODUCTS_DIR}/UITextView+Placeholder/UITextView_Placeholder.framework",
246261
);
247262
name = "[CP] Embed Pods Frameworks";
248263
outputPaths = (
264+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CGFloatLiteral.framework",
265+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ManualLayout.framework",
266+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReusableKit.framework",
267+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
268+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxKeyboard.framework",
269+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
270+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework",
271+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyColor.framework",
272+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyImage.framework",
273+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Then.framework",
274+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/UITextView_Placeholder.framework",
249275
);
250276
runOnlyForDeploymentPostprocessing = 0;
251277
shellPath = /bin/sh;
@@ -291,15 +317,21 @@
291317
CLANG_CXX_LIBRARY = "libc++";
292318
CLANG_ENABLE_MODULES = YES;
293319
CLANG_ENABLE_OBJC_ARC = YES;
320+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
294321
CLANG_WARN_BOOL_CONVERSION = YES;
322+
CLANG_WARN_COMMA = YES;
295323
CLANG_WARN_CONSTANT_CONVERSION = YES;
296324
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
297325
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
298326
CLANG_WARN_EMPTY_BODY = YES;
299327
CLANG_WARN_ENUM_CONVERSION = YES;
300328
CLANG_WARN_INFINITE_RECURSION = YES;
301329
CLANG_WARN_INT_CONVERSION = YES;
330+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
331+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
302332
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
333+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
334+
CLANG_WARN_STRICT_PROTOTYPES = YES;
303335
CLANG_WARN_SUSPICIOUS_MOVE = YES;
304336
CLANG_WARN_UNREACHABLE_CODE = YES;
305337
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -328,6 +360,7 @@
328360
SDKROOT = iphoneos;
329361
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
330362
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
363+
SWIFT_VERSION = 4.0;
331364
};
332365
name = Debug;
333366
};
@@ -340,15 +373,21 @@
340373
CLANG_CXX_LIBRARY = "libc++";
341374
CLANG_ENABLE_MODULES = YES;
342375
CLANG_ENABLE_OBJC_ARC = YES;
376+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
343377
CLANG_WARN_BOOL_CONVERSION = YES;
378+
CLANG_WARN_COMMA = YES;
344379
CLANG_WARN_CONSTANT_CONVERSION = YES;
345380
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
346381
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
347382
CLANG_WARN_EMPTY_BODY = YES;
348383
CLANG_WARN_ENUM_CONVERSION = YES;
349384
CLANG_WARN_INFINITE_RECURSION = YES;
350385
CLANG_WARN_INT_CONVERSION = YES;
386+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
387+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
351388
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
389+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
390+
CLANG_WARN_STRICT_PROTOTYPES = YES;
352391
CLANG_WARN_SUSPICIOUS_MOVE = YES;
353392
CLANG_WARN_UNREACHABLE_CODE = YES;
354393
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -369,6 +408,7 @@
369408
MTL_ENABLE_DEBUG_INFO = NO;
370409
SDKROOT = iphoneos;
371410
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
411+
SWIFT_VERSION = 4.0;
372412
VALIDATE_PRODUCT = YES;
373413
};
374414
name = Release;
@@ -382,7 +422,6 @@
382422
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
383423
PRODUCT_BUNDLE_IDENTIFIER = kr.xoul.RxKeyboardExample;
384424
PRODUCT_NAME = RxKeyboardRxKeyboardExample;
385-
SWIFT_VERSION = 3.0;
386425
};
387426
name = Debug;
388427
};
@@ -395,7 +434,6 @@
395434
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
396435
PRODUCT_BUNDLE_IDENTIFIER = kr.xoul.RxKeyboardExample;
397436
PRODUCT_NAME = RxKeyboardRxKeyboardExample;
398-
SWIFT_VERSION = 3.0;
399437
};
400438
name = Release;
401439
};

‎Example/Sources/Views/MessageCell.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ final class MessageCell: UICollectionViewCell {
9595
let labelWidth = Metric.maximumBalloonWidth - Metric.balloonViewInset * 2
9696
let constraintSize = CGSize(width: labelWidth, height: CGFloat.greatestFiniteMagnitude)
9797
let options: NSStringDrawingOptions = [.usesLineFragmentOrigin, .usesFontLeading]
98-
let attributes: [String: Any] = [NSFontAttributeName: Font.label]
98+
let attributes: [NSAttributedStringKey: Any] = [.font: Font.label]
9999
let rect = message.text.boundingRect(with: constraintSize, options: options, attributes: attributes, context: nil)
100100
let labelHeight = ceil(rect.height)
101101
return CGSize(width: width, height: labelHeight + Metric.balloonViewInset * 2)

‎RxKeyboard.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Pod::Spec.new do |s|
77
s.author = { 'Suyeol Jeon' => '[email protected]' }
88
s.source = { :git => 'https://github.com/RxSwiftCommunity/RxKeyboard.git',
99
:tag => s.version.to_s }
10-
s.source_files = 'Sources/*.swift'
10+
s.source_files = 'Sources/**/*.swift'
1111
s.frameworks = 'UIKit', 'Foundation'
1212
s.requires_arc = true
1313

0 commit comments

Comments
 (0)