Skip to content

Commit

Permalink
Merge pull request #913 from stripe/bg-fix-pkaddress-warnings
Browse files Browse the repository at this point in the history
Fix PKAddress warnings
  • Loading branch information
bg-stripe authored Mar 20, 2018
2 parents cf37c60 + da1cbea commit 3b82649
Show file tree
Hide file tree
Showing 50 changed files with 917 additions and 21 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ script:
- '[ "$TEST_TYPE" != lint ] || ./ci_scripts/check_fauxpas.sh'
- '[ "$TEST_TYPE" != tests ] || travis_retry ./ci_scripts/run_tests.sh'
- '[ "$TEST_TYPE" != analyzer ] || ./ci_scripts/run_analyzer.sh'
- '[ "$TEST_TYPE" != installation_cocoapods ] || ./Tests/installation_tests/cocoapods/without_frameworks/test.sh'
- '[ "$TEST_TYPE" != installation_cocoapods_frameworks ] || ./Tests/installation_tests/cocoapods/with_frameworks/test.sh'
- '[ "$TEST_TYPE" != installation_cocoapods_objc ] || ./Tests/installation_tests/cocoapods/without_frameworks_objc/test.sh'
- '[ "$TEST_TYPE" != installation_cocoapods_frameworks_objc ] || ./Tests/installation_tests/cocoapods/with_frameworks_objc/test.sh'
- '[ "$TEST_TYPE" != installation_cocoapods_frameworks_swift ] || ./Tests/installation_tests/cocoapods/with_frameworks_swift/test.sh'
- '[ "$TEST_TYPE" != installation_manual ] || travis_retry ./Tests/installation_tests/manual_installation/test.sh'
- '[ "$TEST_TYPE" != installation_carthage ] || ./Tests/installation_tests/carthage/test.sh'
- '[ "$TEST_TYPE" != documentation ] || ./ci_scripts/check_documentation.sh'
6 changes: 6 additions & 0 deletions Stripe/PublicHeaders/STPAddress.h
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ extern STPContactField const STPContactFieldName;
*/
- (BOOL)containsContentForShippingAddressFields:(nullable NSSet<STPContactField> *)desiredFields;

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated"
/**
Converts an STPBillingAddressFields enum value into the closest equivalent
representation of PKAddressField options
Expand All @@ -221,7 +223,10 @@ extern STPContactField const STPContactFieldName;
a PKAddressField value.
*/
+ (PKAddressField)applePayAddressFieldsFromBillingAddressFields:(STPBillingAddressFields)billingAddressFields;
#pragma clang diagnostic pop

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated"
/**
Converts a set of STPContactField values into the closest equivalent
representation of PKAddressField options
Expand All @@ -231,6 +236,7 @@ extern STPContactField const STPContactFieldName;
a PKAddressField value.
*/
+ (PKAddressField)pkAddressFieldsFromStripeContactFields:(nullable NSSet<STPContactField> *)contactFields;
#pragma clang diagnostic pop

/**
Converts a set of STPContactField values into the closest equivalent
Expand Down
7 changes: 0 additions & 7 deletions Tests/installation_tests/cocoapods/with_frameworks/Podfile

This file was deleted.

Loading

0 comments on commit 3b82649

Please sign in to comment.