Skip to content

Swift 3.1 - rebuild all frameworks, clean up all swift warnings #421

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

Merged
merged 6 commits into from
Mar 31, 2017
Merged

Swift 3.1 - rebuild all frameworks, clean up all swift warnings #421

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
203b9a3
Rebuild all frameworks with swift 3.1
Mar 30, 2017
cc8b747
Resolve all Swift 3.1 warnings
Mar 30, 2017
b19b184
update osx_image to xcode8.3
Mar 29, 2017
4fd7408
Two cleanups
Mar 29, 2017
687ba63
Revert LoopKit API related warning fixes
Mar 30, 2017
9b29020
Pin LoopKit to 1.2.0
Mar 31, 2017
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
Prev Previous commit
Next Next commit
Two cleanups 
1. Change all explicit calls to .debugDescription over to
   String(describing:). This preserves existing behavior which was
   happening implicitly before swift 3.1

2. Use CGFloat.pi instead of CGFloat(Double.pi), and fix an issue where
   I accidentally negated one of the values in an earlier commit
  • Loading branch information
Bharat Mediratta committed Mar 30, 2017
commit 4fd74084b7380469e2b54c2a236402827d4a5912
6 changes: 3 additions & 3 deletions Loop/Managers/CGM/DexCGMManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ final class ShareClientManager: CGMManager {
var debugDescription: String {
return [
"## ShareClientManager",
"latestBackfill: \(latestBackfill.debugDescription)",
"latestBackfill: \(String(describing: latestBackfill))",
""
].joined(separator: "\n")
}
Expand Down Expand Up @@ -149,7 +149,7 @@ final class G5CGMManager: DexCGMManager, TransmitterDelegate {
override var debugDescription: String {
return [
"## G5CGMManager",
"latestReading: \(latestReading.debugDescription)",
"latestReading: \(String(describing: latestReading))",
"transmitter: \(transmitter)",
super.debugDescription,
""
Expand Down Expand Up @@ -217,7 +217,7 @@ final class G4CGMManager: DexCGMManager, ReceiverDelegate {
override var debugDescription: String {
return [
"## G4CGMManager",
"latestReading: \(latestReading.debugDescription)",
"latestReading: \(String(describing: latestReading))",
"receiver: \(receiver)",
super.debugDescription,
""
Expand Down
2 changes: 1 addition & 1 deletion Loop/Managers/CGM/EnliteCGMManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ final class EnliteCGMManager: CGMManager {
var debugDescription: String {
return [
"## EnliteCGMManager",
"sensorState: \(sensorState.debugDescription)",
"sensorState: \(String(describing: sensorState))",
""
].joined(separator: "\n")
}
Expand Down
12 changes: 6 additions & 6 deletions Loop/Managers/DeviceDataManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,14 +847,14 @@ extension DeviceDataManager: CustomDebugStringConvertible {
Bundle.main.localizedNameAndVersion,
"## DeviceDataManager",
"launchDate: \(launchDate)",
"cgm: \(cgm.debugDescription)",
"latestPumpStatusFromMySentry: \(latestPumpStatusFromMySentry.debugDescription)",
"cgm: \(String(describing: cgm))",
"latestPumpStatusFromMySentry: \(String(describing:latestPumpStatusFromMySentry))",
"pumpState: \(String(reflecting: pumpState))",
"preferredInsulinDataSource: \(preferredInsulinDataSource)",
"glucoseTargetRangeSchedule: \(glucoseTargetRangeSchedule?.debugDescription ?? "")",
"workoutModeEnabled: \(workoutModeEnabled.debugDescription)",
"maximumBasalRatePerHour: \(maximumBasalRatePerHour.debugDescription)",
"maximumBolus: \(maximumBolus.debugDescription)",
"glucoseTargetRangeSchedule: \(String(describing: glucoseTargetRangeSchedule))",
"workoutModeEnabled: \(String(describing: workoutModeEnabled))",
"maximumBasalRatePerHour: \(String(describing: maximumBasalRatePerHour))",
"maximumBolus: \(String(describing: maximumBolus))",
cgmManager != nil ? String(reflecting: cgmManager!) : "",
String(reflecting: rileyLinkManager),
String(reflecting: statusExtensionManager!),
Expand Down
10 changes: 5 additions & 5 deletions Loop/Managers/LoopDataManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,12 +761,12 @@ extension LoopDataManager {
"## LoopDataManager",
"predictedGlucose: \(predictedGlucose ?? [])",
"retrospectivePredictedGlucose: \(retrospectivePredictedGlucose ?? [])",
"recommendedTempBasal: \(recommendedTempBasal.debugDescription)",
"lastTempBasal: \(lastTempBasal.debugDescription)",
"recommendedTempBasal: \(String(describing: recommendedTempBasal))",
"lastTempBasal: \(String(describing: lastTempBasal))",
"lastLoopCompleted: \(lastLoopCompleted ?? .distantPast)",
"insulinOnBoard: \(insulinOnBoard.debugDescription)",
"carbsOnBoard: \(carbsOnBoard.debugDescription)",
"error: \(error.debugDescription)"
"insulinOnBoard: \(String(describing: insulinOnBoard))",
"carbsOnBoard: \(String(describing: carbsOnBoard))",
"error: \(String(describing: error))"
]
completionHandler(report.joined(separator: "\n"))
}
Expand Down
4 changes: 2 additions & 2 deletions LoopUI/Views/LoopStateView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ final class LoopStateView: UIView {
let lineWidth = lineWidth ?? shapeLayer.lineWidth
let radius = min(bounds.width / 2, bounds.height / 2) - lineWidth / 2

let startAngle = open ? CGFloat(Double.pi / 4) : 0
let endAngle = open ? CGFloat(5 * Double.pi / 4) : CGFloat(2 * Double.pi)
let startAngle = open ? -CGFloat.pi / 4 : 0
let endAngle = open ? 5 * CGFloat.pi / 4 : 2 * CGFloat.pi

let path = UIBezierPath(
arcCenter: center,
Expand Down