From 05951d987400856e6c6b2dfd233d6c0930556b1f Mon Sep 17 00:00:00 2001 From: Toni Rico Date: Fri, 10 Nov 2023 18:00:14 +0100 Subject: [PATCH] Update to version 3.10.1 (#856) Update versions for 3.10.1 --------- Co-authored-by: Cirrus CI Co-authored-by: Cesar de la Vega --- .circleci/config.yml | 19 +++-------- CHANGELOG-LATEST.md | 9 ++---- CHANGELOG.md | 4 +++ VERSIONS.md | 1 + android/build.gradle | 4 +-- .../PurchasesFlutterPlugin.java | 2 +- ios/Classes/PurchasesFlutterPlugin.m | 2 +- ios/purchases_flutter.podspec | 4 +-- lib/models/entitlement_info_wrapper.g.dart | 6 ++-- lib/models/package_wrapper.g.dart | 2 +- macos/purchases_flutter.podspec | 4 +-- pubspec.yaml | 2 +- .../MagicWeather/ios/Podfile.lock | 32 +++++++++++-------- .../purchase_tester/ios/Podfile.lock | 28 ++++++++-------- 14 files changed, 58 insertions(+), 61 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d407879b4..ab94c86d2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,6 +11,7 @@ orbs: android: circleci/android@0.2.1 gcp-cli: circleci/gcp-cli@2.1.0 swissknife: roopakv/swissknife@0.65.0 + macos: circleci/macos@2.3.2 commands: @@ -71,7 +72,7 @@ commands: steps: - run: name: Download flutter SDK - command: git clone -b stable https://github.com/flutter/flutter.git flutter + command: git clone -b 2.10.5 https://github.com/flutter/flutter.git flutter - run: name: Setup environment variables command: echo 'export PATH="$PATH:`pwd`/flutter/bin"' >> $BASH_ENV @@ -157,17 +158,13 @@ jobs: ios-integration-test: description: "Run integration tests for Flutter" + resource_class: macos.x86.medium.gen2 macos: - xcode: 12.3.0 + xcode: 13.4.1 steps: - checkout - - run: - name: Open simulator - command: xcrun instruments -w "iPhone 11 Pro (14.3) [" || true + - macos/preboot-simulator - setup-flutter - - restore_cache: - name: Restore cocoapods specs and pods - key: v1-cocoapods-{{ checksum "./revenuecat_examples/purchase_tester/ios/Podfile.lock" }}-{{ arch }} - replace-api-key - build-flutter-project: project: revenuecat_examples/purchase_tester @@ -177,12 +174,6 @@ jobs: cd revenuecat_examples/purchase_tester flutter drive --target=integration_test/app_test.dart \ --driver=test_driver/integration_test.dart - - save_cache: - name: Save cocoapods specs and pods cache - key: v1-cocoapods-{{ checksum "./revenuecat_examples/purchase_tester/ios/Podfile.lock" }}-{{ arch }} - paths: - - ./revenuecat_examples/purchase_tester/ios/Pods - - ~/.cocoapods freezed: description: "Check if Freezed files need to be added to repo" diff --git a/CHANGELOG-LATEST.md b/CHANGELOG-LATEST.md index 5bb16f0cb..dae2d40d5 100644 --- a/CHANGELOG-LATEST.md +++ b/CHANGELOG-LATEST.md @@ -1,7 +1,2 @@ -## 3.10.0 - -- Add support for iOS promoted purchases (https://github.com/RevenueCat/purchases-flutter/pull/344) - New type: ReadyForPromotedProductPurchaseListener - New methods: addReadyForPromotedProductPurchaseListener(ReadyForPromotedProductPurchaseListener listener) - removeReadyForPromotedProductPurchaseListener(ReadyForPromotedProductPurchaseListener listenerToRemove) - +## 3.10.1 +- Update `purchases-ios`` to [3.14.4](https://github.com/RevenueCat/purchases-ios/releases/tag/3.14.4) diff --git a/CHANGELOG.md b/CHANGELOG.md index 629625017..664e16775 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.10.1 + +- Update `purchases-ios`` to [3.14.4](https://github.com/RevenueCat/purchases-ios/releases/tag/3.14.4) + ## 3.10.0 - Add support for iOS promoted purchases (https://github.com/RevenueCat/purchases-flutter/pull/344) diff --git a/VERSIONS.md b/VERSIONS.md index 7e44ce7d0..0b0a0aaa6 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -1,5 +1,6 @@ | Version | iOS version | Android version | Common files version | |---------|-------------|-----------------|----------------------| +| 3.10.1 | 3.14.4 | 4.6.1 | 1.11.3 | | 3.10.0 | 3.13.2 | 4.6.1 | 1.11.2 | | 3.9.5 | 3.13.2 | 4.6.1 | 1.11.2 | | 3.9.4 | 3.13.2 | 4.6.1 | 1.11.2 | diff --git a/android/build.gradle b/android/build.gradle index a9ac74086..ad931d7ee 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ group 'com.revenuecat.purchases_flutter' -version '3.10.0' +version '3.10.1' buildscript { ext.kotlin_version = '1.3.72' @@ -48,5 +48,5 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "com.revenuecat.purchases:purchases-hybrid-common:1.11.2" + implementation "com.revenuecat.purchases:purchases-hybrid-common:1.11.3" } diff --git a/android/src/main/java/com/revenuecat/purchases_flutter/PurchasesFlutterPlugin.java b/android/src/main/java/com/revenuecat/purchases_flutter/PurchasesFlutterPlugin.java index e8c2f8ef1..b97f8e626 100644 --- a/android/src/main/java/com/revenuecat/purchases_flutter/PurchasesFlutterPlugin.java +++ b/android/src/main/java/com/revenuecat/purchases_flutter/PurchasesFlutterPlugin.java @@ -52,7 +52,7 @@ public class PurchasesFlutterPlugin implements FlutterPlugin, MethodCallHandler, @Nullable private Activity activity; private static final String PLATFORM_NAME = "flutter"; - private static final String PLUGIN_VERSION = "3.10.0"; + private static final String PLUGIN_VERSION = "3.10.1"; /** * Plugin registration. diff --git a/ios/Classes/PurchasesFlutterPlugin.m b/ios/Classes/PurchasesFlutterPlugin.m index 3177317f2..2c442fccc 100644 --- a/ios/Classes/PurchasesFlutterPlugin.m +++ b/ios/Classes/PurchasesFlutterPlugin.m @@ -536,7 +536,7 @@ - (NSString *)platformFlavor { } - (NSString *)platformFlavorVersion { - return @"3.10.0"; + return @"3.10.1"; } @end diff --git a/ios/purchases_flutter.podspec b/ios/purchases_flutter.podspec index 8e1914ca3..5a90a2b45 100644 --- a/ios/purchases_flutter.podspec +++ b/ios/purchases_flutter.podspec @@ -3,7 +3,7 @@ # Pod::Spec.new do |s| s.name = 'purchases_flutter' - s.version = '3.10.0' + s.version = '3.10.1' s.summary = 'Cross-platform subscriptions framework for Flutter.' s.description = <<-DESC Client for the RevenueCat subscription and purchase tracking system, making implementing in-app subscriptions in Flutter easy - receipt validation and status tracking included! @@ -15,7 +15,7 @@ Pod::Spec.new do |s| s.source_files = 'Classes/**/*' s.public_header_files = 'Classes/**/*.h' s.dependency 'Flutter' - s.dependency 'PurchasesHybridCommon', '1.11.2' + s.dependency 'PurchasesHybridCommon', '1.11.3' s.ios.deployment_target = '9.0' s.swift_version = '5.0' diff --git a/lib/models/entitlement_info_wrapper.g.dart b/lib/models/entitlement_info_wrapper.g.dart index acb28bff7..85ff2965f 100644 --- a/lib/models/entitlement_info_wrapper.g.dart +++ b/lib/models/entitlement_info_wrapper.g.dart @@ -38,9 +38,9 @@ Map _$$_EntitlementInfoToJson(_$_EntitlementInfo instance) => 'originalPurchaseDate': instance.originalPurchaseDate, 'productIdentifier': instance.productIdentifier, 'isSandbox': instance.isSandbox, - 'ownershipType': _$OwnershipTypeEnumMap[instance.ownershipType], - 'store': _$StoreEnumMap[instance.store], - 'periodType': _$PeriodTypeEnumMap[instance.periodType], + 'ownershipType': _$OwnershipTypeEnumMap[instance.ownershipType]!, + 'store': _$StoreEnumMap[instance.store]!, + 'periodType': _$PeriodTypeEnumMap[instance.periodType]!, 'expirationDate': instance.expirationDate, 'unsubscribeDetectedAt': instance.unsubscribeDetectedAt, 'billingIssueDetectedAt': instance.billingIssueDetectedAt, diff --git a/lib/models/package_wrapper.g.dart b/lib/models/package_wrapper.g.dart index c44b96252..e7dfea95a 100644 --- a/lib/models/package_wrapper.g.dart +++ b/lib/models/package_wrapper.g.dart @@ -17,7 +17,7 @@ _$_Package _$$_PackageFromJson(Map json) => _$_Package( Map _$$_PackageToJson(_$_Package instance) => { 'identifier': instance.identifier, - 'packageType': _$PackageTypeEnumMap[instance.packageType], + 'packageType': _$PackageTypeEnumMap[instance.packageType]!, 'product': instance.product.toJson(), 'offeringIdentifier': instance.offeringIdentifier, }; diff --git a/macos/purchases_flutter.podspec b/macos/purchases_flutter.podspec index 731273d38..2854c1750 100644 --- a/macos/purchases_flutter.podspec +++ b/macos/purchases_flutter.podspec @@ -4,7 +4,7 @@ # Pod::Spec.new do |s| s.name = 'purchases_flutter' - s.version = '3.10.0' + s.version = '3.10.1' s.summary = 'Cross-platform subscriptions framework for Flutter.' s.description = <<-DESC Client for the RevenueCat subscription and purchase tracking system, making implementing in-app subscriptions in Flutter easy - receipt validation and status tracking included! @@ -16,7 +16,7 @@ Pod::Spec.new do |s| s.source_files = 'Classes/**/*' s.public_header_files = 'Classes/**/*.h' s.dependency 'FlutterMacOS' - s.dependency 'PurchasesHybridCommon', '1.11.2' + s.dependency 'PurchasesHybridCommon', '1.11.3' s.platform = :osx, '10.12' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } s.swift_version = '5.0' diff --git a/pubspec.yaml b/pubspec.yaml index 970f08219..da2684d8c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: purchases_flutter description: A Flutter plugin that makes it simple to add and manage in-app purchases (IAP) and subscriptions. Supports Android, iOS, macOS, iPadOS, and watchOS. -version: 3.10.0 +version: 3.10.1 homepage: https://www.revenuecat.com/ repository: https://github.com/RevenueCat/purchases-flutter issue_tracker: https://github.com/RevenueCat/purchases-flutter/issues diff --git a/revenuecat_examples/MagicWeather/ios/Podfile.lock b/revenuecat_examples/MagicWeather/ios/Podfile.lock index 09f4daee2..b4544beee 100644 --- a/revenuecat_examples/MagicWeather/ios/Podfile.lock +++ b/revenuecat_examples/MagicWeather/ios/Podfile.lock @@ -1,16 +1,19 @@ PODS: - Flutter (1.0.0) - - Purchases (3.13.2): - - PurchasesCoreSwift (= 3.13.2) - - purchases_flutter (3.9.4): + - modal_progress_hud_nsn (0.4.0): - Flutter - - PurchasesHybridCommon (= 1.11.2) - - PurchasesCoreSwift (3.13.2) - - PurchasesHybridCommon (1.11.2): - - Purchases (= 3.13.2) + - Purchases (3.14.4): + - PurchasesCoreSwift (= 3.14.4) + - purchases_flutter (3.10.1): + - Flutter + - PurchasesHybridCommon (= 1.11.3) + - PurchasesCoreSwift (3.14.4) + - PurchasesHybridCommon (1.11.3): + - Purchases (= 3.14.4) DEPENDENCIES: - Flutter (from `Flutter`) + - modal_progress_hud_nsn (from `.symlinks/plugins/modal_progress_hud_nsn/ios`) - purchases_flutter (from `.symlinks/plugins/purchases_flutter/ios`) SPEC REPOS: @@ -22,16 +25,19 @@ SPEC REPOS: EXTERNAL SOURCES: Flutter: :path: Flutter + modal_progress_hud_nsn: + :path: ".symlinks/plugins/modal_progress_hud_nsn/ios" purchases_flutter: :path: ".symlinks/plugins/purchases_flutter/ios" SPEC CHECKSUMS: - Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a - Purchases: 03200de9288724e77de435000d1828601e6b8e00 - purchases_flutter: 3b13af6f0fbb20ebc62d5e41943aa1a17ec723ab - PurchasesCoreSwift: 2ea4b33e5cece5c8a0751594ef7c6cbfcbd747a9 - PurchasesHybridCommon: 56ef42d85c3e930d49aff4ac5fa027373d2e1bb8 + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + modal_progress_hud_nsn: b66f99f02da7de83484e50dfe1fe2d71ac406e67 + Purchases: 2c326c3a0a93445db8fe194d4938fc001e2cec1c + purchases_flutter: f852442fdcf094f8ee59a2b48093f381bf1670d4 + PurchasesCoreSwift: 00f41d415f3fb701a5c4bc9909bcbbcf1b1c4b05 + PurchasesHybridCommon: fba010c170935716725ffedcb72ba70a457d259c PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa -COCOAPODS: 1.11.2 +COCOAPODS: 1.13.0 diff --git a/revenuecat_examples/purchase_tester/ios/Podfile.lock b/revenuecat_examples/purchase_tester/ios/Podfile.lock index cfe7c45f4..69d856868 100644 --- a/revenuecat_examples/purchase_tester/ios/Podfile.lock +++ b/revenuecat_examples/purchase_tester/ios/Podfile.lock @@ -2,14 +2,14 @@ PODS: - Flutter (1.0.0) - integration_test (0.0.1): - Flutter - - Purchases (3.13.2): - - PurchasesCoreSwift (= 3.13.2) - - purchases_flutter (3.9.1): + - Purchases (3.14.4): + - PurchasesCoreSwift (= 3.14.4) + - purchases_flutter (3.10.1): - Flutter - - PurchasesHybridCommon (= 1.11.2) - - PurchasesCoreSwift (3.13.2) - - PurchasesHybridCommon (1.11.2): - - Purchases (= 3.13.2) + - PurchasesHybridCommon (= 1.11.3) + - PurchasesCoreSwift (3.14.4) + - PurchasesHybridCommon (1.11.3): + - Purchases (= 3.14.4) DEPENDENCIES: - Flutter (from `Flutter`) @@ -31,13 +31,13 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/purchases_flutter/ios" SPEC CHECKSUMS: - Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a - integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5 - Purchases: 03200de9288724e77de435000d1828601e6b8e00 - purchases_flutter: 513e990912ff636879bc414dc01071bf21c01eca - PurchasesCoreSwift: 2ea4b33e5cece5c8a0751594ef7c6cbfcbd747a9 - PurchasesHybridCommon: 56ef42d85c3e930d49aff4ac5fa027373d2e1bb8 + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + integration_test: 13825b8a9334a850581300559b8839134b124670 + Purchases: 2c326c3a0a93445db8fe194d4938fc001e2cec1c + purchases_flutter: f852442fdcf094f8ee59a2b48093f381bf1670d4 + PurchasesCoreSwift: 00f41d415f3fb701a5c4bc9909bcbbcf1b1c4b05 + PurchasesHybridCommon: fba010c170935716725ffedcb72ba70a457d259c PODFILE CHECKSUM: 1fdb55652a099787cebcdf2ff01f755f75ce17b9 -COCOAPODS: 1.11.2 +COCOAPODS: 1.13.0