Release/3.2.0 (#184)

* fix package name for MagicWeather for Android

* updated version number to 3.2.0

* moved: added readme to example, renamed legacy_example -> purchase_tester, moved examples to revenuecat_examples

* updated pubspec dependencies path

* moved m4trixdevlimited -> com.revenuecat. updated readme

* updated MagicWeather for android app name - com.revenuecat.purchases_sample

* added step to also install Flutter dependencies in purchase_tester

* purchases-flutter -> purchases_flutter in examples/README.d

.circleci/config.yml

@@ -16,7 +16,7 @@ commands:
   replace-api-key:
     description: "replace API_KEY"
     steps:
-      - run: sed -i.bck s/api_key/$API_KEY/ example/integration_test/app_test.dart
+      - run: sed -i.bck s/api_key/$API_KEY/ revenuecat_examples/purchase_tester/integration_test/app_test.dart
 
   flutter-get-dependencies:
     description: "Install dependencies"
@@ -87,7 +87,9 @@ jobs:
       - checkout
       - build-flutter-project
       - flutter-get-dependencies:
-          project: Examples/MagicWeather
+          project: revenuecat_examples/MagicWeather
+      - flutter-get-dependencies:
+          project: revenuecat_examples/purchase_tester
       - run:
           name: Analyze code
           command: flutter analyze lib
@@ -111,7 +113,7 @@ jobs:
       - checkout
       - replace-api-key
       - run:
-          working_directory: example/android
+          working_directory: revenuecat_examples/purchase_tester/android
           command: |
             # flutter build generates files in android/ for building the app
             flutter build apk
@@ -120,8 +122,8 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-            - example/build/app/outputs/apk/debug/app-debug.apk
-            - example/build/app/outputs/apk/androidTest/debug/app-debug-androidTest.apk
+            - revenuecat_examples/purchase_tester/build/app/outputs/apk/debug/app-debug.apk
+            - revenuecat_examples/purchase_tester/build/app/outputs/apk/androidTest/debug/app-debug-androidTest.apk
 
   run-firebase-tests:
     description: "Run integration tests for Flutter"
@@ -138,8 +140,8 @@ jobs:
           name: Test with Firebase Test Lab
           command: >
             gcloud firebase test android run --type instrumentation \
-              --app example/build/app/outputs/apk/debug/app-debug.apk \
-              --test example/build/app/outputs/apk/androidTest/debug/app-debug-androidTest.apk \
+              --app revenuecat_examples/purchase_tester/build/app/outputs/apk/debug/app-debug.apk \
+              --test revenuecat_examples/purchase_tester/build/app/outputs/apk/androidTest/debug/app-debug-androidTest.apk \
               --timeout 2m \
               --results-bucket cloud-test-${GOOGLE_PROJECT_ID}
       - run:
@@ -164,21 +166,21 @@ jobs:
       - setup-flutter
       - restore_cache:
           name: Restore cocoapods specs and pods
-          key: v1-cocoapods-{{ checksum "./example/ios/Podfile.lock" }}-{{ arch }}
+          key: v1-cocoapods-{{ checksum "./revenuecat_examples/purchase_tester/ios/Podfile.lock" }}-{{ arch }}
       - replace-api-key
       - build-flutter-project:
-          project: example
+          project: revenuecat_examples/purchase_tester
       - run:
           name: Run Flutter integration tests
           command: |
-            cd example
+            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 "./example/ios/Podfile.lock" }}-{{ arch }}
+          key: v1-cocoapods-{{ checksum "./revenuecat_examples/purchase_tester/ios/Podfile.lock" }}-{{ arch }}
           paths:
-            - ./example/ios/Pods
+            - ./revenuecat_examples/purchase_tester/ios/Pods
             - ~/.cocoapods
 
 workflows:

.gitignore

@@ -26,10 +26,10 @@ pubspec.lock
 **/android/**/GeneratedPluginRegistrant.java
 **/android/key.properties
 *.jks
-example/ios/Flutter/flutter_export_environment.sh
-example/.flutter-plugins-dependencies
-example/ios/Flutter/Flutter.podspec
-example/ios/Flutter/.last_build_id
-example/android/.composite-enable
+revenuecat_examples/purchase_tester/ios/Flutter/flutter_export_environment.sh
+revenuecat_examples/purchase_tester/.flutter-plugins-dependencies
+revenuecat_examples/purchase_tester/ios/Flutter/Flutter.podspec
+revenuecat_examples/purchase_tester/ios/Flutter/.last_build_id
+revenuecat_examples/purchase_tester/android/.composite-enable
 fastlane/report.xml
 *.bck

CHANGELOG-LATEST.md

@@ -1,8 +1,3 @@
-## 3.1.1
-
-- Fixed an issue that would cause an error saying `type 'Null' is not a subtype of type 'String' in type cast` in `allExpirationDates` when null-safety is enabled.
-    https://github.com/RevenueCat/purchases-flutter/pull/177
-- Bumped purchases-hybrid-common to 1.6.2 [Changelog here](https://github.com/RevenueCat/purchases-hybrid-common/releases/1.6.2)
-- Bumped purchases-ios to 3.10.7 [Changelog here](https://github.com/RevenueCat/purchases-ios/releases/3.10.7)
-- Bumped purchases-android to 4.0.5 [Changelog here](https://github.com/RevenueCat/purchases-hybrid-common/releases/4.0.5)
-    https://github.com/RevenueCat/purchases-flutter/pull/171
+## 3.2.0
+- Added new Magic Weather sample app, available in `revenuecat_examples/MagicWeather`
+    https://github.com/RevenueCat/purchases-flutter/pull/170

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.2.0
+- Added new Magic Weather sample app, available in `revenuecat_examples/MagicWeather`
+    https://github.com/RevenueCat/purchases-flutter/pull/170
+
 ## 3.1.1
 
 - Fixed an issue that would cause an error saying `type 'Null' is not a subtype of type 'String' in type cast` in `allExpirationDates` when null-safety is enabled.

DEVELOPMENT.md

@@ -1,9 +1,9 @@
-- Replace the `api_key` in `example/lib/main.dart` with the api key with the sample app to test:
+- Replace the `api_key` in `revenuecat_examples/purchase_tester/lib/main.dart` with the api key with the sample app to test:
 
 ```
-    sed -i.bck s/api_key/$API_KEY/ example/integration_test/app_test.dart
+    sed -i.bck s/api_key/$API_KEY/ revenuecat_examples/purchase_tester/integration_test/app_test.dart
 ```
 
-- Open xcode project inside example/ios and changes made to the plugin should be automatically reflected.
-- When updating iOS dependency, make sure to run `pod install` inside `example/ios/`.
+- Open xcode project inside revenuecat_examples/purchase_tester/ios and changes made to the plugin should be automatically reflected.
+- When updating iOS dependency, make sure to run `pod install` inside `revenuecat_examples/purchase_tester/ios/`.
 

VERSIONS.md

@@ -1,5 +1,6 @@
 | Version | iOS version | Android version | Common files version |
 |---------|-------------|-----------------|----------------------|
+| 3.2.0   | 3.10.7      | 4.0.5           | 1.6.2                |
 | 3.1.1   | 3.10.7      | 4.0.5           | 1.6.2                |
 | 3.1.0   | 3.10.6      | 4.0.4           | 1.6.1                |
 | 3.0.2   | 3.9.2       | 4.0.1           | 1.5.0                |

android/build.gradle

@@ -1,5 +1,5 @@
 group 'com.revenuecat.purchases_flutter'
-version '3.1.1'
+version '3.2.0'
 
 buildscript {
     ext.kotlin_version = '1.3.72'

android/src/main/java/com/revenuecat/purchases_flutter/PurchasesFlutterPlugin.java

@@ -53,7 +53,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.1.1";
+    private static final String PLUGIN_VERSION = "3.2.0";
 
     /**
      * Plugin registration.

example/README.md

@@ -1,2 +1,10 @@
-This project is a starting point for a Flutter application with a RevenueCat integration. For help 
-getting started with, view our [online documentation](https://docs.revenuecat.com).
+# Examples
+Our examples are located at `revenuecat_examples/`.
+
+### MagicWeather
+
+This project is the best showcase for how to use `purchases_flutter` for a subscriptions app.
+
+### Purchase Tester
+
+Contains another example app that showcases how to use `purchases_flutter`, and is also used for integration tests. 

ios/Classes/PurchasesFlutterPlugin.m

@@ -492,7 +492,7 @@ - (NSString *)platformFlavor {
 }
 
 - (NSString *)platformFlavorVersion { 
-    return @"3.1.1";
+    return @"3.2.0";
 }
 
 @end

ios/purchases_flutter.podspec

@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'purchases_flutter'
-  s.version          = '3.1.1'
+  s.version          = '3.2.0'
   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!

macos/purchases_flutter.podspec

@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'purchases_flutter'
-  s.version          = '3.1.1'
+  s.version          = '3.2.0'
   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!

pubspec.yaml

@@ -1,6 +1,6 @@
 name: purchases_flutter
 description: A Flutter plugin that makes it simple to build in-app purchases and subscriptions – receipt validation, status tracking, and more. Supports iOS and Android.
-version: 3.1.1
+version: 3.2.0
 homepage: https://www.revenuecat.com/
 repository: https://github.com/RevenueCat/purchases-flutter
 issue_tracker: https://github.com/RevenueCat/purchases-flutter/issues

Examples/MagicWeather/android/app/build.gradle → revenuecat_examples/MagicWeather/android/app/build.gradle

@@ -44,7 +44,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "m4trixdevlimited.com.flutter_magic_weather_app"
+        applicationId "com.revenuecat.purchases_sample"
         minSdkVersion 16
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()

Examples/MagicWeather/android/app/src/main/AndroidManifest.xml → revenuecat_examples/MagicWeather/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.revenuecat.sampleapp">
+    package="com.revenuecat.purchases_sample">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide

Examples/MagicWeather/android/app/src/main/kotlin/m4trixdevlimited/com/flutter_magic_weather_app/MainActivity.kt → revenuecat_examples/MagicWeather/android/app/src/main/kotlin/com/revenuecat/purchases_sample/MainActivity.kt

@@ -1,4 +1,4 @@
-package m4trixdevlimited.com.flutter_magic_weather_app
+package com.revenuecat.purchases_sample
 
 import io.flutter.embedding.android.FlutterActivity
 

revenuecat_examples/MagicWeather/ios/Podfile.lock

@@ -0,0 +1,37 @@
+PODS:
+  - Flutter (1.0.0)
+  - Purchases (3.10.7):
+    - PurchasesCoreSwift (= 3.10.7)
+  - purchases_flutter (3.1.1):
+    - Flutter
+    - PurchasesHybridCommon (= 1.6.2)
+  - PurchasesCoreSwift (3.10.7)
+  - PurchasesHybridCommon (1.6.2):
+    - Purchases (= 3.10.7)
+
+DEPENDENCIES:
+  - Flutter (from `Flutter`)
+  - purchases_flutter (from `.symlinks/plugins/purchases_flutter/ios`)
+
+SPEC REPOS:
+  trunk:
+    - Purchases
+    - PurchasesCoreSwift
+    - PurchasesHybridCommon
+
+EXTERNAL SOURCES:
+  Flutter:
+    :path: Flutter
+  purchases_flutter:
+    :path: ".symlinks/plugins/purchases_flutter/ios"
+
+SPEC CHECKSUMS:
+  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
+  Purchases: b8b8fb6e856ac8166e217f6e014df894d821dda1
+  purchases_flutter: a016c891aea9eabd92267438a90506b35dae0101
+  PurchasesCoreSwift: 8ae0f08e020f0bc97c1befa4e38a0dbc8e9732e0
+  PurchasesHybridCommon: 5f5c1c245b12fc5e8760af7d11cb10f888109a9b
+
+PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa
+
+COCOAPODS: 1.10.1

Examples/MagicWeather/pubspec.yaml → revenuecat_examples/MagicWeather/pubspec.yaml

@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
   cupertino_icons: ^1.0.0
-  purchases_flutter: ^2.0.3
+  purchases_flutter: ^3.1.1
   modal_progress_hud: ^0.1.3
 
 dev_dependencies:

revenuecat_examples/purchase_tester/README.md

@@ -0,0 +1,2 @@
+This project is a starting point for a Flutter application with a RevenueCat integration. For help 
+getting started with, view our [online documentation](https://docs.revenuecat.com).

Examples/MagicWeather/android/app/src/debug/AndroidManifest.xml → revenuecat_examples/purchase_tester/android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.revenuecat.sampleapp">
+    package="com.revenuecat.purchases_sample">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

Examples/MagicWeather/android/app/src/profile/AndroidManifest.xml → revenuecat_examples/purchase_tester/android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="m4trixdevlimited.com.flutter_magic_weather_app">
+    package="com.revenuecat.purchases_sample">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

example/ios/Podfile.lock → revenuecat_examples/purchase_tester/ios/Podfile.lock

@@ -4,7 +4,7 @@ PODS:
     - Flutter
   - Purchases (3.10.7):
     - PurchasesCoreSwift (= 3.10.7)
-  - purchases_flutter (3.1.1):
+  - purchases_flutter (3.2.0):
     - Flutter
     - PurchasesHybridCommon (= 1.6.2)
   - PurchasesCoreSwift (3.10.7)
@@ -34,7 +34,7 @@ SPEC CHECKSUMS:
   Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
   integration_test: 5ed24a436eb7ec17b6a13046e9bf7ca4a404e59e
   Purchases: b8b8fb6e856ac8166e217f6e014df894d821dda1
-  purchases_flutter: a016c891aea9eabd92267438a90506b35dae0101
+  purchases_flutter: d1761e29d612cbbb49c0a4c38960a639e60652ed
   PurchasesCoreSwift: 8ae0f08e020f0bc97c1befa4e38a0dbc8e9732e0
   PurchasesHybridCommon: 5f5c1c245b12fc5e8760af7d11cb10f888109a9b
 

example/pubspec.yaml → revenuecat_examples/purchase_tester/pubspec.yaml

@@ -18,7 +18,7 @@ dev_dependencies:
     sdk: flutter
 
   purchases_flutter:
-    path: ../
+    path: ../../
 
   pedantic: ^1.8.0
   flutter_driver: