Skip to content

Commit

Permalink
Upgrade to CareKit 3.0.0 (#1)
Browse files Browse the repository at this point in the history
* Upgrade to CareKit 3.0.0

* Upgrade packages

* update deps

* WIP

* Still WIP

* should build

* updates

* working previews

* fix custom label preview

* nits

* doc nits

* nits

* Update project

* updates

* build slider card

* show both sliders in preview

* Doc nits

* nits

* add StateObjects

* WIP

* updates

* doc updates

* add header to carekit views

* fix package

* open classes

* improve slider view model

* allow public read only

* Create .spi.yml

* chore: Update to CareKit 3.0.0-beta.2
  • Loading branch information
cbaker6 authored Sep 24, 2023
1 parent 9752f49 commit 741d896
Show file tree
Hide file tree
Showing 48 changed files with 2,470 additions and 1,230 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ on:
branches: [ main ]

env:
CI_XCODE_OLDEST: '/Applications/Xcode_13.3.1.app/Contents/Developer'
CI_XCODE_LATEST: '/Applications/Xcode_14.2.app/Contents/Developer'
CI_XCODE_LATEST: '/Applications/Xcode_15.0.app/Contents/Developer'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -18,7 +17,7 @@ concurrency:
jobs:
test:
timeout-minutes: 15
runs-on: macos-latest
runs-on: macos-13
strategy:
matrix:
destination: ['platform=iOS\ Simulator,name=iPhone\ 14\ Pro\ Max', 'platform=watchOS\ Simulator,name=Apple\ Watch\ Series\ 5\ \(40mm\)']
Expand Down
5 changes: 5 additions & 0 deletions .spi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
version: 1
builder:
configs:
- documentation_targets: [CareKitUtilities]
swift_version: 5.9
212 changes: 168 additions & 44 deletions CareKitUtilities.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1420"
LastUpgradeVersion = "1430"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
60 changes: 38 additions & 22 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -1,25 +1,41 @@
{
"object": {
"pins": [
{
"package": "CareKit",
"repositoryURL": "https://github.com/cbaker6/CareKit.git",
"state": {
"branch": null,
"revision": "954185b307222431e50f656d2870019e9ec97c28",
"version": "2.1.8"
}
},
{
"package": "FHIRModels",
"repositoryURL": "https://github.com/apple/FHIRModels.git",
"state": {
"branch": null,
"revision": "e115442fb3c5d44ffb1dc9b4e039b77fd143ad96",
"version": "0.4.0"
}
"pins" : [
{
"identity" : "carekit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/cbaker6/CareKit.git",
"state" : {
"revision" : "ed05957648de96d7ad8a81bd24edff3ee712f20e",
"version" : "3.0.0-beta.2"
}
]
},
"version": 1
},
{
"identity" : "fhirmodels",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/FHIRModels.git",
"state" : {
"revision" : "e115442fb3c5d44ffb1dc9b4e039b77fd143ad96",
"version" : "0.4.0"
}
},
{
"identity" : "swift-async-algorithms",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-async-algorithms",
"state" : {
"revision" : "9cfed92b026c524674ed869a4ff2dcfdeedf8a2a",
"version" : "0.1.0"
}
},
{
"identity" : "swift-collections",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections.git",
"state" : {
"revision" : "937e904258d22af6e447a0b72c0bc67583ef64a2",
"version" : "1.0.4"
}
}
],
"version" : 2
}
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
// swift-tools-version: 5.5.2
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "CareKitUtilities",
platforms: [.iOS(.v14), .macOS(.v12), .watchOS(.v7)],
platforms: [.iOS(.v14), .macOS(.v13), .watchOS(.v7)],
products: [
.library(
name: "CareKitUtilities",
targets: ["CareKitUtilities"])
],
dependencies: [
.package(url: "https://github.com/cbaker6/CareKit.git",
.upToNextMajor(from: "2.1.8"))
.upToNextMajor(from: "3.0.0-beta.2"))
],
targets: [
.target(
Expand Down
120 changes: 0 additions & 120 deletions Sources/CareKitUtilities/Cards/CustomLabel/CustomLabelView.swift

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 741d896

Please sign in to comment.