Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat: Swift 5 Migration #560

Closed
wants to merge 3 commits into from
Closed

Feat: Swift 5 Migration #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed1393d
Swift 5 conversion
baquer May 25, 2019
26a6899
Resolve Merge Conflicts
baquer Jul 7, 2019
bb2c406
Resolve Conflicts
baquer Jul 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ target 'Susi' do
# Pods for Susi
pod 'Motion', :git => 'https://github.com/CosmicMind/Motion.git', :branch => 'development'
pod 'Material', :git => 'https://github.com/CosmicMind/Material.git', :branch => 'development'
pod 'Toast-Swift', '~> 4.0.0'
pod 'SwiftValidators'
pod 'Toast-Swift', '~> 5.0.0'
pod 'SwiftValidators', '~> 9.0.1'
pod 'BouncyLayout'
pod 'RealmSwift'
pod 'ReadabilityKit'
pod 'Kingfisher', '~> 4.10.0'
pod 'Kingfisher', '~> 5.0'
pod 'SwiftDate', '~> 4.5.0'
pod 'NVActivityIndicatorView'
pod 'NVActivityIndicatorView', '~> 4.7.0'
pod 'Fakery', '~> 3.3.0'
pod 'M13Checkbox'
pod 'ReachabilitySwift'
pod 'Localize-Swift'
pod 'paper-onboarding'
pod 'FTPopOverMenu_Swift', '~> 0.1.3'
pod 'paper-onboarding', '~> 6.1.3'
pod 'FTPopOverMenu_Swift', '~> 0.2.0'
pod 'CTShowcase', '~> 2.4'
pod 'SwiftKeychainWrapper'
shared_pods
Expand Down
36 changes: 18 additions & 18 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ PODS:
- BouncyLayout (2.1.0)
- CTShowcase (2.4.0)
- Fakery (3.3.0)
- FTPopOverMenu_Swift (0.1.3)
- FTPopOverMenu_Swift (0.2.0)
- Ji (2.1.0):
- Ji/Ji (= 2.1.0)
- Ji/Ji (2.1.0):
- Ji/Ji-libxml
- Ji/Ji-libxml (2.1.0)
- Kingfisher (4.10.1)
- Kingfisher (5.4.0)
- Localize-Swift (2.0.0)
- M13Checkbox (3.4.0)
- Material (2.17.0):
Expand All @@ -19,10 +19,10 @@ PODS:
- Motion (1.5.0):
- Motion/Core (= 1.5.0)
- Motion/Core (1.5.0)
- NVActivityIndicatorView (4.4.0):
- NVActivityIndicatorView/Presenter (= 4.4.0)
- NVActivityIndicatorView/Presenter (4.4.0)
- paper-onboarding (5.0.0)
- NVActivityIndicatorView (4.7.0):
- NVActivityIndicatorView/Presenter (= 4.7.0)
- NVActivityIndicatorView/Presenter (4.7.0)
- paper-onboarding (6.1.3)
- ReachabilitySwift (4.1.0)
- ReadabilityKit (0.7.1):
- Ji
Expand All @@ -33,29 +33,29 @@ PODS:
- Realm (= 3.7.2)
- SwiftDate (4.5.1)
- SwiftKeychainWrapper (3.2.0)
- SwiftValidators (7.0.3)
- Toast-Swift (4.0.0)
- SwiftValidators (9.0.1)
- Toast-Swift (5.0.0)

DEPENDENCIES:
- Alamofire (~> 4.7)
- BouncyLayout
- CTShowcase (~> 2.4)
- Fakery (~> 3.3.0)
- FTPopOverMenu_Swift (~> 0.1.3)
- Kingfisher (~> 4.10.0)
- FTPopOverMenu_Swift (~> 0.2.0)
- Kingfisher (~> 5.0)
- Localize-Swift
- M13Checkbox
- Material (from `https://github.com/CosmicMind/Material.git`, branch `development`)
- Motion (from `https://github.com/CosmicMind/Motion.git`, branch `development`)
- NVActivityIndicatorView
- paper-onboarding
- NVActivityIndicatorView (~> 4.7.0)
- paper-onboarding (~> 6.1.3)
- ReachabilitySwift
- ReadabilityKit
- RealmSwift
- SwiftDate (~> 4.5.0)
- SwiftKeychainWrapper
- SwiftValidators
- Toast-Swift (~> 4.0.0)
- SwiftValidators (~> 9.0.1)
- Toast-Swift (~> 5.0.0)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
Expand Down Expand Up @@ -100,15 +100,15 @@ SPEC CHECKSUMS:
BouncyLayout: a7955879861375cc4e88bb64d42bcf622cd2694c
CTShowcase: d6a7933f0724dadc12399b4d6d4815b419f1eb65
Fakery: 3aae11a87721c807c18c6456500d088c1230d3e5
FTPopOverMenu_Swift: f67e0af3935485c1cbcc44b5c92ed530ee32d21d
FTPopOverMenu_Swift: 44d95f702ef643f902c60d7e49553dfc0e874dac
Ji: 21946da4e13425485ddd424edfaeeced0d80ad28
Kingfisher: c148cd7b47ebde9989f6bc7c27dcaa79d81279a0
Kingfisher: 9c8f2cc6710334e06f32ba2b45e77707d5e2f0c9
Localize-Swift: c798ec9286494866f7068f85f7c71283ac5bdab4
M13Checkbox: 6f59404540ac98ba83a3d1afac335895a40c6a5d
Material: 856e0168ab93fc477f875577c152c9e62f4ab869
Motion: 3acabedc5a499f6b12deaa34deb68b425b005720
NVActivityIndicatorView: ec7440a57af2450319d3a4181cca7da6fc127064
paper-onboarding: a2e3a710fd27ac0b5635ec5490660e7ec09289b5
NVActivityIndicatorView: b19ddab2576f805cbe0fb2306cba3476e09a1dea
paper-onboarding: 47ded9ede6ae9dd7ec135dddd8bd3e170b79d799
ReachabilitySwift: 6849231cd4e06559f3b9ef4a97a0a0f96d41e09f
ReadabilityKit: 45e79725f6d0377c555f38d9df7a6d4435898c04
Realm: dd18c3014e8d90df300b83c6da740067436089c5
Expand Down
12 changes: 6 additions & 6 deletions Susi.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,14 +792,14 @@
6D215B911EB0BE7300CD2C1D = {
CreatedOnToolsVersion = 8.3.2;
DevelopmentTeam = MLF4G8Y374;
LastSwiftMigration = 1000;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
TestTargetID = 6D4D9B361E768E190067459C;
};
6D4D9B361E768E190067459C = {
CreatedOnToolsVersion = 8.2.1;
DevelopmentTeam = 7P4K4M8A4Q;
LastSwiftMigration = 1000;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
};
Expand Down Expand Up @@ -1124,7 +1124,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.chashmeet.SusiUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TEST_TARGET_NAME = Susi;
};
name = Debug;
Expand All @@ -1143,7 +1143,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.chashmeet.SusiUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TEST_TARGET_NAME = Susi;
};
name = Release;
Expand Down Expand Up @@ -1287,7 +1287,7 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Susi/Snowboy Files/Susi-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
};
name = Debug;
Expand All @@ -1313,7 +1313,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Susi/Snowboy Files/Susi-Bridging-Header.h";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion Susi/Custom Views/Message Cells/ImageCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class ImageCell: ChatMessageCell {
func downloadImage() {
if let imageString = message?.answerData?.expression, imageString.isImage() {
if let url = URL(string: imageString) {
imageView.kf.setImage(with: url, placeholder: ControllerConstants.Images.placeholder, options: nil, progressBlock: nil, completionHandler: nil)
imageView.kf.setImage(with: url, placeholder: ControllerConstants.Images.placeholder)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Susi/Custom Views/Message Cells/WebsearchCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class WebsearchCell: BaseCell {
if let imageString = data?.topImage {
let url = URL(string: imageString)
if let url = url {
self.imageView.kf.setImage(with: url, placeholder: ControllerConstants.Images.placeholder, options: nil, progressBlock: nil, completionHandler: nil)
self.imageView.kf.setImage(with: url, placeholder: ControllerConstants.Images.placeholder)
}
}

Expand Down
2 changes: 1 addition & 1 deletion Susi/Custom Views/Message Cells/YouTubePlayerCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class YouTubePlayerCell: ChatMessageCell {
if let videoID = message?.videoData?.identifier {
let thumbnailURLString = "https://img.youtube.com/vi/\(videoID)/default.jpg"
let thumbnailURL = URL(string: thumbnailURLString)
thumbnailView.kf.setImage(with: thumbnailURL, placeholder: ControllerConstants.Images.placeholder, options: nil, progressBlock: nil, completionHandler: nil)
thumbnailView.kf.setImage(with: thumbnailURL, placeholder: ControllerConstants.Images.placeholder)
}
}

Expand Down
4 changes: 2 additions & 2 deletions Susi/Custom Views/WebsearchCollectionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class WebsearchCollectionView: UIView, UICollectionViewDelegate, UICollectionVie
if let webData = feed?.webData {
if let imageString = webData.image {
let url = URL(string: imageString)
cell.imageView.kf.setImage(with: url, placeholder: ControllerConstants.Images.placeholder, options: nil, progressBlock: nil, completionHandler: nil)
cell.imageView.kf.setImage(with: url, placeholder: ControllerConstants.Images.placeholder)
}
}
} else if message?.actionType == ActionType.websearch.rawValue {
Expand All @@ -103,7 +103,7 @@ class WebsearchCollectionView: UIView, UICollectionViewDelegate, UICollectionVie
if let imageString = webData?.image {
cell.imageString = imageString
if let url = URL(string: imageString) {
cell.imageView.kf.setImage(with: url, placeholder: ControllerConstants.Images.placeholder, options: nil, progressBlock: nil, completionHandler: nil)
cell.imageView.kf.setImage(with: url, placeholder: ControllerConstants.Images.placeholder)
}
}
}
Expand Down