Skip to content

Commit

Permalink
Dependency update
Browse files Browse the repository at this point in the history
  • Loading branch information
Akshay authored and Akshay committed Jul 13, 2017
1 parent a3eb368 commit 3455f61
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CareKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

Pod::Spec.new do |s|
s.name = 'CareKit'
s.version = '1.2.0'
s.version = '1.2.1'
s.summary = 'CareKit is an open source software framework for creating apps that help people better understand and manage their health.'
s.homepage = 'https://github.com/carekit-apple/CareKit/'
s.documentation_url = 'http://carekit.org/docs/'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,6 @@
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"scale" : "1x"
},
{
"size" : "24x24",
"idiom" : "watch",
Expand Down
4 changes: 2 additions & 2 deletions Sample/OCKSample/WatchConnectivityManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class WatchConnectivityManager : NSObject {

init(withStore store : OCKCarePlanStore) {
self.store = store
self.session = WCSession.default
self.session = WCSession.default()

super.init()

Expand Down Expand Up @@ -204,7 +204,7 @@ extension WatchConnectivityManager : WCSessionDelegate {
}

func sessionDidDeactivate(_ session: WCSession) {
WCSession.default.activate()
WCSession.default().activate()
}

func session(_ session: WCSession, didReceiveMessageData messageData: Data, replyHandler: @escaping (Data) -> Void) {
Expand Down
4 changes: 2 additions & 2 deletions Sample/OCKSampleWatch Extension/InterfaceController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class InterfaceController: WKInterfaceController {
self.setTitle("")
loaderGroup.setHidden(false)
loaderImage.startAnimating()
loaderLabel.setText("Loading\nCare Card")
loaderLabel.setText("Loading\nCare Contents")
activities.removeAll()
activityOrder.removeAll()
activityRowIndices.removeAll()
Expand Down Expand Up @@ -133,7 +133,7 @@ class InterfaceController: WKInterfaceController {
let activityChildEvents = activity.eventsForToday
let activityEventRows = getRowIndex(ofEventIndex: activityChildEvents.count - 1) + 1

tableView.insertRows(at: IndexSet.init(integersIn: Range(NSMakeRange(rowIndex, activityEventRows)) ?? 0..<0) , withRowType: "EventRow")
tableView.insertRows(at: IndexSet.init(integersIn: NSMakeRange(rowIndex, activityEventRows).toRange() ?? 0..<0) , withRowType: "EventRow")

for childRowIndex in 0..<activityEventRows {
if let row = tableView.rowController(at: rowIndex + childRowIndex) as? EventRow {
Expand Down

0 comments on commit 3455f61

Please sign in to comment.