Sitelet https://github.com/C4Labs/C4iOS/commit/cadf1569b375f6ac74b9db8491fae3508cccb206
Skip to content

Commit cadf156

Browse files
alejandro-isazaalejandro-isaza
committed
Fix Xcode 10 warnings
1 parent 9f8995f commit cadf156

9 files changed

Lines changed: 20 additions & 15 deletions

File tree

‎C4.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@
649649
attributes = {
650650
LastSwiftMigration = 0700;
651651
LastSwiftUpdateCheck = 0900;
652-
LastUpgradeCheck = 0900;
652+
LastUpgradeCheck = 1000;
653653
ORGANIZATIONNAME = C4;
654654
TargetAttributes = {
655655
610A6A4D1F928E1B003B841A = {
@@ -1114,12 +1114,14 @@
11141114
CLANG_WARN_BOOL_CONVERSION = YES;
11151115
CLANG_WARN_COMMA = YES;
11161116
CLANG_WARN_CONSTANT_CONVERSION = YES;
1117+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
11171118
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
11181119
CLANG_WARN_EMPTY_BODY = YES;
11191120
CLANG_WARN_ENUM_CONVERSION = YES;
11201121
CLANG_WARN_INFINITE_RECURSION = YES;
11211122
CLANG_WARN_INT_CONVERSION = YES;
11221123
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1124+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
11231125
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
11241126
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
11251127
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1172,12 +1174,14 @@
11721174
CLANG_WARN_BOOL_CONVERSION = YES;
11731175
CLANG_WARN_COMMA = YES;
11741176
CLANG_WARN_CONSTANT_CONVERSION = YES;
1177+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
11751178
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
11761179
CLANG_WARN_EMPTY_BODY = YES;
11771180
CLANG_WARN_ENUM_CONVERSION = YES;
11781181
CLANG_WARN_INFINITE_RECURSION = YES;
11791182
CLANG_WARN_INT_CONVERSION = YES;
11801183
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1184+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
11811185
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
11821186
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
11831187
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

‎C4.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎C4.xcodeproj/xcshareddata/xcschemes/C4-iOS.xcscheme‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

‎C4.xcodeproj/xcshareddata/xcschemes/C4-tvOS.xcscheme‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

‎C4/Core/Point.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ public func lerp(_ a: Point, _ b: Point, at: Double) -> Point {
188188
public extension CGPoint {
189189
///Initializes a CGPoint from a Point
190190
public init(_ point: Point) {
191-
x = CGFloat(point.x)
192-
y = CGFloat(point.y)
191+
self.init(x: CGFloat(point.x), y: CGFloat(point.y))
193192
}
194193
}

‎C4/Core/Rect.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,6 @@ public func inset(_ r: Rect, dx: Double, dy: Double) -> Rect {
302302
public extension CGRect {
303303
/// Initializes a CGRect from a Rect
304304
public init(_ rect: Rect) {
305-
origin = CGPoint(rect.origin)
306-
size = CGSize(rect.size)
305+
self.init(origin: CGPoint(rect.origin), size: CGSize(rect.size))
307306
}
308307
}

‎C4/Core/Size.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ public func <= (lhs: Size, rhs: Size) -> Bool {
170170
public extension CGSize {
171171
/// Initializes a new CGSize from a Size
172172
public init(_ size: Size) {
173-
width = CGFloat(size.width)
174-
height = CGFloat(size.height)
173+
self.init(width: CGFloat(size.width), height: CGFloat(size.height))
175174
}
176175
}

‎C4/UI/Font.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,6 @@ public class Font {
210210

211211
/// Returns a CTFontRef version of the receiver.
212212
public var ctFont: CTFont {
213-
return CTFontCreateWithNameAndOptions(fontName as CFString!, CGFloat(pointSize), nil, [])
213+
return CTFontCreateWithNameAndOptions(fontName as CFString, CGFloat(pointSize), nil, [])
214214
}
215215
}

‎C4/UI/Image.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ open class Image: View, NSCopying {
242242

243243
assert(pixels.count == Int(width * height))
244244

245-
var provider: CGDataProvider? = nil
245+
var provider: CGDataProvider?
246246
pixels.withUnsafeBufferPointer { p in
247247
if let address = p.baseAddress {
248248
let data = Data(bytes: UnsafePointer(address), count: pixels.count * MemoryLayout<Pixel>.size)

0 commit comments

Comments
 (0)