Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

[various] Update to use sharedDarwinSource #7027

Merged
merged 3 commits into from
Jan 31, 2023
Merged

[various] Update to use sharedDarwinSource #7027

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98f53d9
Update shared_preferences
stuartmorgan Jan 25, 2023
b8d4f42
Update IAP
stuartmorgan Jan 25, 2023
9745c38
Merge branch 'main' into shared-darwin-updates
stuartmorgan Jan 31, 2023
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
5 changes: 3 additions & 2 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,5 +1,6 @@
## NEXT
## 0.3.4+2

* Uses the new `sharedDarwinSource` flag when available.
* Updates minimum Flutter version to 3.0.

## 0.3.4+1
Expand All @@ -12,7 +13,7 @@

## 0.3.3

* Supports adding discount information to AppStorePurchaseParam.
* Supports adding discount information to AppStorePurchaseParam.
* Fixes iOS Promotional Offers bug which prevents them from working.

## 0.3.2+2
Expand Down
0 ...ekit/shared/Classes/FIAObjectTranslator.h → ...ekit/darwin/Classes/FIAObjectTranslator.h
View file
Open in desktop
File renamed without changes.
0 ...ekit/shared/Classes/FIAObjectTranslator.m → ...ekit/darwin/Classes/FIAObjectTranslator.m
View file
Open in desktop
File renamed without changes.
0 ...shared/Classes/FIAPPaymentQueueDelegate.h → ...darwin/Classes/FIAPPaymentQueueDelegate.h
View file
Open in desktop
File renamed without changes.
0 ...shared/Classes/FIAPPaymentQueueDelegate.m → ...darwin/Classes/FIAPPaymentQueueDelegate.m
View file
Open in desktop
File renamed without changes.
0 ...rekit/shared/Classes/FIAPReceiptManager.h → ...rekit/darwin/Classes/FIAPReceiptManager.h
View file
Open in desktop
File renamed without changes.
0 ...rekit/shared/Classes/FIAPReceiptManager.m → ...rekit/darwin/Classes/FIAPReceiptManager.m
View file
Open in desktop
File renamed without changes.
0 ...rekit/shared/Classes/FIAPRequestHandler.h → ...rekit/darwin/Classes/FIAPRequestHandler.h
View file
Open in desktop
File renamed without changes.
0 ...rekit/shared/Classes/FIAPRequestHandler.m → ...rekit/darwin/Classes/FIAPRequestHandler.m
View file
Open in desktop
File renamed without changes.
0 ...t/shared/Classes/FIAPaymentQueueHandler.h → ...t/darwin/Classes/FIAPaymentQueueHandler.h
View file
Open in desktop
File renamed without changes.
0 ...t/shared/Classes/FIAPaymentQueueHandler.m → ...t/darwin/Classes/FIAPaymentQueueHandler.m
View file
Open in desktop
File renamed without changes.
0 ...ekit/shared/Classes/FIATransactionCache.h → ...ekit/darwin/Classes/FIATransactionCache.h
View file
Open in desktop
File renamed without changes.
0 ...ekit/shared/Classes/FIATransactionCache.m → ...ekit/darwin/Classes/FIATransactionCache.m
View file
Open in desktop
File renamed without changes.
0 ...ekit/shared/Classes/InAppPurchasePlugin.h → ...ekit/darwin/Classes/InAppPurchasePlugin.h
View file
Open in desktop
File renamed without changes.
0 ...ekit/shared/Classes/InAppPurchasePlugin.m → ...ekit/darwin/Classes/InAppPurchasePlugin.m
View file
Open in desktop
File renamed without changes.
0 ...t/shared/in_app_purchase_storekit.podspec → ...t/darwin/in_app_purchase_storekit.podspec
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/ios/Assets/.gitkeep
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/ios/Classes/FIAObjectTranslator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAObjectTranslator.h
../../darwin/Classes/FIAObjectTranslator.h
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/ios/Classes/FIAObjectTranslator.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAObjectTranslator.m
../../darwin/Classes/FIAObjectTranslator.m
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/ios/Classes/FIAPPaymentQueueDelegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAPPaymentQueueDelegate.h
../../darwin/Classes/FIAPPaymentQueueDelegate.h
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/ios/Classes/FIAPPaymentQueueDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAPPaymentQueueDelegate.m
../../darwin/Classes/FIAPPaymentQueueDelegate.m
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/ios/Classes/FIAPReceiptManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAPReceiptManager.h
../../darwin/Classes/FIAPReceiptManager.h
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/ios/Classes/FIAPReceiptManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAPReceiptManager.m
../../darwin/Classes/FIAPReceiptManager.m
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/ios/Classes/FIAPRequestHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAPRequestHandler.h
../../darwin/Classes/FIAPRequestHandler.h
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/ios/Classes/FIAPRequestHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAPRequestHandler.m
../../darwin/Classes/FIAPRequestHandler.m
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/ios/Classes/FIAPaymentQueueHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAPaymentQueueHandler.h
../../darwin/Classes/FIAPaymentQueueHandler.h
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/ios/Classes/FIAPaymentQueueHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAPaymentQueueHandler.m
../../darwin/Classes/FIAPaymentQueueHandler.m
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/ios/Classes/FIATransactionCache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIATransactionCache.h
../../darwin/Classes/FIATransactionCache.h
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/ios/Classes/FIATransactionCache.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIATransactionCache.m
../../darwin/Classes/FIATransactionCache.m
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/ios/Classes/InAppPurchasePlugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/InAppPurchasePlugin.h
../../darwin/Classes/InAppPurchasePlugin.h
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/ios/Classes/InAppPurchasePlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/InAppPurchasePlugin.m
../../darwin/Classes/InAppPurchasePlugin.m
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/ios/in_app_purchase_storekit.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../shared/in_app_purchase_storekit.podspec
../darwin/in_app_purchase_storekit.podspec
1 change: 0 additions & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/macos/Assets/.gitkeep
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/macos/Classes/FIAObjectTranslator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAObjectTranslator.h
../../darwin/Classes/FIAObjectTranslator.h
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/macos/Classes/FIAObjectTranslator.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAObjectTranslator.m
../../darwin/Classes/FIAObjectTranslator.m
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/macos/Classes/FIAPPaymentQueueDelegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAPPaymentQueueDelegate.h
../../darwin/Classes/FIAPPaymentQueueDelegate.h
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/macos/Classes/FIAPPaymentQueueDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAPPaymentQueueDelegate.m
../../darwin/Classes/FIAPPaymentQueueDelegate.m
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/macos/Classes/FIAPReceiptManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAPReceiptManager.h
../../darwin/Classes/FIAPReceiptManager.h
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/macos/Classes/FIAPReceiptManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAPReceiptManager.m
../../darwin/Classes/FIAPReceiptManager.m
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/macos/Classes/FIAPRequestHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAPRequestHandler.h
../../darwin/Classes/FIAPRequestHandler.h
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/macos/Classes/FIAPRequestHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAPRequestHandler.m
../../darwin/Classes/FIAPRequestHandler.m
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/macos/Classes/FIAPaymentQueueHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAPaymentQueueHandler.h
../../darwin/Classes/FIAPaymentQueueHandler.h
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/macos/Classes/FIAPaymentQueueHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIAPaymentQueueHandler.m
../../darwin/Classes/FIAPaymentQueueHandler.m
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/macos/Classes/FIATransactionCache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIATransactionCache.h
../../darwin/Classes/FIATransactionCache.h
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/macos/Classes/FIATransactionCache.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/FIATransactionCache.m
../../darwin/Classes/FIATransactionCache.m
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/macos/Classes/InAppPurchasePlugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/InAppPurchasePlugin.h
../../darwin/Classes/InAppPurchasePlugin.h
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/macos/Classes/InAppPurchasePlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../shared/Classes/InAppPurchasePlugin.m
../../darwin/Classes/InAppPurchasePlugin.m
2 changes: 1 addition & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/macos/in_app_purchase_storekit.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../shared/in_app_purchase_storekit.podspec
../darwin/in_app_purchase_storekit.podspec
4 changes: 3 additions & 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/plugins/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.4+1
version: 0.3.4+2

environment:
sdk: ">=2.14.0 <3.0.0"
Expand All @@ -14,8 +14,10 @@ flutter:
platforms:
ios:
pluginClass: InAppPurchasePlugin
sharedDarwinSource: true
macos:
pluginClass: InAppPurchasePlugin
sharedDarwinSource: true

dependencies:
collection: ^1.15.0
Expand Down
Empty file removed packages/in_app_purchase/in_app_purchase_storekit/shared/Assets/.gitkeep
View file
Open in desktop
Empty file.
3 changes: 2 additions & 1 deletion packages/shared_preferences/shared_preferences_foundation/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## NEXT
## 2.1.3

* Uses the new `sharedDarwinSource` flag when available.
* Updates minimum Flutter version to 3.0.

## 2.1.2
Expand Down
6 changes: 3 additions & 3 deletions packages/shared_preferences/shared_preferences_foundation/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: shared_preferences_foundation
description: iOS and macOS implementation of the shared_preferences plugin.
repository: https://github.com/flutter/plugins/tree/main/packages/shared_preferences/shared_preferences_foundation
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+shared_preferences%22
version: 2.1.2
version: 2.1.3

environment:
sdk: ">=2.12.0 <3.0.0"
Expand All @@ -12,14 +12,14 @@ flutter:
plugin:
implements: shared_preferences
platforms:
# TODO(stuartmorgan): Add sharedDarwinSource to these once
# https://github.com/flutter/flutter/pull/115337 lands.
ios:
pluginClass: SharedPreferencesPlugin
dartPluginClass: SharedPreferencesFoundation
sharedDarwinSource: true
macos:
pluginClass: SharedPreferencesPlugin
dartPluginClass: SharedPreferencesFoundation
sharedDarwinSource: true

dependencies:
flutter:
Expand Down