remove platform filers

Author: NikolaiMadlener

ResearchKit.xcodeproj/project.pbxproj

@@ -524,7 +524,7 @@ ORK_CLASS_AVAILABLE
                                                       maximumValue:(double)maximumValue
                                                       defaultValue:(double)defaultValue;
 
-#if ORK_FEATURE_CLLOCATIONMANAGER_AUTHORIZATION && TARGET_OS_IOS && !TARGET_OS_VISION
+#if ORK_FEATURE_CLLOCATIONMANAGER_AUTHORIZATION && TARGET_OS_IOS
 + (ORKLocationAnswerFormat *)locationAnswerFormat;
 #endif
 

ResearchKit/Common/ORKAnswerFormat.h

@@ -41,6 +41,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #import "ORKHelpers_Internal.h"
 #if TARGET_OS_IOS || TARGET_OS_VISION
 #import "ORKHealthAnswerFormat.h"
+#import "ResearchKit/ResearchKit-Swift.h"
 #endif
 
 #if ORK_FEATURE_HEALTHKIT_AUTHORIZATION

ResearchKit/Common/ORKAnswerFormat.m

@@ -185,7 +185,7 @@ - (void)setFormItems:(NSArray<ORKFormItem *> *)formItems {
     }
 }
 
-#if ORK_FEATURE_HEALTHKIT_AUTHORIZATION && TARGET_OS_IOS
+#if ORK_FEATURE_HEALTHKIT_AUTHORIZATION
 - (NSSet<HKObjectType *> *)requestedHealthKitTypesForReading {
     NSMutableSet<HKObjectType *> *healthTypes = [NSMutableSet set];
 
@@ -265,7 +265,7 @@ - (instancetype)initWithSectionTitle:(nullable NSString *)sectionTitle detailTex
     return self;
 }
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS || TARGET_OS_VISION
 - (ORKFormItem *)confirmationAnswerFormItemWithIdentifier:(NSString *)identifier
                                                      text:(nullable NSString *)text
                                              errorMessage:(NSString *)errorMessage {

ResearchKit/Common/ORKFormStep.m

@@ -31,7 +31,7 @@
 
 #import <ResearchKit/ORKAnswerFormat.h>
 
-#if ORK_FEATURE_HEALTHKIT_AUTHORIZATION && TARGET_OS_IOS
+#if ORK_FEATURE_HEALTHKIT_AUTHORIZATION
 #import <HealthKit/HealthKit.h>
 #endif
 
@@ -74,7 +74,7 @@ ORK_EXTERN ORKBloodTypeIdentifier const ORKBloodTypeIdentifierONegative;
  You can use the HealthKit characteristic answer format to let users autofill information, such as their blood type or date of birth.
  */
 
-#if ORK_FEATURE_HEALTHKIT_AUTHORIZATION && TARGET_OS_IOS
+#if ORK_FEATURE_HEALTHKIT_AUTHORIZATION
 ORK_CLASS_AVAILABLE
 @interface ORKHealthKitCharacteristicTypeAnswerFormat : ORKAnswerFormat
 

ResearchKit/Common/ORKHealthAnswerFormat.h

@@ -28,6 +28,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if TARGET_OS_IOS
 
 #import "ORKHealthSampleQueryOperation.h"
 #import "ORKCollector.h"
@@ -246,3 +247,4 @@ - (void)handleResults:(NSArray<HKSample *> *)results
 
 @end
 #endif
+#endif

ResearchKit/Common/ORKHealthSampleQueryOperation.m

@@ -29,7 +29,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if ORK_FEATURE_CLLOCATIONMANAGER_AUTHORIZATION
+#if ORK_FEATURE_CLLOCATIONMANAGER_AUTHORIZATION && !TARGET_OS_VISION
 
 #import "ORKSurveyAnswerCellForLocation.h"