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
Revert LoopKit API related warning fixes 
Separate them out from the non-API related warning fixes.
  • Loading branch information
Bharat Mediratta committed Mar 30, 2017
commit 687ba63805c6002d16f9b82d501f45ef00a56486
18 changes: 8 additions & 10 deletions Loop/Managers/LoopDataManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,12 @@ final class LoopDataManager {

if insulinEffect == nil {
updateGroup.enter()
deviceDataManager.doseStore.getGlucoseEffects(start: effectStartDate, end: .distantFuture) { result -> Void in
switch result {
case .success(let effects):
self.insulinEffect = effects
case .failure(let error):
deviceDataManager.doseStore.getGlucoseEffects(startDate: effectStartDate) { (effects, error) -> Void in
if let error = error {
self.deviceDataManager.logger.addError(error, fromSource: "DoseStore")
self.insulinEffect = nil
} else {
self.insulinEffect = effects
}

updateGroup.leave()
Expand All @@ -213,13 +212,12 @@ final class LoopDataManager {

if insulinOnBoard == nil {
updateGroup.enter()
deviceDataManager.doseStore.insulinOnBoard(at: Date()) { result in
switch result {
case .success(let values):
self.insulinOnBoard = values
case .failure(let error):
deviceDataManager.doseStore.insulinOnBoardAtDate(Date()) { (value, error) in
if let error = error {
self.deviceDataManager.logger.addError(error, fromSource: "DoseStore")
self.insulinOnBoard = nil
} else {
self.insulinOnBoard = value
}
updateGroup.leave()
}
Expand Down
15 changes: 7 additions & 8 deletions Loop/Managers/StatusExtensionDataManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,14 @@ final class StatusExtensionDataManager {
let chartEndDate = Date().addingTimeInterval(TimeInterval(hours: 3))

updateGroup.enter()
glucoseStore.getGlucoseValues(start: chartStartDate, end: Date()) {
(result) in
glucoseStore.getRecentGlucoseValues(startDate: chartStartDate, endDate: Date()) {
(values, error) in

switch result {
case .success(let values):
if let error = error {
self.dataManager.logger.addError(error, fromSource: "GlucoseStore")
context.glucose = nil
context.predictedGlucose = nil
} else {
context.glucose = values.map({
return GlucoseContext(
value: $0.quantity.doubleValue(for: glucoseUnit),
Expand All @@ -114,10 +117,6 @@ final class StatusExtensionDataManager {
startDate: predictedGlucose[0].startDate,
interval: predictedGlucose[1].startDate.timeIntervalSince(predictedGlucose[0].startDate))
}
case .failure(let error):
self.dataManager.logger.addError(error, fromSource: "GlucoseStore")
context.glucose = nil
context.predictedGlucose = nil
}
updateGroup.leave()
}
Expand Down
9 changes: 4 additions & 5 deletions Loop/View Controllers/PredictionTableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,13 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass, U
}

reloadGroup.enter()
glucoseStore.getGlucoseValues(start: self.charts.startDate, end: .distantFuture) { result -> Void in
switch result {
case .success(let values):
self.charts.setGlucoseValues(values)
case .failure(let error):
glucoseStore.getRecentGlucoseValues(startDate: self.charts.startDate) { (values, error) -> Void in
if let error = error {
self.dataManager.logger.addError(error, fromSource: "GlucoseStore")
self.needsRefresh = true
self.charts.setGlucoseValues([])
} else {
self.charts.setGlucoseValues(values)
}

reloadGroup.leave()
Expand Down
34 changes: 15 additions & 19 deletions Loop/View Controllers/StatusTableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,13 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize

if self.refreshContext.remove(.glucose) != nil {
reloadGroup.enter()
glucoseStore.getGlucoseValues(start: self.chartStartDate, end: .distantFuture) { result -> Void in
switch result {
case .success(let values):
self.charts.setGlucoseValues(values)
case .failure(let error):
glucoseStore.getRecentGlucoseValues(startDate: self.chartStartDate) { (values, error) -> Void in
if let error = error {
self.dataManager.logger.addError(error, fromSource: "GlucoseStore")
self.refreshContext.update(with: .glucose)
self.charts.setGlucoseValues([])
} else {
self.charts.setGlucoseValues(values)
}

reloadGroup.leave()
Expand Down Expand Up @@ -250,39 +249,36 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize

if refreshContext.remove(.insulin) != nil {
reloadGroup.enter()
dataManager.doseStore.getInsulinOnBoardValues(start: chartStartDate, end: .distantFuture) { result -> Void in
switch result {
case .success(let values):
self.charts.setIOBValues(values)
case .failure(let error):
dataManager.doseStore.getInsulinOnBoardValues(startDate: chartStartDate) { (values, error) -> Void in
if let error = error {
self.dataManager.logger.addError(error, fromSource: "DoseStore")
self.refreshContext.update(with: .insulin)
self.charts.setIOBValues([])
} else {
self.charts.setIOBValues(values)
}
reloadGroup.leave()
}

reloadGroup.enter()
dataManager.doseStore.getNormalizedDoseEntries(start: chartStartDate, end: .distantFuture) { result -> Void in
switch result {
case .failure(let error):
dataManager.doseStore.getRecentNormalizedDoseEntries(startDate: chartStartDate) { (doses, error) -> Void in
if let error = error {
self.dataManager.logger.addError(error, fromSource: "DoseStore")
self.refreshContext.update(with: .insulin)
self.charts.setDoseEntries([])
case .success(let doses):
} else {
self.charts.setDoseEntries(doses)
}
reloadGroup.leave()
}

reloadGroup.enter()
dataManager.doseStore.getTotalUnitsDelivered(since: Calendar.current.startOfDay(for: Date())) { result in
switch result {
case .success(let units):
self.totalDelivery = units.value
case .failure:
dataManager.doseStore.getTotalRecentUnitsDelivered { (units, _, error) in
if error != nil {
self.refreshContext.update(with: .insulin)
self.totalDelivery = nil
} else {
self.totalDelivery = units
}

reloadGroup.leave()
Expand Down