Skip to content

[in_app_purchase] fix skerror nullability #6139

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.

Sign up for GitHub

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

Merged
auto-submit merged 4 commits into from
Feb 16, 2024
Merged

[in_app_purchase] fix skerror nullability #6139

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5343031
fix skerror nullability
LouiseHsu Feb 15, 2024
e61c1f0
versioning
LouiseHsu Feb 15, 2024
280cfdd
undo public field change
LouiseHsu Feb 15, 2024
7b853f0
test
LouiseHsu Feb 15, 2024
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
4 changes: 4 additions & 0 deletions packages/in_app_purchase/in_app_purchase_storekit/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.3.10+1
Copy link
Member

@gaaclarke gaaclarke Feb 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be 0.3.11. The +N is reserved for changes that don't change the behavior.


* Fixes issue with SKError not being nullable

## 0.3.10

* Converts `startProductRequest()`, `finishTransaction()`, `restoreTransactions()`, `presentCodeRedemptionSheet()` to pigeon.
Expand Down
4 changes: 2 additions & 2 deletions packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/messages.g.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,10 @@ typedef NS_ENUM(NSUInteger, SKSubscriptionPeriodUnitMessage) {
- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)makeWithCode:(NSInteger)code
domain:(NSString *)domain
userInfo:(NSDictionary<NSString *, id> *)userInfo;
userInfo:(nullable NSDictionary<NSString *, id> *)userInfo;
@property(nonatomic, assign) NSInteger code;
@property(nonatomic, copy) NSString *domain;
@property(nonatomic, copy) NSDictionary<NSString *, id> *userInfo;
@property(nonatomic, copy, nullable) NSDictionary<NSString *, id> *userInfo;
@end

@interface SKPaymentDiscountMessage : NSObject
Expand Down
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/messages.g.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ - (NSArray *)toList {
@implementation SKErrorMessage
+ (instancetype)makeWithCode:(NSInteger)code
domain:(NSString *)domain
userInfo:(NSDictionary<NSString *, id> *)userInfo {
userInfo:(nullable NSDictionary<NSString *, id> *)userInfo {
SKErrorMessage *pigeonResult = [[SKErrorMessage alloc] init];
pigeonResult.code = code;
pigeonResult.domain = domain;
Expand Down
6 changes: 3 additions & 3 deletions packages/in_app_purchase/in_app_purchase_storekit/lib/src/messages.g.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,14 +195,14 @@ class SKErrorMessage {
SKErrorMessage({
required this.code,
required this.domain,
required this.userInfo,
this.userInfo,
});

int code;

String domain;

Map<String?, Object?> userInfo;
Map<String?, Object?>? userInfo;

Object encode() {
return <Object?>[
Expand All @@ -217,7 +217,7 @@ class SKErrorMessage {
return SKErrorMessage(
code: result[0]! as int,
domain: result[1]! as String,
userInfo: (result[2] as Map<Object?, Object?>?)!.cast<String?, Object?>(),
userInfo: (result[2] as Map<Object?, Object?>?)?.cast<String?, Object?>(),
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...urchase/in_app_purchase_storekit/lib/src/store_kit_wrappers/sk_payment_queue_wrapper.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ class SKError {
///
/// Any key of the map must be a valid [NSErrorUserInfoKey](https://developer.apple.com/documentation/foundation/nserroruserinfokey?language=objc).
@JsonKey(defaultValue: <String, dynamic>{})
final Map<String?, Object?> userInfo;
final Map<String?, Object?>? userInfo;

@override
bool operator ==(Object other) {
Expand Down
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/pigeons/messages.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class SKErrorMessage {

final int code;
final String domain;
final Map<String?, Object?> userInfo;
final Map<String?, Object?>? userInfo;
}

class SKPaymentDiscountMessage {
Expand Down
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: in_app_purchase_storekit
description: An implementation for the iOS and macOS platforms of the Flutter `in_app_purchase` plugin. This uses the StoreKit Framework.
repository: https://github.com/flutter/packages/tree/main/packages/in_app_purchase/in_app_purchase_storekit
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22
version: 0.3.10
version: 0.3.10+1
Copy link
Member

@gaaclarke gaaclarke Feb 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.


environment:
sdk: ^3.2.3
Expand Down