Merge pull request #116 from qonversion/release/4.2.0

Release 4.2.0

Author: Maria-Bordunova

.github/workflows/checks.yml

@@ -0,0 +1,25 @@
+name: Checks
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  lint:
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        name: Checkout
+      
+      - uses: actions/setup-java@v1
+        name: Setup Java
+        with:
+          java-version: '12.x'
+          
+      - uses: subosito/flutter-action@v1
+        name: Setup Flutter
+        with:
+          channel: 'stable'
+      - run: flutter pub get
+      - name: Validation
+        run: flutter pub publish --dry-run

.github/workflows/prerelease_github.yml

@@ -0,0 +1,21 @@
+name: Pre-release Github
+
+on:
+  push:
+    branches:
+      - "main"
+
+jobs:
+  pre-release:
+    runs-on: macos-latest
+
+    steps:
+      - uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "latest"
+          prerelease: true
+          title: "Development Build"
+          files: |
+            LICENSE.txt
+            *.jar

.github/workflows/release_pull_requests.yml

@@ -0,0 +1,51 @@
+name: Release pull requests
+on:
+  push:
+    tags:
+    - prerelease/*
+
+jobs:
+    prerelease:
+      runs-on: macos-latest
+
+      steps:
+        - uses: actions/checkout@v2
+          name: Checkout all
+          with:
+            fetch-depth: 0
+          
+        - uses: olegtarasov/[email protected]
+          id: tagName
+          with:
+            tagRegex: 'prerelease\/(\d*\.\d*\.\d*)'
+            
+        - name: Bump version
+          run: |
+            fastlane bump version:${{ steps.tagName.outputs.tag }}
+
+        - name: Create pull request
+          uses: peter-evans/create-pull-request@v3
+          with:
+            title: Release ${{ steps.tagName.outputs.tag }}
+            body: Release PR
+            labels: autocreated
+            branch: release/${{ steps.tagName.outputs.tag }}
+            base: develop
+         
+        - uses: actions/checkout@v2
+          with:
+            ref: main
+        
+        - name: Reset main branch
+          run: |
+            git fetch origin release/${{ steps.tagName.outputs.tag }}:release/${{ steps.tagName.outputs.tag }}
+            git reset --hard release/${{ steps.tagName.outputs.tag }}
+        
+        - name: Create Pull Request
+          uses: peter-evans/create-pull-request@v3
+          with:
+            title: Release ${{ steps.tagName.outputs.tag }}
+            body: Release PR
+            labels: autocreated
+            branch: release/${{ steps.tagName.outputs.tag }}
+            base: main

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.2.0
+* Add `setAppleSearchAdsAttributionEnabled()` method
+
 ## 4.1.1
 * Fix StrictMode policy violation errors in the Google Play Console pre-launch report.
 

example/lib/home.dart

@@ -102,6 +102,8 @@ class _HomeViewState extends State<HomeView> {
       isObserveMode: false,
     );
 
+    Qonversion.setAppleSearchAdsAttributionEnabled(true);
+
     _loadQonversionObjects();
   }
 

example/lib/products_view.dart

@@ -9,15 +9,14 @@ class ProductsView extends StatefulWidget {
 }
 
 class _ProductsViewState extends State<ProductsView> {
-  var _products = <String, QProduct>{};
+  var _products = <QProduct>[];
   QOfferings _offerings;
   StreamSubscription<Map<String, QPermission>> _deferredPurchasesStream;
   StreamSubscription<String> _promoPurchasesStream;
 
   @override
   void initState() {
     super.initState();
-    _loadProducts();
     _loadOfferings();
 
     _deferredPurchasesStream =
@@ -28,7 +27,7 @@ class _ProductsViewState extends State<ProductsView> {
       try {
         final permissions = await Qonversion.promoPurchase(promoPurchaseId);
         // Get Qonversion product by App Store ID
-        final qProduct = _products.values.firstWhere(
+        final qProduct = _products.firstWhere(
             (element) => element.storeId == promoPurchaseId,
             orElse: () => null);
         // Get permission by Qonversion product
@@ -65,7 +64,7 @@ class _ProductsViewState extends State<ProductsView> {
             : ListView(
                 children: [
                   if (_products != null)
-                    for (final p in _products.values) _productWidget(p),
+                    for (final p in _products) _productWidget(p),
                   if (_offerings != null) _offeringsWidget(_offerings),
                   if (_products != null)
                     Padding(
@@ -80,9 +79,10 @@ class _ProductsViewState extends State<ProductsView> {
                         textColor: Colors.black,
                         onPressed: () async {
                           try {
+                            final ids = _products.map((product) => product.storeId).toList();
                             final res =
-                                await Qonversion.checkTrialIntroEligibility(
-                                    _products.keys.toList());
+                                await Qonversion.checkTrialIntroEligibility(ids);
+
                             print(res.map(
                                 (key, value) => MapEntry(key, value.status)));
                           } catch (e) {
@@ -97,19 +97,20 @@ class _ProductsViewState extends State<ProductsView> {
     );
   }
 
-  Future<void> _loadProducts() async {
+  Future<void> _loadOfferings() async {
     try {
-      _products = await Qonversion.products();
+      _offerings = await Qonversion.offerings();
+      _loadProducts();
       setState(() {});
     } catch (e) {
       print(e);
-      _products = {};
     }
   }
 
-  Future<void> _loadOfferings() async {
+  Future<void> _loadProducts() async {
     try {
-      _offerings = await Qonversion.offerings();
+      var mainOffering = _offerings.offeringForIdentifier("main");
+      _products = mainOffering.products;
       setState(() {});
     } catch (e) {
       print(e);

fastlane/Appfile

@@ -0,0 +1,38 @@
+def update_dart(new_version)
+  path = Dir['../lib/**/qonversion.dart'].first
+  regex = /static const String _sdkVersion = ".*";/
+  result_value = "static const String _sdkVersion = \"#{new_version}\";"
+
+  update_file(path, regex, result_value)
+end
+
+def update_yaml(new_version)
+  path = "../pubspec.yaml"
+  regex = /version: .*/
+  result_value = "version: #{new_version}"
+
+  update_file(path, regex, result_value)
+end
+
+def update_file(path, regex, result_value)
+  file = File.read(path)
+  new_content = file.gsub(regex, result_value)
+  File.open(path, 'w') { |line| line.puts new_content }
+end
+
+def update_changelog(new_version)
+  changelog_update = "\#\# #{new_version}\n* // Update changelog here\n\n"
+  path = "../CHANGELOG.md"
+  file = File.read(path)
+  File.open(path, 'w') { |line| 
+    line.puts changelog_update + file 
+  }
+end
+
+lane :bump do |options|
+  new_version = options[:version]
+
+  update_dart(new_version)
+  update_yaml(new_version)
+  update_changelog(new_version)
+end

fastlane/Fastfile

@@ -0,0 +1,28 @@
+fastlane documentation
+================
+# Installation
+
+Make sure you have the latest version of the Xcode command line tools installed:
+
+```
+xcode-select --install
+```
+
+Install _fastlane_ using
+```
+[sudo] gem install fastlane -NV
+```
+or alternatively using `brew install fastlane`
+
+# Available Actions
+### bump
+```
+fastlane bump
+```
+
+
+----
+
+This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
+More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
+The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).

fastlane/README.md

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites>
+  <testsuite name="fastlane.lanes">
+    
+    
+    
+  </testsuite>
+</testsuites>