Skip to content

Swift4.2 migration #10

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

Open
takaishota wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Swift4.2 migration #10

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
126ad91
Update to swift 4.2
takaishota Feb 10, 2019
c18636f
Add files needed from Xcode 9.3
takaishota Feb 10, 2019
be803b3
Update to recommended settings according to Xcode 10.1
takaishota Feb 10, 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
11 changes: 8 additions & 3 deletions GradientSlider.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,13 @@
FC1C41711B730A410083C062 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0900;
LastUpgradeCheck = 1010;
ORGANIZATIONNAME = "Jonathan Hull";
TargetAttributes = {
FC1C41781B730A410083C062 = {
CreatedOnToolsVersion = 7.0;
DevelopmentTeam = 87YJPWK77H;
LastSwiftMigration = 1010;
};
};
};
Expand Down Expand Up @@ -178,12 +179,14 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -230,12 +233,14 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -273,7 +278,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.jonhull.GradientSlider;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -286,7 +291,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.jonhull.GradientSlider;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down
8 changes: 8 additions & 0 deletions GradientSlider.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
10 changes: 5 additions & 5 deletions GradientSlider/GradientSlider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,12 @@ import UIKit

//MARK: - Layout
override var intrinsicContentSize:CGSize {
return CGSize(width: UIViewNoIntrinsicMetric, height: thumbSize)
return CGSize(width: UIView.noIntrinsicMetric, height: thumbSize)
}

// func alignmentRectInsets() -> UIEdgeInsets {
override var alignmentRectInsets: UIEdgeInsets {
return UIEdgeInsetsMake(4.0, 2.0, 4.0, 2.0)
return UIEdgeInsets.init(top: 4.0, left: 2.0, bottom: 4.0, right: 2.0)
}

override func layoutSublayers(of layer: CALayer) {
Expand Down Expand Up @@ -329,7 +329,7 @@ import UIKit
let diameter = max(thumbSize,44.0)
let r = CGRect(x: center.x - diameter/2.0, y: center.y - diameter/2.0, width: diameter, height: diameter)
if r.contains(pt){
sendActions(for: UIControlEvents.touchDown)
sendActions(for: UIControl.Event.touchDown)
return true
}
return false
Expand All @@ -341,7 +341,7 @@ import UIKit
let newValue = valueForLocation(point: pt)
setValue(newValue, animated: false)
if(continuous){
sendActions(for: UIControlEvents.valueChanged)
sendActions(for: UIControl.Event.valueChanged)
actionBlock(self,newValue,false)
}
return true
Expand All @@ -354,7 +354,7 @@ import UIKit
setValue(newValue, animated: false)
}
actionBlock(self,_value,true)
sendActions(for: [UIControlEvents.valueChanged, UIControlEvents.touchUpInside])
sendActions(for: [UIControl.Event.valueChanged, UIControl.Event.touchUpInside])

}

Expand Down