Merge branch 'main' into manual-roll-824868f5d1e6

Author: stuartmorgan-g

packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md

@@ -1,5 +1,6 @@
-## NEXT
+## 2.15.3
 
+* Fixes new analysis warnings.
 * Updates minimum supported SDK version to Flutter 3.27/Dart 3.6.
 
 ## 2.15.2

packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMImageUtils.h

@@ -9,8 +9,9 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /// Creates a UIImage from Pigeon bitmap.
-UIImage *FGMIconFromBitmap(FGMPlatformBitmap *platformBitmap,
-                           NSObject<FlutterPluginRegistrar> *registrar, CGFloat screenScale);
+UIImage *_Nullable FGMIconFromBitmap(FGMPlatformBitmap *platformBitmap,
+                                     NSObject<FlutterPluginRegistrar> *registrar,
+                                     CGFloat screenScale);
 /// Returns a BOOL indicating whether image is considered scalable with the given scale factor from
 /// size.
 BOOL FGMIsScalableWithScaleFactorFromSize(CGSize originalSize, CGSize targetSize);

packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMImageUtils.m

@@ -191,18 +191,18 @@
 
 UIImage *scaledImageWithWidthHeight(UIImage *image, NSNumber *width, NSNumber *height,
                                     CGFloat screenScale) {
-  if (!width && !height) {
+  if ((width == nil) && (height == nil)) {
     return image;
   }
 
-  CGFloat targetWidth = width ? width.doubleValue : image.size.width;
-  CGFloat targetHeight = height ? height.doubleValue : image.size.height;
+  CGFloat targetWidth = width == nil ? image.size.width : width.doubleValue;
+  CGFloat targetHeight = height == nil ? image.size.height : height.doubleValue;
 
-  if (width && !height) {
+  if ((width != nil) && (height == nil)) {
     // Calculate height based on aspect ratio if only width is provided.
     double aspectRatio = image.size.height / image.size.width;
     targetHeight = round(targetWidth * aspectRatio);
-  } else if (!width && height) {
+  } else if ((width == nil) && (height != nil)) {
     // Calculate width based on aspect ratio if only height is provided.
     double aspectRatio = image.size.width / image.size.height;
     targetWidth = round(targetHeight * aspectRatio);

packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapController.m

@@ -436,19 +436,19 @@ - (void)interpretMapConfiguration:(FGMPlatformMapConfiguration *)config {
                                     : nil];
   }
   NSNumber *compassEnabled = config.compassEnabled;
-  if (compassEnabled) {
+  if (compassEnabled != nil) {
     [self setCompassEnabled:compassEnabled.boolValue];
   }
   NSNumber *indoorEnabled = config.indoorViewEnabled;
-  if (indoorEnabled) {
+  if (indoorEnabled != nil) {
     [self setIndoorEnabled:indoorEnabled.boolValue];
   }
   NSNumber *trafficEnabled = config.trafficEnabled;
-  if (trafficEnabled) {
+  if (trafficEnabled != nil) {
     [self setTrafficEnabled:trafficEnabled.boolValue];
   }
   NSNumber *buildingsEnabled = config.buildingsEnabled;
-  if (buildingsEnabled) {
+  if (buildingsEnabled != nil) {
     [self setBuildingsEnabled:buildingsEnabled.boolValue];
   }
   FGMPlatformMapTypeBox *mapType = config.mapType;
@@ -457,8 +457,8 @@ - (void)interpretMapConfiguration:(FGMPlatformMapConfiguration *)config {
   }
   FGMPlatformZoomRange *zoomData = config.minMaxZoomPreference;
   if (zoomData) {
-    float minZoom = zoomData.min ? zoomData.min.floatValue : kGMSMinZoomLevel;
-    float maxZoom = zoomData.max ? zoomData.max.floatValue : kGMSMaxZoomLevel;
+    float minZoom = zoomData.min != nil ? zoomData.min.floatValue : kGMSMinZoomLevel;
+    float maxZoom = zoomData.max != nil ? zoomData.max.floatValue : kGMSMaxZoomLevel;
     [self setMinZoom:minZoom maxZoom:maxZoom];
   }
   FGMPlatformEdgeInsets *padding = config.padding;
@@ -467,31 +467,31 @@ - (void)interpretMapConfiguration:(FGMPlatformMapConfiguration *)config {
   }
 
   NSNumber *rotateGesturesEnabled = config.rotateGesturesEnabled;
-  if (rotateGesturesEnabled) {
+  if (rotateGesturesEnabled != nil) {
     [self setRotateGesturesEnabled:rotateGesturesEnabled.boolValue];
   }
   NSNumber *scrollGesturesEnabled = config.scrollGesturesEnabled;
-  if (scrollGesturesEnabled) {
+  if (scrollGesturesEnabled != nil) {
     [self setScrollGesturesEnabled:scrollGesturesEnabled.boolValue];
   }
   NSNumber *tiltGesturesEnabled = config.tiltGesturesEnabled;
-  if (tiltGesturesEnabled) {
+  if (tiltGesturesEnabled != nil) {
     [self setTiltGesturesEnabled:tiltGesturesEnabled.boolValue];
   }
   NSNumber *trackCameraPosition = config.trackCameraPosition;
-  if (trackCameraPosition) {
+  if (trackCameraPosition != nil) {
     [self setTrackCameraPosition:trackCameraPosition.boolValue];
   }
   NSNumber *zoomGesturesEnabled = config.zoomGesturesEnabled;
-  if (zoomGesturesEnabled) {
+  if (zoomGesturesEnabled != nil) {
     [self setZoomGesturesEnabled:zoomGesturesEnabled.boolValue];
   }
   NSNumber *myLocationEnabled = config.myLocationEnabled;
-  if (myLocationEnabled) {
+  if (myLocationEnabled != nil) {
     [self setMyLocationEnabled:myLocationEnabled.boolValue];
   }
   NSNumber *myLocationButtonEnabled = config.myLocationButtonEnabled;
-  if (myLocationButtonEnabled) {
+  if (myLocationButtonEnabled != nil) {
     [self setMyLocationButtonEnabled:myLocationButtonEnabled.boolValue];
   }
   NSString *style = config.style;
@@ -665,7 +665,8 @@ - (void)animateCameraWithUpdate:(nonnull FGMPlatformCameraUpdate *)cameraUpdate
                                  details:nil];
     return;
   }
-  FGMCATransactionWrapper *transaction = durationMilliseconds ? self.transactionWrapper : nil;
+  FGMCATransactionWrapper *transaction =
+      durationMilliseconds != nil ? self.transactionWrapper : nil;
   [transaction begin];
   [transaction setAnimationDuration:[durationMilliseconds doubleValue] / 1000];
   [self.controller.mapView animateWithCameraUpdate:update];

packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml

@@ -2,7 +2,7 @@ name: google_maps_flutter_ios
 description: iOS implementation of the google_maps_flutter plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
-version: 2.15.2
+version: 2.15.3
 
 environment:
   sdk: ^3.6.0

packages/in_app_purchase/in_app_purchase_storekit/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.2
+
+* Add [jwsRepresentation](https://developer.apple.com/documentation/storekit/verificationresult/jwsrepresentation-21vgo) to `SK2PurchaseDetails` as `serverVerificationData` for secure server-side purchase verification. Use this JSON Web Signature (JWS) value to perform your own JWS verification on your server.
+* Add [jsonRepresentation](https://developer.apple.com/documentation/storekit/transaction/jsonrepresentation) to `SK2PurchaseDetails` as `localVerificationData` for local transaction debugging and verification.
+
 ## 0.4.1
 
 * Updates minimum supported SDK version to Flutter 3.27/Dart 3.6.

packages/in_app_purchase/in_app_purchase_storekit/darwin/in_app_purchase_storekit/Sources/in_app_purchase_storekit/StoreKit2/InAppPurchasePlugin+StoreKit2.swift

@@ -88,7 +88,8 @@ extension InAppPurchasePlugin: InAppPurchase2API {
         case .success(let verification):
           switch verification {
           case .verified(let transaction):
-            self.sendTransactionUpdate(transaction: transaction)
+            self.sendTransactionUpdate(
+              transaction: transaction, receipt: verification.jwsRepresentation)
             completion(.success(result.convertToPigeon()))
           case .unverified(_, let error):
             completion(.failure(error))
@@ -284,7 +285,8 @@ extension InAppPurchasePlugin: InAppPurchase2API {
         for await verificationResult in Transaction.updates {
           switch verificationResult {
           case .verified(let transaction):
-            self?.sendTransactionUpdate(transaction: transaction)
+            self?.sendTransactionUpdate(
+              transaction: transaction, receipt: verificationResult.jwsRepresentation)
           case .unverified:
             break
           }

packages/in_app_purchase/in_app_purchase_storekit/lib/src/store_kit_2_wrappers/sk2_transaction_wrapper.dart

@@ -121,7 +121,10 @@ extension on SK2TransactionMessage {
       // receipt isn’t necessary with SK2 as a Transaction can only be returned
       // from validated purchases.
       verificationData: PurchaseVerificationData(
-          localVerificationData: '', serverVerificationData: '', source: ''),
+          localVerificationData: jsonRepresentation ?? '',
+          // receiptData is the JWS representation of the transaction
+          serverVerificationData: receiptData ?? '',
+          source: kIAPSource),
       transactionDate: purchaseDate,
       // Note that with SK2, any transactions that *can* be returned will
       // require to be finished, and are already purchased.

packages/in_app_purchase/in_app_purchase_storekit/pubspec.yaml

@@ -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.4.1
+version: 0.4.2
 
 environment:
   sdk: ^3.6.0

packages/in_app_purchase/in_app_purchase_storekit/test/fakes/fake_storekit_platform.dart

@@ -442,5 +442,7 @@ SK2TransactionMessage createPendingTransaction(String id, {int quantity = 1}) {
       originalId: 2,
       productId: id,
       purchaseDate: 'purchaseDate',
-      appAccountToken: 'appAccountToken');
+      appAccountToken: 'appAccountToken',
+      receiptData: 'receiptData',
+      jsonRepresentation: 'jsonRepresentation');
 }