Migrate Stripe3DS2.framework to libStripe3DS2.a

## Summary Removes Stripe3DS2.framework in favor of a static libStripe3DS2.a. ## Motivation Nested frameworks are not allowed on the iOS App Store. ## Testing * Tested dropping Stripe.framework into a sample app * Tested sample app with Carthage * Tested sample app with CocoaPods * Passed the sample app through App Store validation
stripe · Jul 25, 2019 · 772737a · 772737a
2 parents c8ad0af + d61f87b
commit 772737a
Show file tree

Hide file tree

Showing 87 changed files with 357 additions and 77 deletions.
diff --git a/.jazzy.yaml b/.jazzy.yaml
@@ -14,3 +14,6 @@ github_file_prefix: https://github.com/stripe/stripe-ios/tree/master
 skip_undocumented: true
 hide_documentation_coverage: true
 theme: fullwidth
+exclude: 
+  - Stripe/PublicHeaders/STD*
+  - Stripe/PublicHeaders/Stripe3DS2.h
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 16.0.1 2019-07-25
+* Migrates Stripe3DS2.framework to libStripe3DS2.a, resolving an issue with App Store validation.
+* Fixes a crash in STPPaymentHandler.
+
 ## 16.0.0 2019-07-18
 * Migrates STPPaymentCardTextField.cardParams property type from STPCardParams to STPPaymentMethodCardParams
 * STPAddCardViewController:

diff --git a/...rameworks/Stripe3DS2.framework/Assets.car → ...alFrameworks/Stripe3DS2.bundle/Assets.car b/...rameworks/Stripe3DS2.framework/Assets.car → ...alFrameworks/Stripe3DS2.bundle/Assets.car
diff --git a/InternalFrameworks/Stripe3DS2.bundle/Info.plist b/InternalFrameworks/Stripe3DS2.bundle/Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.stripe.stripe-3ds2</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Stripe3DS2</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/...pe3DS2.framework/Modules/module.modulemap → ...tripe3DS2.bundle/Modules/module.modulemap b/...pe3DS2.framework/Modules/module.modulemap → ...tripe3DS2.bundle/Modules/module.modulemap
diff --git a/...lFrameworks/Stripe3DS2.framework/amex.der → ...rnalFrameworks/Stripe3DS2.bundle/amex.der b/...lFrameworks/Stripe3DS2.framework/amex.der → ...rnalFrameworks/Stripe3DS2.bundle/amex.der
diff --git a/...S2.framework/da.lproj/Localizable.strings → ...e3DS2.bundle/da.lproj/Localizable.strings b/...S2.framework/da.lproj/Localizable.strings → ...e3DS2.bundle/da.lproj/Localizable.strings
diff --git a/...S2.framework/de.lproj/Localizable.strings → ...e3DS2.bundle/de.lproj/Localizable.strings b/...S2.framework/de.lproj/Localizable.strings → ...e3DS2.bundle/de.lproj/Localizable.strings
diff --git a/...meworks/Stripe3DS2.framework/discover.der → ...Frameworks/Stripe3DS2.bundle/discover.der b/...meworks/Stripe3DS2.framework/discover.der → ...Frameworks/Stripe3DS2.bundle/discover.der
diff --git a/...ameworks/Stripe3DS2.framework/ec_test.der → ...lFrameworks/Stripe3DS2.bundle/ec_test.der b/...ameworks/Stripe3DS2.framework/ec_test.der → ...lFrameworks/Stripe3DS2.bundle/ec_test.der
diff --git a/...S2.framework/en.lproj/Localizable.strings → ...e3DS2.bundle/en.lproj/Localizable.strings b/...S2.framework/en.lproj/Localizable.strings → ...e3DS2.bundle/en.lproj/Localizable.strings
diff --git a/...ramework/es-419.lproj/Localizable.strings → ...2.bundle/es-419.lproj/Localizable.strings b/...ramework/es-419.lproj/Localizable.strings → ...2.bundle/es-419.lproj/Localizable.strings
diff --git a/...S2.framework/es.lproj/Localizable.strings → ...e3DS2.bundle/es.lproj/Localizable.strings b/...S2.framework/es.lproj/Localizable.strings → ...e3DS2.bundle/es.lproj/Localizable.strings
diff --git a/...S2.framework/fi.lproj/Localizable.strings → ...e3DS2.bundle/fi.lproj/Localizable.strings b/...S2.framework/fi.lproj/Localizable.strings → ...e3DS2.bundle/fi.lproj/Localizable.strings
diff --git a/...framework/fr-CA.lproj/Localizable.strings → ...S2.bundle/fr-CA.lproj/Localizable.strings b/...framework/fr-CA.lproj/Localizable.strings → ...S2.bundle/fr-CA.lproj/Localizable.strings
diff --git a/...S2.framework/fr.lproj/Localizable.strings → ...e3DS2.bundle/fr.lproj/Localizable.strings b/...S2.framework/fr.lproj/Localizable.strings → ...e3DS2.bundle/fr.lproj/Localizable.strings
diff --git a/...S2.framework/it.lproj/Localizable.strings → ...e3DS2.bundle/it.lproj/Localizable.strings b/...S2.framework/it.lproj/Localizable.strings → ...e3DS2.bundle/it.lproj/Localizable.strings
diff --git a/...S2.framework/ja.lproj/Localizable.strings → ...e3DS2.bundle/ja.lproj/Localizable.strings b/...S2.framework/ja.lproj/Localizable.strings → ...e3DS2.bundle/ja.lproj/Localizable.strings
diff --git a/...works/Stripe3DS2.framework/mastercard.der → ...ameworks/Stripe3DS2.bundle/mastercard.der b/...works/Stripe3DS2.framework/mastercard.der → ...ameworks/Stripe3DS2.bundle/mastercard.der
diff --git a/...S2.framework/nb.lproj/Localizable.strings → ...e3DS2.bundle/nb.lproj/Localizable.strings b/...S2.framework/nb.lproj/Localizable.strings → ...e3DS2.bundle/nb.lproj/Localizable.strings
diff --git a/...S2.framework/nl.lproj/Localizable.strings → ...e3DS2.bundle/nl.lproj/Localizable.strings b/...S2.framework/nl.lproj/Localizable.strings → ...e3DS2.bundle/nl.lproj/Localizable.strings
diff --git a/...framework/nn-NO.lproj/Localizable.strings → ...S2.bundle/nn-NO.lproj/Localizable.strings b/...framework/nn-NO.lproj/Localizable.strings → ...S2.bundle/nn-NO.lproj/Localizable.strings
diff --git a/...framework/pt-BR.lproj/Localizable.strings → ...S2.bundle/pt-BR.lproj/Localizable.strings b/...framework/pt-BR.lproj/Localizable.strings → ...S2.bundle/pt-BR.lproj/Localizable.strings
diff --git a/...framework/pt-PT.lproj/Localizable.strings → ...S2.bundle/pt-PT.lproj/Localizable.strings b/...framework/pt-PT.lproj/Localizable.strings → ...S2.bundle/pt-PT.lproj/Localizable.strings
diff --git a/...S2.framework/sv.lproj/Localizable.strings → ...e3DS2.bundle/sv.lproj/Localizable.strings b/...S2.framework/sv.lproj/Localizable.strings → ...e3DS2.bundle/sv.lproj/Localizable.strings
diff --git a/...ameworks/Stripe3DS2.framework/ul-test.der → ...lFrameworks/Stripe3DS2.bundle/ul-test.der b/...ameworks/Stripe3DS2.framework/ul-test.der → ...lFrameworks/Stripe3DS2.bundle/ul-test.der
diff --git a/...lFrameworks/Stripe3DS2.framework/visa.der → ...rnalFrameworks/Stripe3DS2.bundle/visa.der b/...lFrameworks/Stripe3DS2.framework/visa.der → ...rnalFrameworks/Stripe3DS2.bundle/visa.der
diff --git a/...amework/zh-Hans.lproj/Localizable.strings → ....bundle/zh-Hans.lproj/Localizable.strings b/...amework/zh-Hans.lproj/Localizable.strings → ....bundle/zh-Hans.lproj/Localizable.strings
diff --git a/InternalFrameworks/Stripe3DS2.framework/Headers/Stripe3DS2.h b/InternalFrameworks/Stripe3DS2.framework/Headers/Stripe3DS2.h
diff --git a/InternalFrameworks/Stripe3DS2.framework/Info.plist b/InternalFrameworks/Stripe3DS2.framework/Info.plist
diff --git a/InternalFrameworks/Stripe3DS2.framework/Stripe3DS2 b/InternalFrameworks/Stripe3DS2.framework/Stripe3DS2
diff --git a/InternalFrameworks/libStripe3DS2.a b/InternalFrameworks/libStripe3DS2.a
diff --git a/Stripe.podspec b/Stripe.podspec
@@ -12,6 +12,10 @@ Pod::Spec.new do |s|
   s.ios.deployment_target          = '9.0'
   s.public_header_files            = 'Stripe/PublicHeaders/*.h'
   s.source_files                   = 'Stripe/PublicHeaders/*.h', 'Stripe/*.{h,m}', 'Stripe/Payments/*{h,m}'
+  s.vendored_libraries             = 'InternalFrameworks/libStripe3DS2.a'
   s.ios.resource_bundle            = { 'Stripe' => 'Stripe/Resources/**/*' }
-  s.vendored_frameworks            = 'InternalFrameworks/Stripe3DS2.framework'
+  s.ios.resources                  = "InternalFrameworks/Stripe3DS2.bundle"
+  s.xcconfig = { 
+    "OTHER_LDFLAGS" => "$(inherited) -ObjC" 
+  }
 end
diff --git a/Stripe.xcodeproj/project.pbxproj b/Stripe.xcodeproj/project.pbxproj
diff --git a/Stripe/Payments/STPPaymentHandler.m b/Stripe/Payments/STPPaymentHandler.m
@@ -9,7 +9,7 @@
 #import "STPPaymentHandler.h"
 
 #import <SafariServices/SafariServices.h>
-#import <Stripe3DS2/Stripe3DS2.h>
+#import <Stripe/Stripe3DS2.h>
 
 #import "NSError+Stripe.h"
 #import "STP3DS2AuthenticateResponse.h"

diff --git a/Stripe/Payments/STPThreeDSButtonCustomization.m b/Stripe/Payments/STPThreeDSButtonCustomization.m
@@ -9,7 +9,7 @@
 #import "STPThreeDSButtonCustomization.h"
 #import "STPThreeDSCustomization+Private.h"
 
-#import <Stripe3DS2/STDSButtonCustomization.h>
+#import <Stripe/STDSButtonCustomization.h>
 
 @implementation STPThreeDSButtonCustomization
 

diff --git a/Stripe/Payments/STPThreeDSFooterCustomization.m b/Stripe/Payments/STPThreeDSFooterCustomization.m
@@ -9,7 +9,7 @@
 #import "STPThreeDSFooterCustomization.h"
 
 #import "STPThreeDSCustomization+Private.h"
-#import <Stripe3DS2/STDSFooterCustomization.h>
+#import <Stripe/STDSFooterCustomization.h>
 
 @implementation STPThreeDSFooterCustomization
 

diff --git a/Stripe/Payments/STPThreeDSLabelCustomization.m b/Stripe/Payments/STPThreeDSLabelCustomization.m
@@ -9,7 +9,7 @@
 #import "STPThreeDSLabelCustomization.h"
 
 #import "STPThreeDSCustomization+Private.h"
-#import <Stripe3DS2/STDSLabelCustomization.h>
+#import <Stripe/STDSLabelCustomization.h>
 
 @implementation STPThreeDSLabelCustomization
 

diff --git a/Stripe/Payments/STPThreeDSNavigationBarCustomization.m b/Stripe/Payments/STPThreeDSNavigationBarCustomization.m
@@ -9,7 +9,7 @@
 #import "STPThreeDSNavigationBarCustomization.h"
 
 #import "STPThreeDSCustomization+Private.h"
-#import <Stripe3DS2/STDSNavigationBarCustomization.h>
+#import <Stripe/STDSNavigationBarCustomization.h>
 
 @implementation STPThreeDSNavigationBarCustomization
 

diff --git a/Stripe/Payments/STPThreeDSSelectionCustomization.m b/Stripe/Payments/STPThreeDSSelectionCustomization.m
@@ -9,7 +9,7 @@
 #import "STPThreeDSSelectionCustomization.h"
 #import "STPThreeDSCustomization+Private.h"
 
-#import <Stripe3DS2/STDSSelectionCustomization.h>
+#import <Stripe/STDSSelectionCustomization.h>
 
 @implementation STPThreeDSSelectionCustomization
 

diff --git a/Stripe/Payments/STPThreeDSTextFieldCustomization.m b/Stripe/Payments/STPThreeDSTextFieldCustomization.m
@@ -9,7 +9,7 @@
 #import "STPThreeDSTextFieldCustomization.h"
 
 #import "STPThreeDSCustomization+Private.h"
-#import <Stripe3DS2/STDSTextFieldCustomization.h>
+#import <Stripe/STDSTextFieldCustomization.h>
 
 @implementation STPThreeDSTextFieldCustomization
 

diff --git a/Stripe/Payments/STPThreeDSUICustomization.m b/Stripe/Payments/STPThreeDSUICustomization.m
@@ -10,7 +10,7 @@
 #import "STPThreeDSCustomization+Private.h"
 #import "STPThreeDSFooterCustomization.h"
 
-#import <Stripe3DS2/STDSUICustomization.h>
+#import <Stripe/STDSUICustomization.h>
 
 @interface STPThreeDSUICustomization()
 @property (nonatomic, strong) NSMutableDictionary<NSNumber *, STPThreeDSButtonCustomization *> *buttonCustomizationDictionary;

diff --git a/...Headers/STDSAlreadyInitializedException.h → ...Headers/STDSAlreadyInitializedException.h b/...Headers/STDSAlreadyInitializedException.h → ...Headers/STDSAlreadyInitializedException.h
diff --git a/...ers/STDSAuthenticationRequestParameters.h → ...ers/STDSAuthenticationRequestParameters.h b/...ers/STDSAuthenticationRequestParameters.h → ...ers/STDSAuthenticationRequestParameters.h
diff --git a/...work/Headers/STDSAuthenticationResponse.h → ...ublicHeaders/STDSAuthenticationResponse.h b/...work/Headers/STDSAuthenticationResponse.h → ...ublicHeaders/STDSAuthenticationResponse.h
diff --git a/...amework/Headers/STDSButtonCustomization.h → ...e/PublicHeaders/STDSButtonCustomization.h b/...amework/Headers/STDSButtonCustomization.h → ...e/PublicHeaders/STDSButtonCustomization.h
diff --git a/...amework/Headers/STDSChallengeParameters.h → ...e/PublicHeaders/STDSChallengeParameters.h b/...amework/Headers/STDSChallengeParameters.h → ...e/PublicHeaders/STDSChallengeParameters.h
diff --git a/...ork/Headers/STDSChallengeStatusReceiver.h → ...blicHeaders/STDSChallengeStatusReceiver.h b/...ork/Headers/STDSChallengeStatusReceiver.h → ...blicHeaders/STDSChallengeStatusReceiver.h
diff --git a/...2.framework/Headers/STDSCompletionEvent.h → Stripe/PublicHeaders/STDSCompletionEvent.h b/...2.framework/Headers/STDSCompletionEvent.h → Stripe/PublicHeaders/STDSCompletionEvent.h
diff --git a/....framework/Headers/STDSConfigParameters.h → Stripe/PublicHeaders/STDSConfigParameters.h b/....framework/Headers/STDSConfigParameters.h → Stripe/PublicHeaders/STDSConfigParameters.h
diff --git a/...DS2.framework/Headers/STDSCustomization.h → Stripe/PublicHeaders/STDSCustomization.h b/...DS2.framework/Headers/STDSCustomization.h → Stripe/PublicHeaders/STDSCustomization.h
diff --git a/...3DS2.framework/Headers/STDSErrorMessage.h → Stripe/PublicHeaders/STDSErrorMessage.h b/...3DS2.framework/Headers/STDSErrorMessage.h → Stripe/PublicHeaders/STDSErrorMessage.h
diff --git a/...ipe3DS2.framework/Headers/STDSException.h → Stripe/PublicHeaders/STDSException.h b/...ipe3DS2.framework/Headers/STDSException.h → Stripe/PublicHeaders/STDSException.h
diff --git a/...amework/Headers/STDSFooterCustomization.h → ...e/PublicHeaders/STDSFooterCustomization.h b/...amework/Headers/STDSFooterCustomization.h → ...e/PublicHeaders/STDSFooterCustomization.h
diff --git a/...ework/Headers/STDSInvalidInputException.h → ...PublicHeaders/STDSInvalidInputException.h b/...ework/Headers/STDSInvalidInputException.h → ...PublicHeaders/STDSInvalidInputException.h
diff --git a/...DS2.framework/Headers/STDSJSONDecodable.h → Stripe/PublicHeaders/STDSJSONDecodable.h b/...DS2.framework/Headers/STDSJSONDecodable.h → Stripe/PublicHeaders/STDSJSONDecodable.h
diff --git a/...DS2.framework/Headers/STDSJSONEncodable.h → Stripe/PublicHeaders/STDSJSONEncodable.h b/...DS2.framework/Headers/STDSJSONEncodable.h → Stripe/PublicHeaders/STDSJSONEncodable.h
diff --git a/...e3DS2.framework/Headers/STDSJSONEncoder.h → Stripe/PublicHeaders/STDSJSONEncoder.h b/...e3DS2.framework/Headers/STDSJSONEncoder.h → Stripe/PublicHeaders/STDSJSONEncoder.h
diff --git a/...ramework/Headers/STDSLabelCustomization.h → ...pe/PublicHeaders/STDSLabelCustomization.h b/...ramework/Headers/STDSLabelCustomization.h → ...pe/PublicHeaders/STDSLabelCustomization.h
diff --git a/.../Headers/STDSNavigationBarCustomization.h → ...cHeaders/STDSNavigationBarCustomization.h b/.../Headers/STDSNavigationBarCustomization.h → ...cHeaders/STDSNavigationBarCustomization.h
diff --git a/...ork/Headers/STDSNotInitializedException.h → ...blicHeaders/STDSNotInitializedException.h b/...ork/Headers/STDSNotInitializedException.h → ...blicHeaders/STDSNotInitializedException.h
@@ -6,7 +6,7 @@
 //  Copyright © 2019 Stripe. All rights reserved.
 //
 
-#import <Stripe3DS2/Stripe3DS2.h>
+#import "Stripe3DS2.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/...ramework/Headers/STDSProtocolErrorEvent.h → ...pe/PublicHeaders/STDSProtocolErrorEvent.h b/...ramework/Headers/STDSProtocolErrorEvent.h → ...pe/PublicHeaders/STDSProtocolErrorEvent.h
diff --git a/...framework/Headers/STDSRuntimeErrorEvent.h → Stripe/PublicHeaders/STDSRuntimeErrorEvent.h b/...framework/Headers/STDSRuntimeErrorEvent.h → Stripe/PublicHeaders/STDSRuntimeErrorEvent.h
diff --git a/....framework/Headers/STDSRuntimeException.h → Stripe/PublicHeaders/STDSRuntimeException.h b/....framework/Headers/STDSRuntimeException.h → Stripe/PublicHeaders/STDSRuntimeException.h
diff --git a/...work/Headers/STDSSelectionCustomization.h → ...ublicHeaders/STDSSelectionCustomization.h b/...work/Headers/STDSSelectionCustomization.h → ...ublicHeaders/STDSSelectionCustomization.h
diff --git a/...2.framework/Headers/STDSStripe3DS2Error.h → Stripe/PublicHeaders/STDSStripe3DS2Error.h b/...2.framework/Headers/STDSStripe3DS2Error.h → Stripe/PublicHeaders/STDSStripe3DS2Error.h
diff --git a/...work/Headers/STDSTextFieldCustomization.h → ...ublicHeaders/STDSTextFieldCustomization.h b/...work/Headers/STDSTextFieldCustomization.h → ...ublicHeaders/STDSTextFieldCustomization.h
diff --git a/...2.framework/Headers/STDSThreeDS2Service.h → Stripe/PublicHeaders/STDSThreeDS2Service.h b/...2.framework/Headers/STDSThreeDS2Service.h → Stripe/PublicHeaders/STDSThreeDS2Service.h
diff --git a/...work/Headers/STDSThreeDSProtocolVersion.h → ...ublicHeaders/STDSThreeDSProtocolVersion.h b/...work/Headers/STDSThreeDSProtocolVersion.h → ...ublicHeaders/STDSThreeDSProtocolVersion.h
diff --git a/...e3DS2.framework/Headers/STDSTransaction.h → Stripe/PublicHeaders/STDSTransaction.h b/...e3DS2.framework/Headers/STDSTransaction.h → Stripe/PublicHeaders/STDSTransaction.h
diff --git a/...2.framework/Headers/STDSUICustomization.h → Stripe/PublicHeaders/STDSUICustomization.h b/...2.framework/Headers/STDSUICustomization.h → Stripe/PublicHeaders/STDSUICustomization.h
diff --git a/...tripe3DS2.framework/Headers/STDSWarning.h → Stripe/PublicHeaders/STDSWarning.h b/...tripe3DS2.framework/Headers/STDSWarning.h → Stripe/PublicHeaders/STDSWarning.h
diff --git a/Stripe/PublicHeaders/Stripe.h b/Stripe/PublicHeaders/Stripe.h
@@ -97,3 +97,6 @@
 #import "STPUserInformation.h"
 #import "StripeError.h"
 #import "UINavigationBar+Stripe_Theme.h"
+
+// 3DS2
+#import "Stripe3DS2.h"
diff --git a/Stripe/PublicHeaders/Stripe3DS2.h b/Stripe/PublicHeaders/Stripe3DS2.h
@@ -0,0 +1,50 @@
+//
+//  Stripe3DS2.h
+//  Stripe3DS2
+//
+//  Created by Cameron Sabol on 1/16/19.
+//  Copyright © 2019 Stripe. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for Stripe3DS2.
+FOUNDATION_EXPORT double Stripe3DS2VersionNumber;
+
+//! Project version string for Stripe3DS2.
+FOUNDATION_EXPORT const unsigned char Stripe3DS2VersionString[];
+
+#import "STDSConfigParameters.h"
+#import "STDSThreeDS2Service.h"
+#import "STDSUICustomization.h"
+#import "STDSWarning.h"
+
+#import "STDSAlreadyInitializedException.h"
+#import "STDSInvalidInputException.h"
+#import "STDSNotInitializedException.h"
+#import "STDSRuntimeException.h"
+
+#import "STDSErrorMessage.h"
+#import "STDSProtocolErrorEvent.h"
+#import "STDSRuntimeErrorEvent.h"
+#import "STDSStripe3DS2Error.h"
+#import "STDSThreeDSProtocolVersion.h"
+
+#import "STDSAuthenticationRequestParameters.h"
+#import "STDSAuthenticationResponse.h"
+#import "STDSChallengeParameters.h"
+#import "STDSChallengeStatusReceiver.h"
+#import "STDSCompletionEvent.h"
+#import "STDSJSONDecodable.h"
+#import "STDSJSONEncoder.h"
+#import "STDSTransaction.h"
+
+#import "STDSButtonCustomization.h"
+#import "STDSCustomization.h"
+#import "STDSException.h"
+#import "STDSFooterCustomization.h"
+#import "STDSJSONEncodable.h"
+#import "STDSLabelCustomization.h"
+#import "STDSNavigationBarCustomization.h"
+#import "STDSSelectionCustomization.h"
+#import "STDSTextFieldCustomization.h"
diff --git a/Stripe/STP3DS2AuthenticateResponse.m b/Stripe/STP3DS2AuthenticateResponse.m
@@ -8,7 +8,7 @@
 
 #import "STP3DS2AuthenticateResponse.h"
 
-#import <Stripe3DS2/Stripe3DS2.h>
+#import <Stripe/Stripe3DS2.h>
 
 #import "NSDictionary+Stripe.h"
 #import "NSArray+Stripe.h"

diff --git a/Stripe/STPAPIClient.m b/Stripe/STPAPIClient.m
@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 #import <sys/utsname.h>
 
-#import <Stripe3DS2/Stripe3DS2.h>
+#import <Stripe/Stripe3DS2.h>
 
 #import "STPAPIClient.h"
 #import "STPAPIClient+ApplePay.h"

diff --git a/Stripe/STPPaymentHandlerActionParams.m b/Stripe/STPPaymentHandlerActionParams.m
@@ -9,7 +9,7 @@
 #import "STPPaymentHandlerActionParams.h"
 
 #import "STPAPIClient.h"
-#import <Stripe3DS2/Stripe3DS2.h>
+#import <Stripe/Stripe3DS2.h>
 #import "STPPaymentIntent.h"
 #import "STPSetupIntent.h"
 #import "STPThreeDSCustomizationSettings.h"

diff --git a/Tests/Tests/STPThreeDSButtonCustomizationTest.m b/Tests/Tests/STPThreeDSButtonCustomizationTest.m
@@ -7,7 +7,7 @@
 //
 
 #import <XCTest/XCTest.h>
-#import <Stripe3DS2/STDSButtonCustomization.h>
+#import <Stripe/STDSButtonCustomization.h>
 
 #import "STPThreeDSButtonCustomization.h"
 #import "STPThreeDSCustomization+Private.h"

diff --git a/Tests/Tests/STPThreeDSFooterCustomizationTest.m b/Tests/Tests/STPThreeDSFooterCustomizationTest.m
@@ -8,7 +8,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import <Stripe3DS2/STDSFooterCustomization.h>
+#import <Stripe/STDSFooterCustomization.h>
 
 #import "STPThreeDSFooterCustomization.h"
 #import "STPThreeDSCustomization+Private.h"

diff --git a/Tests/Tests/STPThreeDSLabelCustomizationTest.m b/Tests/Tests/STPThreeDSLabelCustomizationTest.m
@@ -8,7 +8,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import <Stripe3DS2/STDSLabelCustomization.h>
+#import <Stripe/STDSLabelCustomization.h>
 
 #import "STPThreeDSLabelCustomization.h"
 #import "STPThreeDSCustomization+Private.h"

diff --git a/Tests/Tests/STPThreeDSNavigationBarCustomizationTest.m b/Tests/Tests/STPThreeDSNavigationBarCustomizationTest.m
@@ -8,7 +8,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import <Stripe3DS2/STDSNavigationBarCustomization.h>
+#import <Stripe/STDSNavigationBarCustomization.h>
 
 #import "STPThreeDSNavigationBarCustomization.h"
 #import "STPThreeDSCustomization+Private.h"

diff --git a/Tests/Tests/STPThreeDSSelectionCustomizationTest.m b/Tests/Tests/STPThreeDSSelectionCustomizationTest.m
@@ -7,7 +7,7 @@
 //
 
 #import <XCTest/XCTest.h>
-#import <Stripe3DS2/STDSSelectionCustomization.h>
+#import <Stripe/STDSSelectionCustomization.h>
 
 #import "STPThreeDSSelectionCustomization.h"
 #import "STPThreeDSCustomization+Private.h"

diff --git a/Tests/Tests/STPThreeDSTextFieldCustomizationTest.m b/Tests/Tests/STPThreeDSTextFieldCustomizationTest.m
@@ -7,7 +7,7 @@
 //
 
 #import <XCTest/XCTest.h>
-#import <Stripe3DS2/STDSTextFieldCustomization.h>
+#import <Stripe/STDSTextFieldCustomization.h>
 
 #import "STPThreeDSTextFieldCustomization.h"
 #import "STPThreeDSCustomization+Private.h"

diff --git a/Tests/Tests/STPThreeDSUICustomizationTest.m b/Tests/Tests/STPThreeDSUICustomizationTest.m
@@ -7,7 +7,7 @@
 //
 
 #import <XCTest/XCTest.h>
-#import <Stripe3DS2/STDSUICustomization.h>
+#import <Stripe/STDSUICustomization.h>
 
 #import "STPThreeDSCustomization+Private.h"
 

diff --git a/ci_scripts/check_public_headers.rb b/ci_scripts/check_public_headers.rb
@@ -15,6 +15,10 @@
 	/\#import \"(.*?)\"\n/.match(line)
 end.compact.map do |match|
 	match.captures.first
+end + File.readlines("Stripe/PublicHeaders/Stripe3DS2.h").map do |line|
+	/\#import \"(.*?)\"\n/.match(line)
+end.compact.map do |match|
+	match.captures.first
 end + ["Stripe.h"]).sort
 contents_of_public_headers_dir = Dir.glob("Stripe/PublicHeaders/*.h").map { |h| File.basename(h) }.sort
 

diff --git a/ci_scripts/check_resource_bundle.rb b/ci_scripts/check_resource_bundle.rb
@@ -10,6 +10,7 @@
 require 'xcodeproj'
 
 contents_of_resources_dir = Dir.glob("Stripe/Resources/Images/*.png").map { |h| File.basename(h) }.uniq.sort
+puts contents_of_resources_dir
 targets = ['StripeiOSResources', 'StripeiOS']
 targets.each do |target|
 
@@ -19,7 +20,8 @@
   if duplicates.any?
     abort("Found some duplicate entries in the resources build phase for target #{target}:\n#{duplicates}")
   end
-  resources = resource_bundle_files.uniq.sort.select{ |n| !(n.end_with?(".strings") || n.end_with?(".sh")) }
+  resources = resource_bundle_files.uniq.sort.select{ |n| !(n.end_with?(".strings") || n.end_with?(".sh") || n == "Stripe3DS2.bundle") }
+  puts resources
 
   if contents_of_resources_dir != resources
     likely_culprits = ((contents_of_resources_dir - resources) + (resources - contents_of_resources_dir)).uniq

diff --git a/ci_scripts/run_analyzer.sh b/ci_scripts/run_analyzer.sh
@@ -20,6 +20,7 @@ xcodebuild clean analyze \
   -configuration "Debug" \
   -sdk "iphonesimulator" \
   ONLY_ACTIVE_ARCH=NO \
+  OTHER_LDFLAGS="\$(inherited) -Wl,-no_compact_unwind" \
   | tee "${log_file}" \
   | xcpretty