From ca20c19783c95373753837d89531cd9a8e5f5c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Gonza=CC=81lez?= Date: Tue, 13 Nov 2018 14:26:52 +0100 Subject: [PATCH 1/4] Support for Swift 4.2 --- FileBrowser.xcodeproj/project.pbxproj | 4 +++- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ FileBrowser/FileListSearch.swift | 4 ++-- FileBrowser/FileListTableView.swift | 6 +++--- FileBrowser/PreviewTransitionViewController.swift | 4 ++-- 5 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 FileBrowser.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/FileBrowser.xcodeproj/project.pbxproj b/FileBrowser.xcodeproj/project.pbxproj index cfa9797..a7720bb 100644 --- a/FileBrowser.xcodeproj/project.pbxproj +++ b/FileBrowser.xcodeproj/project.pbxproj @@ -259,7 +259,7 @@ TargetAttributes = { 344169531C67812400B93D28 = { CreatedOnToolsVersion = 7.2.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1010; }; 3441695D1C67812400B93D28 = { CreatedOnToolsVersion = 7.2.1; @@ -477,6 +477,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -495,6 +496,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.FileBrowser; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/FileBrowser.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/FileBrowser.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/FileBrowser.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/FileBrowser/FileListSearch.swift b/FileBrowser/FileListSearch.swift index ede8f3a..c808be2 100644 --- a/FileBrowser/FileListSearch.swift +++ b/FileBrowser/FileListSearch.swift @@ -12,11 +12,11 @@ extension FileListViewController: UISearchBarDelegate, UISearchControllerDelegat // MARK: UISearchControllerDelegate func willPresentSearchController(_ searchController: UISearchController) { - self.tableView.contentInset = UIEdgeInsetsMake(20, 0, 0, 0) + self.tableView.contentInset = UIEdgeInsets.init(top: 20, left: 0, bottom: 0, right: 0) } func willDismissSearchController(_ searchController: UISearchController) { - self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 0, 0) + self.tableView.contentInset = UIEdgeInsets.init(top: 0, left: 0, bottom: 0, right: 0) } // MARK: UISearchBarDelegate diff --git a/FileBrowser/FileListTableView.swift b/FileBrowser/FileListTableView.swift index 2caba43..d4ff3ea 100644 --- a/FileBrowser/FileListTableView.swift +++ b/FileBrowser/FileListTableView.swift @@ -86,13 +86,13 @@ extension FileListViewController: UITableViewDataSource, UITableViewDelegate { return collation.section(forSectionIndexTitle: index) } - func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) { - if (editingStyle == UITableViewCellEditingStyle.delete) { + func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) { + if (editingStyle == UITableViewCell.EditingStyle.delete) { let selectedFile = fileForIndexPath(indexPath) selectedFile.delete() prepareData() - tableView.reloadSections([indexPath.section], with: UITableViewRowAnimation.automatic) + tableView.reloadSections([indexPath.section], with: UITableView.RowAnimation.automatic) } } diff --git a/FileBrowser/PreviewTransitionViewController.swift b/FileBrowser/PreviewTransitionViewController.swift index a2c5e28..c314db4 100644 --- a/FileBrowser/PreviewTransitionViewController.swift +++ b/FileBrowser/PreviewTransitionViewController.swift @@ -18,10 +18,10 @@ class PreviewTransitionViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - self.addChildViewController(quickLookPreviewController) + self.addChild(quickLookPreviewController) containerView.addSubview(quickLookPreviewController.view) quickLookPreviewController.view.frame = containerView.bounds - quickLookPreviewController.didMove(toParentViewController: self) + quickLookPreviewController.didMove(toParent: self) } } From 49fe558b4a2f280c3177523d04e3738f2c990257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Gonz=C3=A1lez?= Date: Thu, 30 May 2019 12:11:59 +0200 Subject: [PATCH 2/4] Change deprecated methods for viewcontrollers --- FileBrowser/PreviewTransitionViewController.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FileBrowser/PreviewTransitionViewController.swift b/FileBrowser/PreviewTransitionViewController.swift index c314db4..a2c5e28 100644 --- a/FileBrowser/PreviewTransitionViewController.swift +++ b/FileBrowser/PreviewTransitionViewController.swift @@ -18,10 +18,10 @@ class PreviewTransitionViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - self.addChild(quickLookPreviewController) + self.addChildViewController(quickLookPreviewController) containerView.addSubview(quickLookPreviewController.view) quickLookPreviewController.view.frame = containerView.bounds - quickLookPreviewController.didMove(toParent: self) + quickLookPreviewController.didMove(toParentViewController: self) } } From 6470fa5fe0cfcea8e4c623e884e8407117bedc36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Gonz=C3=A1lez?= Date: Thu, 30 May 2019 12:12:05 +0200 Subject: [PATCH 3/4] Update version --- FileBrowser.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FileBrowser.podspec b/FileBrowser.podspec index dc0f291..efd42f7 100644 --- a/FileBrowser.podspec +++ b/FileBrowser.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "FileBrowser" - s.version = "1.0.0" + s.version = "1.0.1" s.summary = "Powerful iOS file browser in Swift." # This description is used to generate tags and improve search results. From 9c43bf3fc3f9f87272e4a96553ef457a65841801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Gonz=C3=A1lez?= Date: Thu, 20 Jun 2019 10:13:37 +0200 Subject: [PATCH 4/4] Change name to submit new pod --- FileBrowser.podspec => SwiftFileBrowser.podspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename FileBrowser.podspec => SwiftFileBrowser.podspec (86%) diff --git a/FileBrowser.podspec b/SwiftFileBrowser.podspec similarity index 86% rename from FileBrowser.podspec rename to SwiftFileBrowser.podspec index efd42f7..8049e60 100644 --- a/FileBrowser.podspec +++ b/SwiftFileBrowser.podspec @@ -7,7 +7,7 @@ # Pod::Spec.new do |s| - s.name = "FileBrowser" + s.name = "SwiftFileBrowser" s.version = "1.0.1" s.summary = "Powerful iOS file browser in Swift." @@ -20,11 +20,11 @@ Pod::Spec.new do |s| A Swift file browser for iOS. Supports QuickLook, search and 3D touch. DESC - s.homepage = "https://github.com/marmelroy/FileBrowser" + s.homepage = "https://github.com/algonrey/FileBrowser" # s.screenshots = "www.example.com/screenshots_1", "www.example.com/screenshots_2" s.license = 'MIT' s.author = { "Roy Marmelstein" => "marmelroy@gmail.com" } - s.source = { :git => "https://github.com/marmelroy/FileBrowser.git", :tag => s.version.to_s, :submodules => true} + s.source = { :git => "https://github.com/algonrey/FileBrowser.git", :tag => s.version.to_s, :submodules => true} s.social_media_url = "http://twitter.com/marmelroy" s.ios.deployment_target = '8.0'