Skip to content
This repository has been archived by the owner on Aug 30, 2023. It is now read-only.

Commit

Permalink
Bump the Swift version to 4.0. (#67)
Browse files Browse the repository at this point in the history
This will allow the project to build on Xcode 11.
  • Loading branch information
featherless authored Jun 26, 2019
1 parent 2bc59b8 commit 2b8e287
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
workspace 'MotionTransitioning.xcworkspace'
use_frameworks!
platform :ios, '8.0'
platform :ios, '9.0'

target "TransitionsCatalog" do
pod 'CatalogByConvention'
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ SPEC CHECKSUMS:
CatalogByConvention: c3a5319de04250a7cd4649127fcfca5fe3322a43
MotionTransitioning: afdc2fb08fc6e8744dab4f160b3764c9bde59338

PODFILE CHECKSUM: 25d5942fb7698339a03667bb46c3fbb77529b92d
PODFILE CHECKSUM: c1fb58e87919bf8979e1ee2b4db99797e975d789

COCOAPODS: 1.6.0
4 changes: 2 additions & 2 deletions examples/ContextualExample.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import MotionTransitioning

class ContextualExampleViewController: ExampleViewController {

func didTap(_ tapGesture: UITapGestureRecognizer) {
@objc func didTap(_ tapGesture: UITapGestureRecognizer) {
let controller = DestinationViewController()

// A contextual transition is provided with information relevant to the transition, such as the
Expand Down Expand Up @@ -142,7 +142,7 @@ private class DestinationViewController: ExampleViewController {
view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(didTap)))
}

func didTap() {
@objc func didTap() {
dismiss(animated: true)
}
}
2 changes: 1 addition & 1 deletion examples/FadeExample.m
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ - (void)didTap {
- (void)viewDidLoad {
[super viewDidLoad];

self.view.backgroundColor = [UIColor backgroundColor];
self.view.backgroundColor = [UIColor whiteColor];

UILabel *label = [[UILabel alloc] initWithFrame:self.view.bounds];
label.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
Expand Down
2 changes: 1 addition & 1 deletion examples/FadeExample.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import MotionTransitioning

class FadeExampleViewController: ExampleViewController {

func didTap() {
@objc func didTap() {
let modalViewController = ModalViewController()

// The transition controller is an associated object on all UIViewController instances that
Expand Down
2 changes: 1 addition & 1 deletion examples/MenuExample.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import MotionTransitioning

class MenuExampleViewController: ExampleViewController {

func didTap() {
@objc func didTap() {
let modalViewController = ModalViewController()
modalViewController.mdm_transitionController.transition = MenuTransition()
present(modalViewController, animated: true)
Expand Down
2 changes: 1 addition & 1 deletion examples/NavControllerFadeExample.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import MotionTransitioning

class NavControllerFadeExampleViewController: ExampleViewController {

func didTap() {
@objc func didTap() {
let modalViewController = ModalViewController()
modalViewController.title = "Example view controller"

Expand Down
14 changes: 8 additions & 6 deletions examples/apps/Catalog/TableOfContents.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,30 @@
limitations under the License.
*/

import Foundation

// MARK: Catalog by convention

extension ContextualExampleViewController {
class func catalogBreadcrumbs() -> [String] { return ["Contextual transition"] }
@objc class func catalogBreadcrumbs() -> [String] { return ["Contextual transition"] }
}

extension FadeExampleViewController {
class func catalogBreadcrumbs() -> [String] { return ["Fade transition"] }
@objc class func catalogBreadcrumbs() -> [String] { return ["Fade transition"] }
}

extension NavControllerFadeExampleViewController {
class func catalogBreadcrumbs() -> [String] { return ["Fade transition (nav controller)"] }
@objc class func catalogBreadcrumbs() -> [String] { return ["Fade transition (nav controller)"] }
}

extension MenuExampleViewController {
class func catalogBreadcrumbs() -> [String] { return ["Menu transition"] }
@objc class func catalogBreadcrumbs() -> [String] { return ["Menu transition"] }
}

extension PhotoAlbumExampleViewController {
class func catalogBreadcrumbs() -> [String] { return ["Photo album transition"] }
@objc class func catalogBreadcrumbs() -> [String] { return ["Photo album transition"] }
}

extension CustomPresentationExampleViewController {
class func catalogBreadcrumbs() -> [String] { return ["Custom presentation transitions"] }
@objc class func catalogBreadcrumbs() -> [String] { return ["Custom presentation transitions"] }
}
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -709,6 +710,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand Down Expand Up @@ -755,6 +757,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand All @@ -771,7 +774,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.google.Catalog;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -786,7 +788,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.google.Catalog;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -802,7 +803,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.google.CatalogTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestHarness.app/TestHarness";
};
name = Debug;
Expand All @@ -819,7 +819,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.google.CatalogTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestHarness.app/TestHarness";
};
name = Release;
Expand All @@ -836,7 +835,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.google.TestHarness;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -852,7 +850,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.google.TestHarness;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion examples/supplemental/ModalViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class ModalViewController: ExampleViewController {
return .lightContent
}

func didTap() {
@objc func didTap() {
dismiss(animated: true)
}
}

0 comments on commit 2b8e287

Please sign in to comment.