Merge pull request #144 from CareEvolution/mmertsock/target-15

Set deployment target to iOS 15
CareEvolution · Mar 5, 2024 · 7f9abbb · 7f9abbb
2 parents 3af47c4 + 70f0cae
commit 7f9abbb
Show file tree

Hide file tree

Showing 34 changed files with 100 additions and 51 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,35 +4,28 @@ on:
   workflow_dispatch:
 jobs:
   build:
-    runs-on: macos-12
+    runs-on: macos-14
     env:
-      # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md
-      xcode: '/Applications/Xcode_14.0.1.app'
-      destination_ios16: 'platform=iOS Simulator,OS=16.0,name=iPhone 14'
-      destination_ios15: 'platform=iOS Simulator,OS=15.0,name=iPhone 13'
+      # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md
+      xcode: '/Applications/Xcode_15.2.app'
+      destination_ios17: 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
           token: ${{ secrets.CAREEVOLUTIONBUILD_TOKEN }}
           submodules: 'recursive'
-      - name: Link to Older Simulators
-        run: |
-          sudo mkdir -p /Library/Developer/CoreSimulator/Profiles/Runtimes
-          sudo ln -s /Applications/Xcode_13.1.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime /Library/Developer/CoreSimulator/Profiles/Runtimes/iOS\ 15.0.simruntime
       - name: Build
         run: |
           set -o pipefail
-          xcodebuild build-for-testing -workspace 'RKWorkspace.xcworkspace' -scheme 'ORK1Kit' -destination '${{ env.destination_ios15 }}' -destination '${{ env.destination_ios16 }}' CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO IS_TRAVIS_CI=true | xcpretty
-          xcodebuild build-for-testing -workspace 'RKWorkspace.xcworkspace' -scheme 'ResearchKit' -destination '${{ env.destination_ios15 }}' -destination '${{ env.destination_ios16 }}' CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO IS_TRAVIS_CI=true | xcpretty
+          xcodebuild build-for-testing -workspace 'RKWorkspace.xcworkspace' -scheme 'ORK1Kit' -destination '${{ env.destination_ios17 }}' IS_TRAVIS_CI=true | xcpretty
+          xcodebuild build-for-testing -workspace 'RKWorkspace.xcworkspace' -scheme 'ResearchKit' -destination '${{ env.destination_ios17 }}' IS_TRAVIS_CI=true | xcpretty
         env:
           DEVELOPER_DIR: ${{ env.xcode }}/Contents/Developer
       - name: Test
         run: |
           set -o pipefail
-          xcodebuild test-without-building -workspace 'RKWorkspace.xcworkspace' -scheme 'ORK1Kit' -destination '${{ env.destination_ios16 }}' CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO IS_TRAVIS_CI=true | xcpretty
-          xcodebuild test-without-building -workspace 'RKWorkspace.xcworkspace' -scheme 'ORK1Kit' -destination '${{ env.destination_ios15 }}' CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO IS_TRAVIS_CI=true | xcpretty
-          xcodebuild test-without-building -workspace 'RKWorkspace.xcworkspace' -scheme 'ResearchKit' -destination '${{ env.destination_ios16 }}' CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO IS_TRAVIS_CI=true | xcpretty
-          xcodebuild test-without-building -workspace 'RKWorkspace.xcworkspace' -scheme 'ResearchKit' -destination '${{ env.destination_ios15 }}' CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO IS_TRAVIS_CI=true | xcpretty
+          xcodebuild test-without-building -workspace 'RKWorkspace.xcworkspace' -scheme 'ORK1Kit' -destination '${{ env.destination_ios17 }}' IS_TRAVIS_CI=true | xcpretty
+          xcodebuild test-without-building -workspace 'RKWorkspace.xcworkspace' -scheme 'ResearchKit' -destination '${{ env.destination_ios17 }}' IS_TRAVIS_CI=true | xcpretty
         env:
           DEVELOPER_DIR: ${{ env.xcode }}/Contents/Developer
diff --git a/ORK1Kit/ORK1Kit.xcodeproj/project.pbxproj b/ORK1Kit/ORK1Kit.xcodeproj/project.pbxproj
@@ -435,7 +435,7 @@
 		9550E6741D58DBCF00C691B8 /* ORK1TouchAnywhereStep.m in Sources */ = {isa = PBXBuildFile; fileRef = 9550E6721D58DBCF00C691B8 /* ORK1TouchAnywhereStep.m */; };
 		9550E67C1D58DD2000C691B8 /* ORK1TouchAnywhereStepViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 9550E67A1D58DD2000C691B8 /* ORK1TouchAnywhereStepViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9550E67D1D58DD2000C691B8 /* ORK1TouchAnywhereStepViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9550E67B1D58DD2000C691B8 /* ORK1TouchAnywhereStepViewController.m */; };
-		959A2BFC1D68B98700841B04 /* ORK1RangeOfMotionStep.h in Headers */ = {isa = PBXBuildFile; fileRef = 959A2BFA1D68B98700841B04 /* ORK1RangeOfMotionStep.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		959A2BFC1D68B98700841B04 /* ORK1RangeOfMotionStep.h in Headers */ = {isa = PBXBuildFile; fileRef = 959A2BFA1D68B98700841B04 /* ORK1RangeOfMotionStep.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		959A2BFD1D68B98700841B04 /* ORK1RangeOfMotionStep.m in Sources */ = {isa = PBXBuildFile; fileRef = 959A2BFB1D68B98700841B04 /* ORK1RangeOfMotionStep.m */; };
 		959A2C001D68B9DA00841B04 /* ORK1RangeOfMotionStepViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 959A2BFE1D68B9DA00841B04 /* ORK1RangeOfMotionStepViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		959A2C011D68B9DA00841B04 /* ORK1RangeOfMotionStepViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 959A2BFF1D68B9DA00841B04 /* ORK1RangeOfMotionStepViewController.m */; };
@@ -3019,7 +3019,7 @@
 				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = ORK1;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1520;
 				ORGANIZATIONNAME = researchkit.org;
 				TargetAttributes = {
 					86CC8E991AC09332001CCD89 = {
@@ -3539,6 +3539,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -3553,7 +3554,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.7;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 4.0;
@@ -3593,6 +3594,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -3601,7 +3603,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.7;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -3679,6 +3681,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -3721,6 +3724,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (

diff --git a/ORK1Kit/ORK1Kit.xcodeproj/xcshareddata/xcschemes/ORK1Kit.xcscheme b/ORK1Kit/ORK1Kit.xcodeproj/xcshareddata/xcschemes/ORK1Kit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ORK1Kit/ORK1Kit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme b/ORK1Kit/ORK1Kit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ORK1Kit/ORK1Kit/Common/ORK1ChoiceViewCell.m b/ORK1Kit/ORK1Kit/Common/ORK1ChoiceViewCell.m
@@ -167,7 +167,10 @@ - (UIButton *)detailTextIndicator {
     if (_detailTextIndicator == nil) {
         _detailTextIndicator = [UIButton buttonWithType:UIButtonTypeInfoDark];
         CGFloat inset = (DetailTextIndicatorTouchTargetWidth - DetailTextIndicatorImageWidth) / 2;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated"
         _detailTextIndicator.imageEdgeInsets = UIEdgeInsetsMake(inset, inset, inset, inset);
+#pragma clang diagnostic pop
         [self.contentView addSubview:_detailTextIndicator];
         [_detailTextIndicator addTarget:self action:@selector(toggleDetailText) forControlEvents:UIControlEventTouchUpInside];
     }

diff --git a/ORK1Kit/ORK1Kit/Common/ORK1ContinueButton.m b/ORK1Kit/ORK1Kit/Common/ORK1ContinueButton.m
@@ -34,6 +34,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #import "ORK1Skin.h"
 
 #import "CEVRK1Theme.h"
+#import "ORK1Helpers_Internal.h"
 
 
 static const CGFloat ContinueButtonTouchMargin = 10;
@@ -48,7 +49,7 @@ - (instancetype)initWithTitle:(NSString *)title isDoneButton:(BOOL)isDoneButton
     if (self) {
         [self setTitle:title forState:UIControlStateNormal];
         self.isDoneButton = isDoneButton;
-        self.contentEdgeInsets = (UIEdgeInsets){.left = 6, .right = 6};
+        [self setContentEdgeInsetsIgnoringDeprecation:(UIEdgeInsets){.left = 6, .right = 6}];
 
         [self setUpConstraints];
     }

diff --git a/ORK1Kit/ORK1Kit/Common/ORK1DocumentSelectionStepViewController.m b/ORK1Kit/ORK1Kit/Common/ORK1DocumentSelectionStepViewController.m
@@ -48,6 +48,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 @import MobileCoreServices;
 @import Photos;
 @import PhotosUI;
+@import UniformTypeIdentifiers.UTCoreTypes;
 
 @interface ORK1DocumentSelectionStepViewController () <UINavigationControllerDelegate, UIImagePickerControllerDelegate, PHPickerViewControllerDelegate>
 
@@ -220,7 +221,7 @@ - (void)presentAuthorizedPicker:(UIImagePickerControllerSourceType)sourceType {
     UIImagePickerController *picker = [[UIImagePickerController alloc] init];
     picker.delegate = self;
     picker.sourceType = sourceType;
-    picker.mediaTypes = @[(NSString *)kUTTypeImage];
+    picker.mediaTypes = @[UTTypeImage.identifier];
 
     if (sourceType == UIImagePickerControllerSourceTypeCamera) {
         switch (self.documentSelectionStep.preferredCameraPosition) {

diff --git a/ORK1Kit/ORK1Kit/Common/ORK1Helpers.m b/ORK1Kit/ORK1Kit/Common/ORK1Helpers.m
@@ -559,3 +559,14 @@ void ORK1DisablePasswordAutofill(id<UITextInputTraits> input) {
         [superview insertSubview:textField atIndex:0];
     }
 }
+
+@implementation UIButton (Deprecations)
+
+- (void)setContentEdgeInsetsIgnoringDeprecation:(UIEdgeInsets)value {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated"
+    self.contentEdgeInsets = value;
+#pragma clang diagnostic pop
+}
+
+@end
diff --git a/ORK1Kit/ORK1Kit/Common/ORK1Helpers_Internal.h b/ORK1Kit/ORK1Kit/Common/ORK1Helpers_Internal.h
@@ -381,4 +381,8 @@ ORK1_EXTERN NSBundle *ORK1DefaultLocaleBundle(void);
 #define ORK1LocalizedStringFromNumber(number) \
 [NSNumberFormatter localizedStringFromNumber:number numberStyle:NSNumberFormatterNoStyle]
 
+@interface UIButton (Deprecations)
+- (void)setContentEdgeInsetsIgnoringDeprecation:(UIEdgeInsets)value;
+@end
+
 NS_ASSUME_NONNULL_END
diff --git a/ORK1Kit/ORK1Kit/Common/ORK1NavigationContainerView.m b/ORK1Kit/ORK1Kit/Common/ORK1NavigationContainerView.m
@@ -50,7 +50,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
     if (self) {
         {
             _skipButton = [ORK1TextButton new];
-            _skipButton.contentEdgeInsets = (UIEdgeInsets){12,10,8,10}; // insets adjusted to get correct vertical height from bottom of screen when aligned to margin
+            [_skipButton setContentEdgeInsetsIgnoringDeprecation:(UIEdgeInsets){12,10,8,10}]; // insets adjusted to get correct vertical height from bottom of screen when aligned to margin
             _skipButton.exclusiveTouch = YES;
             [_skipButton setTitle:nil forState:UIControlStateNormal];
             [_skipButton addTarget:self action:@selector(skipButtonAction:) forControlEvents:UIControlEventTouchUpInside];

diff --git a/ORK1Kit/ORK1Kit/Common/ORK1PasscodeStepViewController.m b/ORK1Kit/ORK1Kit/Common/ORK1PasscodeStepViewController.m
@@ -117,7 +117,7 @@ - (void)stepDidChange {
             CGFloat width = self.view.bounds.size.width - 2 * kForgotPasscodeHorizontalPadding;
 
             UIButton *forgotPasscodeButton = [ORK1TextButton new];
-            forgotPasscodeButton.contentEdgeInsets = (UIEdgeInsets){12, 10, 8, 10};
+            [forgotPasscodeButton setContentEdgeInsetsIgnoringDeprecation:(UIEdgeInsets){12, 10, 8, 10}];
             forgotPasscodeButton.frame = CGRectMake(x, _originalForgotPasscodeY, width, kForgotPasscodeHeight);
 
             NSString *buttonTitle = [self forgotPasscodeButtonText];

diff --git a/ORK1Kit/ORK1Kit/Common/ORK1SignatureStepViewController.m b/ORK1Kit/ORK1Kit/Common/ORK1SignatureStepViewController.m
@@ -68,7 +68,8 @@ - (instancetype)initWithFrame:(CGRect)frame {
     if (self) {
         {
             _clearButton = [ORK1TextButton new];
-            _clearButton.contentEdgeInsets = (UIEdgeInsets){12,10,8,10}; // insets adjusted to get correct vertical height from bottom of screen when aligned to margin
+            // insets adjusted to get correct vertical height from bottom of screen when aligned to margin
+            [_clearButton setContentEdgeInsetsIgnoringDeprecation:(UIEdgeInsets){12,10,8,10}];
             _clearButton.exclusiveTouch = YES;
             [_clearButton setTitle:ORK1LocalizedString(@"BUTTON_CLEAR", nil) forState:UIControlStateNormal];
             _clearButton.translatesAutoresizingMaskIntoConstraints = NO;

diff --git a/ORK1Kit/ORK1Kit/Common/ORK1StepHeaderView.m b/ORK1Kit/ORK1Kit/Common/ORK1StepHeaderView.m
@@ -99,7 +99,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
 
         {
             _learnMoreButton = [ORK1TextButton new];
-            _learnMoreButton.contentEdgeInsets = (UIEdgeInsets){10,10,10,10};
+            [_learnMoreButton setContentEdgeInsetsIgnoringDeprecation:(UIEdgeInsets){10,10,10,10}];
             [_learnMoreButton setTitle:nil forState:UIControlStateNormal];
             [_learnMoreButton addTarget:self action:@selector(learnMoreAction:) forControlEvents:UIControlEventTouchUpInside];
             _learnMoreButton.exclusiveTouch = YES;

diff --git a/ORK1Kit/ORK1Kit/Common/ORK1TextButton.m b/ORK1Kit/ORK1Kit/Common/ORK1TextButton.m
@@ -110,8 +110,11 @@ - (CGSize)intrinsicContentSize {
     if (label && label.preferredMaxLayoutWidth > 0 && self.currentTitle.length > 0) {
         CGSize labelSize = [self.titleLabel sizeThatFits:CGSizeMake(self.titleLabel.preferredMaxLayoutWidth, CGFLOAT_MAX)];
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated"
         CGFloat verticalPadding = MAX(self.contentEdgeInsets.top, self.titleEdgeInsets.top) +  MAX(self.contentEdgeInsets.bottom, self.titleEdgeInsets.bottom);
         CGFloat horizontalPadding = MAX(self.contentEdgeInsets.left, self.titleEdgeInsets.left) + MAX(self.contentEdgeInsets.right, self.titleEdgeInsets.right);
+#pragma clang diagnostic pop
 
         return CGSizeMake(labelSize.width+horizontalPadding,
                           labelSize.height+verticalPadding);

diff --git a/ORK1Kit/ORK1Kit/Consent/ORK1EAGLMoviePlayerView.m b/ORK1Kit/ORK1Kit/Consent/ORK1EAGLMoviePlayerView.m
@@ -369,13 +369,14 @@ - (BOOL)consumePixelBuffer:(CVPixelBufferRef)pixelBuffer {
         /*
          Use the color attachment of the pixel buffer to determine the appropriate color conversion matrix.
          */
-        CFTypeRef colorAttachments = CVBufferGetAttachment(pixelBuffer, kCVImageBufferYCbCrMatrixKey, NULL);
+        CFTypeRef colorAttachments = CVBufferCopyAttachment(pixelBuffer, kCVImageBufferYCbCrMatrixKey, NULL);
 
         if (colorAttachments == kCVImageBufferYCbCrMatrix_ITU_R_601_4) {
             self.preferredConversion = ColorConversion601;
         } else {
             self.preferredConversion = ColorConversion709;
         }
+        CFRelease(colorAttachments);
 
         /*
          CVOpenGLESTextureCacheCreateTextureFromImage will create GLES texture optimally from CVPixelBufferRef.

diff --git a/ResearchKit.xcodeproj/project.pbxproj b/ResearchKit.xcodeproj/project.pbxproj
@@ -521,7 +521,7 @@
 		9550E6741D58DBCF00C691B8 /* ORKTouchAnywhereStep.m in Sources */ = {isa = PBXBuildFile; fileRef = 9550E6721D58DBCF00C691B8 /* ORKTouchAnywhereStep.m */; };
 		9550E67C1D58DD2000C691B8 /* ORKTouchAnywhereStepViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 9550E67A1D58DD2000C691B8 /* ORKTouchAnywhereStepViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9550E67D1D58DD2000C691B8 /* ORKTouchAnywhereStepViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9550E67B1D58DD2000C691B8 /* ORKTouchAnywhereStepViewController.m */; };
-		959A2BFC1D68B98700841B04 /* ORKRangeOfMotionStep.h in Headers */ = {isa = PBXBuildFile; fileRef = 959A2BFA1D68B98700841B04 /* ORKRangeOfMotionStep.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		959A2BFC1D68B98700841B04 /* ORKRangeOfMotionStep.h in Headers */ = {isa = PBXBuildFile; fileRef = 959A2BFA1D68B98700841B04 /* ORKRangeOfMotionStep.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		959A2BFD1D68B98700841B04 /* ORKRangeOfMotionStep.m in Sources */ = {isa = PBXBuildFile; fileRef = 959A2BFB1D68B98700841B04 /* ORKRangeOfMotionStep.m */; };
 		959A2C001D68B9DA00841B04 /* ORKRangeOfMotionStepViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 959A2BFE1D68B9DA00841B04 /* ORKRangeOfMotionStepViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		959A2C011D68B9DA00841B04 /* ORKRangeOfMotionStepViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 959A2BFF1D68B9DA00841B04 /* ORKRangeOfMotionStepViewController.m */; };
@@ -3537,7 +3537,7 @@
 				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = ORK;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1520;
 				ORGANIZATIONNAME = researchkit.org;
 				TargetAttributes = {
 					86CC8E991AC09332001CCD89 = {
@@ -4141,6 +4141,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -4155,7 +4156,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.7;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 4.0;
@@ -4195,6 +4196,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -4203,7 +4205,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.7;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -4281,6 +4283,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -4323,6 +4326,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (

diff --git a/ResearchKit.xcodeproj/xcshareddata/xcschemes/ResearchKit.xcscheme b/ResearchKit.xcodeproj/xcshareddata/xcschemes/ResearchKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ResearchKit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme b/ResearchKit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ResearchKit/ActiveTasks/ORKSpatialSpanMemoryContentView.m b/ResearchKit/ActiveTasks/ORKSpatialSpanMemoryContentView.m
@@ -260,7 +260,7 @@ - (void)setFooterHidden:(BOOL)footerHidden {
 - (void)setButtonItem:(ORKBorderedButton *)buttonItem {
     _buttonItem = buttonItem;
     if (buttonItem) {
-        buttonItem.contentEdgeInsets = (UIEdgeInsets){.top = 2, .bottom = 2, .left = 8, .right = 8};
+        [buttonItem setContentEdgeInsetsIgnoringDeprecation:(UIEdgeInsets){.top = 2, .bottom = 2, .left = 8, .right = 8}];
         buttonItem.translatesAutoresizingMaskIntoConstraints = NO;
         [_continueView addSubview:buttonItem];
         [[NSLayoutConstraint constraintWithItem:_buttonItem

diff --git a/ResearchKit/Common/ORKChoiceViewCell.m b/ResearchKit/Common/ORKChoiceViewCell.m
@@ -292,7 +292,10 @@ - (UIButton *)detailTextIndicator {
     if (_detailTextIndicator == nil) {
         _detailTextIndicator = [UIButton buttonWithType:UIButtonTypeInfoDark];
         CGFloat inset = (DetailTextIndicatorTouchTargetWidth - DetailTextIndicatorImageWidth) / 2;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated"
         _detailTextIndicator.imageEdgeInsets = UIEdgeInsetsMake(inset, inset, inset, inset);
+#pragma clang diagnostic pop
         [self.contentView addSubview:_detailTextIndicator];
         [_detailTextIndicator addTarget:self action:@selector(toggleDetailText) forControlEvents:UIControlEventTouchUpInside];
     }