fix: RevisionRecord syncing with server (#126)

* fix: RevisionRecord syncing with server * improve CI output
netreconlab · Nov 21, 2024 · a9c473a · a9c473a
1 parent 0aec7dc
commit a9c473a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,21 +6,21 @@ on:
     branches: [ main ]
 
 env:
-    CI_XCODE: '/Applications/Xcode_15.4.app/Contents/Developer'
+    CI_XCODE: '/Applications/Xcode_16.1.app/Contents/Developer'
 
 concurrency:
    group: ${{ github.workflow }}-${{ github.ref }}
    cancel-in-progress: true
 
 jobs:
   test:
-    runs-on: macos-14
+    runs-on: macos-15
     strategy:
       matrix:
-        destination: ['-destination platform\=iOS\ Simulator,OS=17.5,name\=iPhone\ 15\ Pro\ Max test', 'CODE_SIGNING_ALLOWED="NO"']
+        destination: ['-destination platform\=iOS\ Simulator,OS=18.1,name\=iPhone\ 16\ Pro\ Max test', 'CODE_SIGNING_ALLOWED="NO"']
         scheme: ['OCKSample', 'OCKWatchSample']
         exclude:
-        - destination: '-destination platform\=iOS\ Simulator,OS=17.5,name\=iPhone\ 15\ Pro\ Max test'
+        - destination: '-destination platform\=iOS\ Simulator,OS=18.1,name\=iPhone\ 16\ Pro\ Max test'
           scheme: 'OCKWatchSample'
         - destination: 'CODE_SIGNING_ALLOWED="NO"'
           scheme: 'OCKSample'
@@ -29,7 +29,7 @@ jobs:
     - name: Install SwiftLint
       run: brew install swiftlint
     - name: Build-Test
-      run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project OCKSample.xcodeproj -scheme ${{ matrix.scheme }} ${{ matrix.destination }} | xcpretty
+      run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project OCKSample.xcodeproj -scheme ${{ matrix.scheme }} ${{ matrix.destination }} 2>&1 | xcbeautify --renderer github-actions
       env:
           DEVELOPER_DIR: ${{ env.CI_XCODE }}
     - name: Send codecov

diff --git a/OCKSample.xcodeproj/project.pbxproj b/OCKSample.xcodeproj/project.pbxproj
@@ -1253,7 +1253,7 @@
 			repositoryURL = "https://github.com/netreconlab/ParseCareKit.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = "1.0.0-beta.5";
+				minimumVersion = "1.0.0-beta.6";
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

diff --git a/OCKSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/OCKSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,17 +6,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/cbaker6/CareKit.git",
       "state" : {
-        "revision" : "8f84560883c93e57eb92392c49c408d9a7ebf747",
-        "version" : "3.0.0-beta.14"
+        "revision" : "482e0b34b4116158178cd8f368aeedcb1c8c2b81",
+        "version" : "3.0.0-beta.15"
       }
     },
     {
       "identity" : "carekitessentials",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/netreconlab/CareKitEssentials",
       "state" : {
-        "revision" : "094cf72f0b917b5558de17a14bd0a13c8c853bb4",
-        "version" : "1.0.0-alpha.16"
+        "revision" : "02ea2bb43ae076f647c80d8045da7ea698749649",
+        "version" : "1.0.0-alpha.19"
       }
     },
     {
@@ -33,17 +33,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/netreconlab/Parse-Swift.git",
       "state" : {
-        "revision" : "f13ad6b7ecee396e6fecb2685d3e171823ff6c3d",
-        "version" : "5.10.3"
+        "revision" : "3f02f591398d6cf6467ecc8ced1e45f5714aa868",
+        "version" : "5.11.3"
       }
     },
     {
       "identity" : "parsecarekit",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/netreconlab/ParseCareKit.git",
       "state" : {
-        "revision" : "7c505dbf6d6b7d2422a3e01fec9af179b106c6a0",
-        "version" : "1.0.0-beta.5"
+        "revision" : "4a87f02ec46bd7defde33738d91d770a323758d0",
+        "version" : "1.0.0-beta.6"
       }
     },
     {
@@ -60,8 +60,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections.git",
       "state" : {
-        "revision" : "3d2dc41a01f9e49d84f0a3925fb858bed64f702d",
-        "version" : "1.1.2"
+        "revision" : "671108c96644956dddcd89dd59c203dcdb36cec7",
+        "version" : "1.1.4"
       }
     }
   ],