Skip to content

Commit 64c15cc

Browse files
nathantannar4nathantannar4
committed
Merge branch 'development'
2 parents f638dbd + 0b9896e commit 64c15cc

20 files changed

+54
-59
lines changed

‎.swift-version

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

‎Example/Example.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@
387387
);
388388
PRODUCT_BUNDLE_IDENTIFIER = com.messagekit.MessageInputBar.Example;
389389
PRODUCT_NAME = "$(TARGET_NAME)";
390-
SWIFT_VERSION = 4.0;
390+
SWIFT_VERSION = 4.2;
391391
TARGETED_DEVICE_FAMILY = "1,2";
392392
};
393393
name = Debug;
@@ -406,7 +406,7 @@
406406
);
407407
PRODUCT_BUNDLE_IDENTIFIER = com.messagekit.MessageInputBar.Example;
408408
PRODUCT_NAME = "$(TARGET_NAME)";
409-
SWIFT_VERSION = 4.0;
409+
SWIFT_VERSION = 4.2;
410410
TARGETED_DEVICE_FAMILY = "1,2";
411411
};
412412
name = Release;

‎Example/Example/AppDelegate.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
2929
var window: UIWindow?
3030

3131

32-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
32+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
3333
// Override point for customization after application launch.
3434

35-
UIApplication.shared.statusBarStyle = .lightContent
36-
3735
window = UIWindow()
3836
window?.backgroundColor = .white
3937
let splitViewController = SplitViewController()

‎Example/Example/ExampleViewController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,10 @@ extension ExampleViewController: AutocompleteManagerDelegate, AutocompleteManage
229229

230230
extension ExampleViewController: UIImagePickerControllerDelegate, UINavigationControllerDelegate {
231231

232-
func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) {
232+
private func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) {
233233

234234
dismiss(animated: true, completion: {
235-
if let pickedImage = info[UIImagePickerControllerOriginalImage] as? UIImage {
235+
if let pickedImage = info[UIImagePickerController.InfoKey.originalImage.rawValue] as? UIImage {
236236
let handled = self.attachmentManager.handleInput(of: pickedImage)
237237
if !handled {
238238
// throw error

‎Example/Example/Style Examples/SlackInputBar.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ class SlackInputBar: MessageInputBar {
129129

130130
extension SlackInputBar: UIImagePickerControllerDelegate, UINavigationControllerDelegate {
131131

132-
func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) {
132+
private func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) {
133133

134134
picker.dismiss(animated: true, completion: {
135-
if let pickedImage = info[UIImagePickerControllerOriginalImage] as? UIImage {
135+
if let pickedImage = info[UIImagePickerController.InfoKey.originalImage.rawValue] as? UIImage {
136136
self.plugins.forEach { _ = $0.handleInput(of: pickedImage) }
137137
}
138138
})

‎Example/Example/TableViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ final class TableViewController: UITableViewController {
3737
navigationItem.backBarButtonItem = UIBarButtonItem(title: "Styles", style: .plain, target: nil, action: nil)
3838
navigationController?.navigationBar.tintColor = .white
3939
navigationController?.navigationBar.barTintColor = UIColor(red: 69/255, green: 193/255, blue: 89/255, alpha: 1)
40-
navigationController?.navigationBar.titleTextAttributes = [NSAttributedStringKey.foregroundColor: UIColor.white, NSAttributedStringKey.font: UIFont.systemFont(ofSize: 20, weight: UIFont.Weight.bold) ]
40+
navigationController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.white, NSAttributedString.Key.font: UIFont.systemFont(ofSize: 20, weight: UIFont.Weight.bold) ]
4141
}
4242

4343
override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {

‎Example/Podfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
PODS:
2-
- MessageInputBar (0.2.2):
3-
- MessageInputBar/Core (= 0.2.2)
4-
- MessageInputBar/AttachmentManager (0.2.2):
2+
- MessageInputBar (0.4.0):
3+
- MessageInputBar/Core (= 0.4.0)
4+
- MessageInputBar/AttachmentManager (0.4.0):
55
- MessageInputBar/Core
6-
- MessageInputBar/AutocompleteManager (0.2.2):
6+
- MessageInputBar/AutocompleteManager (0.4.0):
77
- MessageInputBar/Core
8-
- MessageInputBar/Core (0.2.2)
8+
- MessageInputBar/Core (0.4.0)
99

1010
DEPENDENCIES:
1111
- MessageInputBar (from `../`)
@@ -17,7 +17,7 @@ EXTERNAL SOURCES:
1717
:path: "../"
1818

1919
SPEC CHECKSUMS:
20-
MessageInputBar: 420071067412a5b21b3e9cf74ee4f921e42e8b5b
20+
MessageInputBar: 89b524f5dea5599acbeb9ce17ab269eb3683d683
2121

2222
PODFILE CHECKSUM: 59ceff645e2e779969697ee2390f43a1a67332f9
2323

‎MessageInputBar.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Pod::Spec.new do |s|
88
s.requires_arc = true
99

1010
# 2 - Version
11-
s.version = '0.3.0'
11+
s.version = '0.4.0'
1212
s.pod_target_xcconfig = {
13-
"SWIFT_VERSION" => "4.0",
13+
"SWIFT_VERSION" => "4.2",
1414
}
1515
s.ios.deployment_target = '9.0'
1616
s.source = { :git => 'https://github.com/MessageKit/MessageInputBar.git', :tag => s.version }

‎MessageInputBar.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@
593593
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
594594
SKIP_INSTALL = YES;
595595
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
596-
SWIFT_VERSION = 4.0;
596+
SWIFT_VERSION = 4.2;
597597
TARGETED_DEVICE_FAMILY = "1,2";
598598
};
599599
name = Debug;
@@ -619,7 +619,7 @@
619619
PRODUCT_BUNDLE_IDENTIFIER = com.messagekit.MessageInputBar;
620620
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
621621
SKIP_INSTALL = YES;
622-
SWIFT_VERSION = 4.0;
622+
SWIFT_VERSION = 4.2;
623623
TARGETED_DEVICE_FAMILY = "1,2";
624624
};
625625
name = Release;
@@ -637,7 +637,7 @@
637637
);
638638
PRODUCT_BUNDLE_IDENTIFIER = com.messagekit.MessageInputBarTests;
639639
PRODUCT_NAME = "$(TARGET_NAME)";
640-
SWIFT_VERSION = 4.0;
640+
SWIFT_VERSION = 4.2;
641641
TARGETED_DEVICE_FAMILY = "1,2";
642642
};
643643
name = Debug;
@@ -655,7 +655,7 @@
655655
);
656656
PRODUCT_BUNDLE_IDENTIFIER = com.messagekit.MessageInputBarTests;
657657
PRODUCT_NAME = "$(TARGET_NAME)";
658-
SWIFT_VERSION = 4.0;
658+
SWIFT_VERSION = 4.2;
659659
TARGETED_DEVICE_FAMILY = "1,2";
660660
};
661661
name = Release;

‎Plugins/AttachmentManager/Views/AttachmentCell.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ open class AttachmentCell: UICollectionViewCell {
3232
return "AttachmentCell"
3333
}
3434

35-
open let containerView: UIView = {
35+
public let containerView: UIView = {
3636
let view = UIView()
3737
view.translatesAutoresizingMaskIntoConstraints = false
3838
view.backgroundColor = .groupTableViewBackground

0 commit comments

Comments
 (0)