Skip to content

Commit

Permalink
适配 Swift 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Harley-xk committed Sep 18, 2018
1 parent b10e6b4 commit f9acfe9
Show file tree
Hide file tree
Showing 28 changed files with 588 additions and 468 deletions.
10 changes: 6 additions & 4 deletions Example/MaLiang.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-MaLiang_Example/Pods-MaLiang_Example-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-MaLiang_Example/Pods-MaLiang_Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Comet/Comet.framework",
);
name = "[CP] Embed Pods Frameworks";
Expand All @@ -325,7 +325,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MaLiang_Example/Pods-MaLiang_Example-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MaLiang_Example/Pods-MaLiang_Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -429,6 +429,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand Down Expand Up @@ -476,6 +477,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand All @@ -495,7 +497,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -514,7 +516,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.Harley-xk.MaLiang";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion Example/MaLiang/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
Expand Down
2 changes: 1 addition & 1 deletion Example/MaLiang/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ViewController: UIViewController {

let c = Canvas(frame: CGRect(x: 0, y: 0, width: 1024, height: 1024))
view.addSubview(c)
view.sendSubview(toBack: c)
view.sendSubviewToBack(c)
canvas = c

let pen = Brush(texture: #imageLiteral(resourceName: "pen"))
Expand Down
8 changes: 4 additions & 4 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PODS:
- Comet (1.3.4)
- Comet (1.5.0)

DEPENDENCIES:
- Comet

SPEC REPOS:
https://github.com/CocoaPods/Specs.git:
https://github.com/cocoapods/specs.git:
- Comet

SPEC CHECKSUMS:
Comet: ac6323511eed179f1ab9b472862a739364f71c0b
Comet: 785333ec44d6a6e8edfa566d24927449122f660c

PODFILE CHECKSUM: 2aef2277e07f39430fec698d16891242152936c7

COCOAPODS: 1.5.0
COCOAPODS: 1.6.0.beta.1
30 changes: 0 additions & 30 deletions Example/Pods/Comet/Comet/Classes/HairLine.swift

This file was deleted.

18 changes: 9 additions & 9 deletions Example/Pods/Comet/Comet/Classes/KeyboardManager.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Pods/Comet/Comet/Classes/TaskRecorder.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

106 changes: 106 additions & 0 deletions Example/Pods/Comet/Comet/Classes/WindowPresentable.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 19 additions & 3 deletions Example/Pods/Comet/Comet/Extensions/Date+Comet.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Pods/Comet/Comet/Extensions/String+Comet.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Example/Pods/Comet/Comet/Extensions/UINavigationBar+Comet.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f9acfe9

Please sign in to comment.