Merge remote-tracking branch 'refs/remotes/origin/fixLinearProgress'

Conflicts: Sources/CareKitEssentials/Extensions/CareTaskProgressStrategy.swift
netreconlab · Jul 19, 2024 · 60e1ad9 · 60e1ad9
2 parents 871d8c3 + fb66661
commit 60e1ad9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/CareKitEssentials.xcodeproj/project.pbxproj b/CareKitEssentials.xcodeproj/project.pbxproj
@@ -683,7 +683,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = edu.netrecon.usc.TestHost;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator watchos";
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -742,7 +742,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = edu.netrecon.usc.TestHost;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator watchos";
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -894,6 +894,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = CareKitEssentials;
 				PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator";
 				SUPPORTS_MACCATALYST = YES;
@@ -932,6 +933,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = CareKitEssentials;
 				PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator";
 				SUPPORTS_MACCATALYST = YES;

diff --git a/Sources/CareKitEssentials/Extensions/CareTaskProgressStrategy.swift b/Sources/CareKitEssentials/Extensions/CareTaskProgressStrategy.swift
@@ -8,6 +8,8 @@
 import CareKitStore
 import Foundation
 
+// swiftlint:disable line_length
+
 public extension CareTaskProgressStrategy {
 
     /// Computes the average outcome values for a given event
@@ -48,14 +50,11 @@ public extension CareTaskProgressStrategy {
 
     /// Computes the streak of outcome values for a given event
     ///
-    /// Function use ``LinearCareTaskProgress.computeProgressByStreakOutcomeValues`` 
-    /// method to compute the steak of outcome values given an evnet.
-    /// The event is passed to the ``computeProgressByStreakOutcomeValues`` method as an argument
+    /// Function use ``LinearCareTaskProgress.computeProgressByStreakOutcomeValues`` method to compute the steak of outcome values given an evnet. The event is passed to the ``computeProgressByStreakOutcomeValues`` method as an argument
     ///
     /// Parameter kind: An optional ``String`` that specifies the kind of an event. Defaults to ``nil``
     ///
-    /// Returns: A ``CareTaskProgressStrategy<LinearCareTaskProgress>`` 
-    /// that's the strategy for compting the progress of a care task
+    /// Returns: A ``CareTaskProgressStrategy<LinearCareTaskProgress>`` that's the strategy for compting the progress of a care task
     ///
     ///
     static func streak(kind: String? = nil) -> CareTaskProgressStrategy<LinearCareTaskProgress> {