Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix xcode 11.4 v14.0.0 #1534

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 14.0.1 2020-03-25
* Fixes an issue building with Xcode 11.4 [#1526](https://github.com/stripe/stripe-ios/pull/1526)

## 14.0.0 2018-11-14
* Changes `STPPaymentCardTextField`, which now copies the `cardParams` property. See [MIGRATING.md](/MIGRATING.md) for more details. [#1031](https://github.com/stripe/stripe-ios/pull/1031)
* Renames `STPPaymentIntentParams.returnUrl` to `STPPaymentIntentParams.returnURL`. [#1037](https://github.com/stripe/stripe-ios/pull/1037)
Expand Down
2 changes: 1 addition & 1 deletion Example/Custom Integration (ObjC)/Constants.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// This can be found at https://dashboard.stripe.com/account/apikeys
NSString *const StripePublishableKey = nil; // TODO: replace nil with your own value

// To set this up, check out https://github.com/stripe/example-ios-backend/tree/v14.0.0
// To set this up, check out https://github.com/stripe/example-ios-backend/tree/v14.0.1
// This should be in the format https://my-shiny-backend.herokuapp.com
NSString *const BackendBaseURL = nil; // TODO: replace nil with your own value

Expand Down
2 changes: 1 addition & 1 deletion Example/Custom Integration (ObjC)/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ For more details on using Sources, see https://stripe.com/docs/mobile/ios/source
2. Execute `./setup.sh` from the root of the repository to build the necessary dependencies
3. Open `./Stripe.xcworkspace` (not `./Stripe.xcodeproj`) with Xcode
4. Fill in the `stripePublishableKey` constant in `./Example/Custom Integration (ObjC)/Constants.m` with your test "Publishable key" from Stripe. This key should start with `pk_test`.
5. Head to [example-ios-backend](https://github.com/stripe/example-ios-backend/tree/v14.0.0) and click "Deploy to Heroku". Provide your Stripe test "Secret key" as the `STRIPE_TEST_SECRET_KEY` environment variable. This key should start with `sk_test`.
5. Head to [example-ios-backend](https://github.com/stripe/example-ios-backend/tree/v14.0.1) and click "Deploy to Heroku". Provide your Stripe test "Secret key" as the `STRIPE_TEST_SECRET_KEY` environment variable. This key should start with `sk_test`.
6. Fill in the `backendBaseURL` constant in `Constants.m` with the app URL Heroku provides (e.g. "https://my-example-app.herokuapp.com")

After this is done, you can make test payments through the app and see them in your Stripe dashboard.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class CheckoutViewController: UIViewController, STPPaymentContextDelegate {
let stripePublishableKey = ""

// 2) Next, optionally, to have this demo save your user's payment details, head to
// https://github.com/stripe/example-ios-backend/tree/v14.0.0, click "Deploy to Heroku", and follow
// https://github.com/stripe/example-ios-backend/tree/v14.0.1, click "Deploy to Heroku", and follow
// the instructions (don't worry, it's free). Replace nil on the line below with your
// Heroku URL (it looks like https://blazing-sunrise-1234.herokuapp.com ).
let backendBaseURL: String? = nil
Expand Down
2 changes: 1 addition & 1 deletion Example/Standard Integration (Swift)/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ For a detailed guide, see https://stripe.com/docs/mobile/ios/standard
2. Execute `./setup.sh` from the root of the repository to build the necessary dependencies
3. Open `./Stripe.xcworkspace` (not `./Stripe.xcodeproj`) with Xcode
4. Fill in the `stripePublishableKey` constant in `./Example/Standard Integration (Swift)/CheckoutViewController.swift` with your test "Publishable key" from Stripe. This key should start with `pk_test`.
5. Head to [example-ios-backend](https://github.com/stripe/example-ios-backend/tree/v14.0.0) and click "Deploy to Heroku". Provide your Stripe test "Secret key" as the `STRIPE_TEST_SECRET_KEY` environment variable. This key should start with `pk_test`.
5. Head to [example-ios-backend](https://github.com/stripe/example-ios-backend/tree/v14.0.1) and click "Deploy to Heroku". Provide your Stripe test "Secret key" as the `STRIPE_TEST_SECRET_KEY` environment variable. This key should start with `pk_test`.
6. Fill in the `backendBaseURL` constant in `./Example/Standard Integration (Swift)/CheckoutViewController.swift` with the app URL Heroku provides (e.g. "https://my-example-app.herokuapp.com")

After this is done, you can make test payments through the app and see them in your Stripe dashboard.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The Stripe iOS SDK makes it quick and easy to build an excellent payment experie
We recommend that you install the Stripe iOS SDK using a package manager such as [Cocoapods or Carthage](https://stripe.com/docs/mobile/ios#getting-started). If you prefer to link the library manually, please use a version from our [releases](https://github.com/stripe/stripe-ios/releases) page because we consider the master branch to be unstable.

If you're reading this on GitHub.com, please make sure you are looking at the [tagged version](https://github.com/stripe/stripe-ios/tags) that corresponds to the release you have installed. Otherwise, the instructions and example code may be mismatched with your copy. You can read the latest tagged version of this README and browse the associated code on GitHub using
[this link](https://github.com/stripe/stripe-ios/tree/v14.0.0).
[this link](https://github.com/stripe/stripe-ios/tree/v14.0.1).

## Requirements

Expand Down
2 changes: 1 addition & 1 deletion Stripe.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Stripe'
s.version = '14.0.0'
s.version = '14.0.1'
s.summary = 'Stripe is a web-based API for accepting payments online.'
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.homepage = 'https://stripe.com/docs/mobile/ios'
Expand Down
5 changes: 5 additions & 0 deletions Stripe.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2595,6 +2595,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
"zh-Hans",
de,
Expand Down Expand Up @@ -3282,13 +3283,17 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 04F39F101AEF2AFE005B926E /* StripeiOS-Debug.xcconfig */;
buildSettings = {
CURRENT_PROJECT_VERSION = 14.0.1;
MARKETING_VERSION = 14.0.1;
};
name = Debug;
};
04CDB4571A5F2E1800B854EE /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 04F39F111AEF2AFE005B926E /* StripeiOS-Release.xcconfig */;
buildSettings = {
CURRENT_PROJECT_VERSION = 14.0.1;
MARKETING_VERSION = 14.0.1;
};
name = Release;
};
Expand Down
6 changes: 3 additions & 3 deletions Stripe/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>14.0.0</string>
<string>14.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>14.0.0</string>
<string>14.0.1</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
</plist>
2 changes: 1 addition & 1 deletion Stripe/PublicHeaders/STPAPIClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
/**
The current version of this library.
*/
static NSString *const STPSDKVersion = @"14.0.0";
static NSString *const STPSDKVersion = @"14.0.1";

@class STPBankAccount, STPBankAccountParams, STPCard, STPCardParams, STPConnectAccountParams;
@class STPPaymentConfiguration, STPPaymentIntentParams, STPSourceParams, STPToken;
Expand Down
2 changes: 1 addition & 1 deletion Stripe/PublicHeaders/STPEphemeralKeyProvider.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
On your backend, you should create a new ephemeral key for the Stripe customer
associated with your user, and return the raw JSON response from the Stripe API.
For an example Ruby implementation of this API, refer to our example backend:
https://github.com/stripe/example-ios-backend/blob/v14.0.0/web.rb
https://github.com/stripe/example-ios-backend/blob/v14.0.1/web.rb

Back in your iOS app, once you have a response from this API, call the provided
completion block with the JSON response, or an error if one occurred.
Expand Down
3 changes: 2 additions & 1 deletion Stripe/STPAPIClient+Private.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ NS_ASSUME_NONNULL_BEGIN

- (NSURLSessionDataTask *)retrieveSourceWithId:(NSString *)identifier
clientSecret:(NSString *)secret
responseCompletion:(STPAPIResponseBlock)completion;
responseCompletion:(void (^)(STPSource * _Nullable, NSHTTPURLResponse * _Nullable, NSError * _Nullable))completion;


@end

Expand Down
2 changes: 1 addition & 1 deletion Stripe/STPAPIClient.m
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ - (NSURLSessionDataTask *)retrieveSourceWithId:(NSString *)identifier clientSecr
endpoint:endpoint
parameters:parameters
deserializer:[STPSource new]
completion:completion];
completion:(void (^)(STPSource * _Nullable, NSHTTPURLResponse * _Nullable, NSError * _Nullable))completion];
}

- (void)startPollingSourceWithId:(NSString *)identifier clientSecret:(NSString *)secret timeout:(NSTimeInterval)timeout completion:(STPSourceCompletionBlock)completion {
Expand Down
6 changes: 3 additions & 3 deletions docs/docs/Categories.html
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/stripe/stripe-ios/tree/v14.0.0/Stripe/PublicHeaders/StripeError.h#L157-L169">Show on GitHub</a>
<a href="https://github.com/stripe/stripe-ios/tree/v14.0.1/Stripe/PublicHeaders/StripeError.h#L157-L169">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -531,7 +531,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/stripe/stripe-ios/tree/v14.0.0/Stripe/PublicHeaders/UINavigationBar+Stripe_Theme.h#L19-L39">Show on GitHub</a>
<a href="https://github.com/stripe/stripe-ios/tree/v14.0.1/Stripe/PublicHeaders/UINavigationBar+Stripe_Theme.h#L19-L39">Show on GitHub</a>
</div>
</section>
</div>
Expand All @@ -544,7 +544,7 @@ <h4>Declaration</h4>
</article>
</div>
<section class="footer">
<p>&copy; 2018 <a class="link" href="https://stripe.com" target="_blank" rel="external">Stripe</a>. All rights reserved. (Last updated: 2018-11-14)</p>
<p>&copy; 2020 <a class="link" href="https://stripe.com" target="_blank" rel="external">Stripe</a>. All rights reserved. (Last updated: 2020-03-25)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</body>
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/Categories/NSError(Stripe).html
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ <h4>Return Value</h4>
or nil if there was no error information included in the JSON dictionary.</p>
</div>
<div class="slightly-smaller">
<a href="https://github.com/stripe/stripe-ios/tree/v14.0.0/Stripe/PublicHeaders/StripeError.h#L167">Show on GitHub</a>
<a href="https://github.com/stripe/stripe-ios/tree/v14.0.1/Stripe/PublicHeaders/StripeError.h#L167">Show on GitHub</a>
</div>
</section>
</div>
Expand All @@ -535,7 +535,7 @@ <h4>Return Value</h4>
</article>
</div>
<section class="footer">
<p>&copy; 2018 <a class="link" href="https://stripe.com" target="_blank" rel="external">Stripe</a>. All rights reserved. (Last updated: 2018-11-14)</p>
<p>&copy; 2020 <a class="link" href="https://stripe.com" target="_blank" rel="external">Stripe</a>. All rights reserved. (Last updated: 2018-03-25)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</body>
Expand Down
6 changes: 3 additions & 3 deletions docs/docs/Categories/UINavigationBar(Stripe_Theme).html
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ <h4>Parameters</h4>
</table>
</div>
<div class="slightly-smaller">
<a href="https://github.com/stripe/stripe-ios/tree/v14.0.0/Stripe/PublicHeaders/UINavigationBar+Stripe_Theme.h#L29">Show on GitHub</a>
<a href="https://github.com/stripe/stripe-ios/tree/v14.0.1/Stripe/PublicHeaders/UINavigationBar+Stripe_Theme.h#L29">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -562,7 +562,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/stripe/stripe-ios/tree/v14.0.0/Stripe/PublicHeaders/UINavigationBar+Stripe_Theme.h#L37">Show on GitHub</a>
<a href="https://github.com/stripe/stripe-ios/tree/v14.0.1/Stripe/PublicHeaders/UINavigationBar+Stripe_Theme.h#L37">Show on GitHub</a>
</div>
</section>
</div>
Expand All @@ -575,7 +575,7 @@ <h4>Declaration</h4>
</article>
</div>
<section class="footer">
<p>&copy; 2018 <a class="link" href="https://stripe.com" target="_blank" rel="external">Stripe</a>. All rights reserved. (Last updated: 2018-11-14)</p>
<p>&copy; 2018 <a class="link" href="https://stripe.com" target="_blank" rel="external">Stripe</a>. All rights reserved. (Last updated: 2020-03-25)</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</body>
Expand Down
Loading