From 7b60c1e067cb4233b14c6429b85c9ab346ed9a93 Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Mon, 12 Nov 2018 14:51:29 -0800 Subject: [PATCH 1/3] Updates deployment target to iOS 12.0 --- Cores/DeltaCore | 2 +- Cores/GBADeltaCore | 2 +- Cores/GBCDeltaCore | 2 +- Cores/SNESDeltaCore | 2 +- Delta.xcodeproj/project.pbxproj | 6 +- .../GridCollectionViewLayout.swift | 7 +- .../GamesDatabaseBrowserViewController.swift | 23 +--- .../Game Selection/GamesViewController.swift | 46 +------- .../Segues/GamesStoryboardSegue.swift | 5 +- Delta/Importing/ImportController.swift | 110 ++++-------------- Delta/Importing/ImportOption.swift | 10 -- Delta/Launch/LaunchViewController.swift | 6 +- .../PausePresentationController.swift | 6 +- .../AppIconShortcutsViewController.swift | 11 +- .../ControllerSkinsViewController.swift | 2 +- .../SystemControllerSkinsViewController.swift | 2 +- 16 files changed, 47 insertions(+), 195 deletions(-) diff --git a/Cores/DeltaCore b/Cores/DeltaCore index 89e9837..64c6a10 160000 --- a/Cores/DeltaCore +++ b/Cores/DeltaCore @@ -1 +1 @@ -Subproject commit 89e9837cd27a6200871053af1072af1055873fbe +Subproject commit 64c6a1020163329392e1bdeccbbfcc93384cca34 diff --git a/Cores/GBADeltaCore b/Cores/GBADeltaCore index d73ce50..21ba985 160000 --- a/Cores/GBADeltaCore +++ b/Cores/GBADeltaCore @@ -1 +1 @@ -Subproject commit d73ce5037d4f7e4852aff7642b65d0c8a1e32fb3 +Subproject commit 21ba9850fb0812148d0826069f8cc3000d476a07 diff --git a/Cores/GBCDeltaCore b/Cores/GBCDeltaCore index 8a963b6..6da27f9 160000 --- a/Cores/GBCDeltaCore +++ b/Cores/GBCDeltaCore @@ -1 +1 @@ -Subproject commit 8a963b61a5e5ff0917b8e278fd07a7d99ae89c98 +Subproject commit 6da27f9b694e886d6c9805ba54848b0f0a922598 diff --git a/Cores/SNESDeltaCore b/Cores/SNESDeltaCore index 21bb3a1..5f341a6 160000 --- a/Cores/SNESDeltaCore +++ b/Cores/SNESDeltaCore @@ -1 +1 @@ -Subproject commit 21bb3a1e144a6c4a1b863fa1f09d1a0492de96a2 +Subproject commit 5f341a67ad326829d3557d01df6977d02722a5da diff --git a/Delta.xcodeproj/project.pbxproj b/Delta.xcodeproj/project.pbxproj index 4e2fd38..4f2c104 100644 --- a/Delta.xcodeproj/project.pbxproj +++ b/Delta.xcodeproj/project.pbxproj @@ -1070,7 +1070,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies"; @@ -1122,7 +1122,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies"; PRODUCT_BUNDLE_IDENTIFIER = com.rileytestut.Delta; @@ -1143,7 +1143,6 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = 6XVY5G3U44; INFOPLIST_FILE = "Delta/Supporting Files/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1163,7 +1162,6 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = 6XVY5G3U44; INFOPLIST_FILE = "Delta/Supporting Files/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -DIMPACTOR"; PROVISIONING_PROFILE = ""; diff --git a/Delta/Components/Collection View/GridCollectionViewLayout.swift b/Delta/Components/Collection View/GridCollectionViewLayout.swift index e87a1c4..bc91c56 100644 --- a/Delta/Components/Collection View/GridCollectionViewLayout.swift +++ b/Delta/Components/Collection View/GridCollectionViewLayout.swift @@ -27,11 +27,8 @@ class GridCollectionViewLayout: UICollectionViewFlowLayout guard let collectionView = self.collectionView else { return .zero } var contentInset = collectionView.contentInset - if #available(iOS 11, *) - { - contentInset.left += collectionView.safeAreaInsets.left - contentInset.right += collectionView.safeAreaInsets.right - } + contentInset.left += collectionView.safeAreaInsets.left + contentInset.right += collectionView.safeAreaInsets.right return contentInset } diff --git a/Delta/Database/OpenVGDB/GamesDatabaseBrowserViewController.swift b/Delta/Database/OpenVGDB/GamesDatabaseBrowserViewController.swift index 3f9c87f..42ff8d1 100644 --- a/Delta/Database/OpenVGDB/GamesDatabaseBrowserViewController.swift +++ b/Delta/Database/OpenVGDB/GamesDatabaseBrowserViewController.swift @@ -65,15 +65,8 @@ class GamesDatabaseBrowserViewController: UITableViewController self.dataSource.searchController.delegate = self self.dataSource.searchController.searchBar.barStyle = .black - if #available(iOS 11, *) - { - self.navigationItem.searchController = self.dataSource.searchController - self.navigationItem.hidesSearchBarWhenScrolling = false - } - else - { - self.tableView.tableHeaderView = self.dataSource.searchController.searchBar - } + self.navigationItem.searchController = self.dataSource.searchController + self.navigationItem.hidesSearchBarWhenScrolling = false self.updatePlaceholderView() } @@ -184,7 +177,7 @@ private extension GamesDatabaseBrowserViewController func resetTableViewContentOffset() { self.tableView.setContentOffset(CGPoint.zero, animated: false) - self.tableView.setContentOffset(CGPoint(x: 0, y: -self.topLayoutGuide.length), animated: false) + self.tableView.setContentOffset(CGPoint(x: 0, y: -self.view.safeAreaInsets.top), animated: false) } } @@ -204,16 +197,6 @@ extension GamesDatabaseBrowserViewController extension GamesDatabaseBrowserViewController: UISearchControllerDelegate { - func didPresentSearchController(_ searchController: UISearchController) - { - if #available(iOS 11, *) {} - else - { - // Fix incorrect table view scroll indicator insets - self.tableView.scrollIndicatorInsets.top = self.navigationController!.navigationBar.bounds.height + UIApplication.shared.statusBarFrame.height - } - } - func willDismissSearchController(_ searchController: UISearchController) { // Manually set items to empty array to prevent crash if user dismissses searchController while scrolling diff --git a/Delta/Game Selection/GamesViewController.swift b/Delta/Game Selection/GamesViewController.swift index 343fa5c..af00297 100644 --- a/Delta/Game Selection/GamesViewController.swift +++ b/Delta/Game Selection/GamesViewController.swift @@ -61,8 +61,6 @@ class GamesViewController: UIViewController super.init(coder: aDecoder) self.fetchedResultsController.delegate = self - - self.automaticallyAdjustsScrollViewInsets = false } } @@ -94,10 +92,7 @@ extension GamesViewController self.navigationController?.navigationBar.barStyle = .blackTranslucent self.navigationController?.toolbar.barStyle = .blackTranslucent - if #available(iOS 11.0, *) - { - self.prepareSearchController() - } + self.prepareSearchController() self.updateTheme() } @@ -116,23 +111,6 @@ extension GamesViewController } } - override func viewDidLayoutSubviews() - { - super.viewDidLayoutSubviews() - - if #available(iOS 11.0, *) {} - else - { - if let viewControllers = self.pageViewController.viewControllers as? [GameCollectionViewController] - { - for viewController in viewControllers - { - viewController.collectionView?.contentInset.top = self.topLayoutGuide.length - } - } - } - } - override func didReceiveMemoryWarning() { super.didReceiveMemoryWarning() @@ -164,7 +142,6 @@ extension GamesViewController /// UI private extension GamesViewController { - @available(iOS 11.0, *) func prepareSearchController() { let searchResultsController = self.storyboard?.instantiateViewController(withIdentifier: "gameCollectionViewController") as! GameCollectionViewController @@ -249,13 +226,6 @@ private extension GamesViewController viewController.theme = self.theme viewController.activeEmulatorCore = self.activeEmulatorCore - if #available(iOS 11.0, *) {} - else - { - // Need to set content inset here AND willTransitionTo callback to ensure its correct for all edge cases - viewController.collectionView?.contentInset.top = self.topLayoutGuide.length - } - return viewController } @@ -425,20 +395,6 @@ extension GamesViewController: UIPageViewControllerDataSource, UIPageViewControl } //MARK: - UIPageViewControllerDelegate - func pageViewController(_ pageViewController: UIPageViewController, willTransitionTo pendingViewControllers: [UIViewController]) - { - guard let viewControllers = pendingViewControllers as? [GameCollectionViewController] else { return } - - if #available(iOS 11.0, *) {} - else - { - for viewController in viewControllers - { - viewController.collectionView?.contentInset.top = self.topLayoutGuide.length - } - } - } - func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted completed: Bool) { if let viewController = pageViewController.viewControllers?.first as? GameCollectionViewController, let gameCollection = viewController.gameCollection diff --git a/Delta/Game Selection/Segues/GamesStoryboardSegue.swift b/Delta/Game Selection/Segues/GamesStoryboardSegue.swift index f71a281..220cd0d 100644 --- a/Delta/Game Selection/Segues/GamesStoryboardSegue.swift +++ b/Delta/Game Selection/Segues/GamesStoryboardSegue.swift @@ -106,10 +106,13 @@ extension GamesStoryboardSegue: UIViewControllerAnimatedTransitioning transitionContext.destinationView.insertSubview(topToolbar, at: 1) topToolbar.topAnchor.constraint(equalTo: navigationController.navigationBar.topAnchor, constant: -padding).isActive = true - topToolbar.bottomAnchor.constraint(equalTo: navigationController.topViewController!.topLayoutGuide.bottomAnchor).isActive = true topToolbar.leftAnchor.constraint(equalTo: navigationController.navigationBar.leftAnchor, constant: -padding).isActive = true topToolbar.rightAnchor.constraint(equalTo: navigationController.navigationBar.rightAnchor, constant: padding).isActive = true + // There is no easy way to determine the extra height necessary at this point of the transition, so hard code for now. + let additionalSearchBarHeight = 44 as CGFloat + topToolbar.heightAnchor.constraint(equalToConstant: navigationController.topViewController!.view.safeAreaInsets.top + additionalSearchBarHeight).isActive = true + topPaddingToolbar = topToolbar } diff --git a/Delta/Importing/ImportController.swift b/Delta/Importing/ImportController.swift index ce04a87..8887a0d 100644 --- a/Delta/Importing/ImportController.swift +++ b/Delta/Importing/ImportController.swift @@ -65,43 +65,36 @@ class ImportController: NSObject { self.presentingViewController = presentingViewController - #if IMPACTOR - - let alertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet) - alertController.addAction(UIAlertAction.cancel) - - if let importOptions = self.importOptions + let alertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet) + alertController.addAction(UIAlertAction.cancel) + + if let importOptions = self.importOptions + { + for importOption in importOptions { - for importOption in importOptions - { - alertController.add(importOption) { [unowned self] (urls) in - self.finish(with: urls, errors: []) - } + alertController.add(importOption) { [unowned self] (urls) in + self.finish(with: urls, errors: []) } } + } + + let filesAction = UIAlertAction(title: NSLocalizedString("Files", comment: ""), style: .default) { (action) in + let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(ImportController.cancel)) - self.presentedViewController = alertController - self.presentingViewController?.present(alertController, animated: true, completion: nil) + let documentBrowserViewController = UIDocumentBrowserViewController(forOpeningFilesWithContentTypes: Array(self.documentTypes)) + documentBrowserViewController.delegate = self + documentBrowserViewController.browserUserInterfaceStyle = .dark + documentBrowserViewController.allowsPickingMultipleItems = true + documentBrowserViewController.allowsDocumentCreation = false + documentBrowserViewController.additionalTrailingNavigationBarButtonItems = [cancelButton] - #else - - let documentMenuController = UIDocumentMenuViewController(documentTypes: Array(self.documentTypes), in: .import) - documentMenuController.delegate = self - - if let reversedImportOptions = self.importOptions?.reversed() - { - for importOption in reversedImportOptions - { - documentMenuController.add(importOption, order: .first) { [unowned self] (urls) in - self.finish(with: urls, errors: []) - } - } - } - - self.presentedViewController = documentMenuController - self.presentingViewController?.present(documentMenuController, animated: true, completion: nil) - - #endif + self.presentedViewController = documentBrowserViewController + self.presentingViewController?.present(documentBrowserViewController, animated: true, completion: nil) + } + alertController.addAction(filesAction) + + self.presentedViewController = alertController + self.presentingViewController?.present(alertController, animated: true, completion: nil) } @objc private func cancel() @@ -126,59 +119,6 @@ class ImportController: NSObject } } - -extension ImportController: UIDocumentMenuDelegate -{ - func documentMenu(_ documentMenu: UIDocumentMenuViewController, didPickDocumentPicker documentPicker: UIDocumentPickerViewController) - { - if #available(iOS 11.0, *) - { - let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(ImportController.cancel)) - - let documentBrowserViewController = UIDocumentBrowserViewController(forOpeningFilesWithContentTypes: Array(self.documentTypes)) - documentBrowserViewController.delegate = self - documentBrowserViewController.browserUserInterfaceStyle = .dark - documentBrowserViewController.allowsPickingMultipleItems = true - documentBrowserViewController.allowsDocumentCreation = false - documentBrowserViewController.additionalTrailingNavigationBarButtonItems = [cancelButton] - - self.presentedViewController = documentBrowserViewController - self.presentingViewController?.present(documentBrowserViewController, animated: true, completion: nil) - } - else - { - documentPicker.delegate = self - - self.presentedViewController = documentPicker - self.presentingViewController?.present(documentPicker, animated: true, completion: nil) - } - } - - func documentMenuWasCancelled(_ documentMenu: UIDocumentMenuViewController) - { - self.finish(with: nil, errors: []) - } -} - -extension ImportController: UIDocumentPickerDelegate -{ - func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentAt url: URL) - { - self.finish(with: [url], errors: []) - } - - func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) - { - self.finish(with: Set(urls), errors: []) - } - - func documentPickerWasCancelled(_ controller: UIDocumentPickerViewController) - { - self.finish(with: nil, errors: []) - } -} - -@available(iOS 11.0, *) extension ImportController: UIDocumentBrowserViewControllerDelegate { func documentBrowser(_ controller: UIDocumentBrowserViewController, didPickDocumentURLs documentURLs: [URL]) diff --git a/Delta/Importing/ImportOption.swift b/Delta/Importing/ImportOption.swift index 0f6dfda..ef92138 100644 --- a/Delta/Importing/ImportOption.swift +++ b/Delta/Importing/ImportOption.swift @@ -10,16 +10,6 @@ import UIKit import DeltaCore -extension UIDocumentMenuViewController -{ - func add(_ importOption: ImportOption, order: UIDocumentMenuOrder, completionHandler: @escaping (Set?) -> Void) - { - self.addOption(withTitle: importOption.title, image: importOption.image, order: order) { - importOption.import(withCompletionHandler: completionHandler) - } - } -} - extension UIAlertController { func add(_ importOption: ImportOption, completionHandler: @escaping (Set?) -> Void) diff --git a/Delta/Launch/LaunchViewController.swift b/Delta/Launch/LaunchViewController.swift index 118bf82..b58274a 100644 --- a/Delta/Launch/LaunchViewController.swift +++ b/Delta/Launch/LaunchViewController.swift @@ -50,11 +50,7 @@ class LaunchViewController: UIViewController self.view.bringSubviewToFront(self.gameViewContainerView) self.setNeedsStatusBarAppearanceUpdate() - - if #available(iOS 11.0, *) - { - self.setNeedsUpdateOfHomeIndicatorAutoHidden() - } + self.setNeedsUpdateOfHomeIndicatorAutoHidden() } if let game = self.applicationLaunchDeepLinkGame diff --git a/Delta/Pause Menu/Presentation Controller/PausePresentationController.swift b/Delta/Pause Menu/Presentation Controller/PausePresentationController.swift index 1bc5f55..56877b9 100644 --- a/Delta/Pause Menu/Presentation Controller/PausePresentationController.swift +++ b/Delta/Pause Menu/Presentation Controller/PausePresentationController.swift @@ -44,11 +44,7 @@ class PausePresentationController: UIPresentationController else { frame = CGRect(x: 0, y: containerView.bounds.height - contentHeight, width: containerView.bounds.width, height: containerView.bounds.height) - - if #available(iOS 11.0, *) - { - frame.origin.y -= containerView.safeAreaInsets.bottom - } + frame.origin.y -= containerView.safeAreaInsets.bottom } return frame diff --git a/Delta/Settings/App Icon Shortcuts/AppIconShortcutsViewController.swift b/Delta/Settings/App Icon Shortcuts/AppIconShortcutsViewController.swift index b6ba567..d0d1aa3 100644 --- a/Delta/Settings/App Icon Shortcuts/AppIconShortcutsViewController.swift +++ b/Delta/Settings/App Icon Shortcuts/AppIconShortcutsViewController.swift @@ -38,15 +38,8 @@ class AppIconShortcutsViewController: UITableViewController self.tableView.register(GameTableViewCell.nib!, forCellReuseIdentifier: RSTCellContentGenericCellIdentifier) - if #available(iOS 11, *) - { - self.navigationItem.searchController = self.gamesDataSource.searchController - self.navigationItem.hidesSearchBarWhenScrolling = false - } - else - { - self.tableView.tableHeaderView = self.gamesDataSource.searchController.searchBar - } + self.navigationItem.searchController = self.gamesDataSource.searchController + self.navigationItem.hidesSearchBarWhenScrolling = false self.tableView.dataSource = self.dataSource self.tableView.allowsSelectionDuringEditing = true diff --git a/Delta/Settings/Controller Skins/ControllerSkinsViewController.swift b/Delta/Settings/Controller Skins/ControllerSkinsViewController.swift index 7a30d65..3bc8a50 100644 --- a/Delta/Settings/Controller Skins/ControllerSkinsViewController.swift +++ b/Delta/Settings/Controller Skins/ControllerSkinsViewController.swift @@ -151,7 +151,7 @@ extension ControllerSkinsViewController let scale = (self.view.bounds.width / size.width) - let height = min(size.height * scale, self.view.bounds.height - self.topLayoutGuide.length - self.bottomLayoutGuide.length - 30) + let height = min(size.height * scale, self.view.bounds.height - self.view.safeAreaInsets.top - self.view.safeAreaInsets.bottom - 30) return height } diff --git a/Delta/Settings/Controller Skins/SystemControllerSkinsViewController.swift b/Delta/Settings/Controller Skins/SystemControllerSkinsViewController.swift index ce92ad9..cda844b 100644 --- a/Delta/Settings/Controller Skins/SystemControllerSkinsViewController.swift +++ b/Delta/Settings/Controller Skins/SystemControllerSkinsViewController.swift @@ -92,7 +92,7 @@ extension SystemControllerSkinsViewController let scale = (self.view.bounds.width / unwrappedImageSize.width) - let height = min(unwrappedImageSize.height * scale, self.view.bounds.height - self.topLayoutGuide.length - self.bottomLayoutGuide.length - 30) + let height = min(unwrappedImageSize.height * scale, self.view.bounds.height - self.view.safeAreaInsets.top - self.view.safeAreaInsets.bottom - 30) return height } From d1596fa7c53fb72123542d7b97dacbd8ed1e9957 Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Mon, 12 Nov 2018 14:51:49 -0800 Subject: [PATCH 2/3] Fixes missing ZIPFoundation error when running on device --- Delta.xcodeproj/project.pbxproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Delta.xcodeproj/project.pbxproj b/Delta.xcodeproj/project.pbxproj index 4f2c104..18855c9 100644 --- a/Delta.xcodeproj/project.pbxproj +++ b/Delta.xcodeproj/project.pbxproj @@ -26,6 +26,8 @@ BF0418141D01E93400E85BCF /* GBADeltaCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF0418131D01E93400E85BCF /* GBADeltaCore.framework */; }; BF0418151D01E93400E85BCF /* GBADeltaCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BF0418131D01E93400E85BCF /* GBADeltaCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; BF04E6FF1DB8625C000F35D3 /* ControllerSkinsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF04E6FE1DB8625C000F35D3 /* ControllerSkinsViewController.swift */; }; + BF072010219A3A9D00F05DA4 /* ZIPFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF07200E219A3A9500F05DA4 /* ZIPFoundation.framework */; }; + BF072011219A3A9D00F05DA4 /* ZIPFoundation.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BF07200E219A3A9500F05DA4 /* ZIPFoundation.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; BF1020E31F95B05B00313182 /* DeltaToDelta2.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = BF1020E21F95B05B00313182 /* DeltaToDelta2.xcmappingmodel */; }; BF107EC41BF413F000E0C32C /* GamesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF107EC31BF413F000E0C32C /* GamesViewController.swift */; }; BF1173501DA32CF600047DF8 /* ControllersSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF11734F1DA32CF600047DF8 /* ControllersSettingsViewController.swift */; }; @@ -139,6 +141,7 @@ BFEC732E1AAECC4A00650035 /* Roxas.framework in Embed Frameworks */, BF0418151D01E93400E85BCF /* GBADeltaCore.framework in Embed Frameworks */, BF99C6951D0A9AA600BA92BC /* SNESDeltaCore.framework in Embed Frameworks */, + BF072011219A3A9D00F05DA4 /* ZIPFoundation.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -152,6 +155,7 @@ BF02D5D91DDEBB3000A5E131 /* openvgdb.sqlite */ = {isa = PBXFileReference; lastKnownFileType = file; path = openvgdb.sqlite; sourceTree = ""; }; BF0418131D01E93400E85BCF /* GBADeltaCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = GBADeltaCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BF04E6FE1DB8625C000F35D3 /* ControllerSkinsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ControllerSkinsViewController.swift; sourceTree = ""; }; + BF07200E219A3A9500F05DA4 /* ZIPFoundation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ZIPFoundation.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BF090CF11B490D8300DCAB45 /* Delta-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Delta-Bridging-Header.h"; sourceTree = ""; }; BF1020E21F95B05B00313182 /* DeltaToDelta2.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = DeltaToDelta2.xcmappingmodel; sourceTree = ""; }; BF107EC31BF413F000E0C32C /* GamesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GamesViewController.swift; sourceTree = ""; }; @@ -269,6 +273,7 @@ BFEC732D1AAECC4A00650035 /* Roxas.framework in Frameworks */, BF99C6941D0A9AA600BA92BC /* SNESDeltaCore.framework in Frameworks */, BF0418141D01E93400E85BCF /* GBADeltaCore.framework in Frameworks */, + BF072010219A3A9D00F05DA4 /* ZIPFoundation.framework in Frameworks */, BFF0742C1E9DC17500ACDF4A /* GBCDeltaCore.framework in Frameworks */, 4FE8465FD28810191C3E5212 /* Pods_Delta.framework in Frameworks */, ); @@ -541,6 +546,7 @@ BF9F4FCD1AAD7B25004C9500 /* Frameworks */ = { isa = PBXGroup; children = ( + BF07200E219A3A9500F05DA4 /* ZIPFoundation.framework */, BFF0742B1E9DC17500ACDF4A /* GBCDeltaCore.framework */, BF0418131D01E93400E85BCF /* GBADeltaCore.framework */, BF27CC941BCB7B7A00A20D89 /* GameController.framework */, From 2f4171b9e27a7eb51628c31da0029b5fa4ca7ad9 Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Mon, 12 Nov 2018 14:59:21 -0800 Subject: [PATCH 3/3] Fixes issue where keyboard may appear on app launch --- Cores/DeltaCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cores/DeltaCore b/Cores/DeltaCore index 64c6a10..911d36b 160000 --- a/Cores/DeltaCore +++ b/Cores/DeltaCore @@ -1 +1 @@ -Subproject commit 64c6a1020163329392e1bdeccbbfcc93384cca34 +Subproject commit 911d36bd01964ad7aeb0b4a37610402fd9845310