Merge branch 'release/0.6.0'

Author: matus-tomlein

.github/workflows/build.yml

@@ -6,10 +6,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        flutter: ['3.0.0']
+        flutter: ['3.19.0']
     steps:
-      - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v1
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ matrix.flutter }}
           channel: 'stable'
@@ -20,20 +20,20 @@ jobs:
     name: Analyze
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v1
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.0.0'
+          flutter-version: '3.19.0'
           channel: 'stable'
       - run: flutter pub get
       - run: flutter analyze
-      - run: flutter format -n --set-exit-if-changed .
+      - run: dart format --set-exit-if-changed .
 
   build-android:
     name: Integration tests on Android
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v1
         with:
           java-version: "11.x"
@@ -58,9 +58,9 @@ jobs:
         run: while ! nc -z '0.0.0.0' 9090; do sleep 1; done
 
       # -- Integration tests --
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.0.0'
+          flutter-version: '3.19.0'
           channel: 'stable'
 
       - name: Run Flutter Driver tests
@@ -77,7 +77,7 @@ jobs:
     name: Integration tests on iOS
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # -- Micro --
       - name: Cache Micro
@@ -106,9 +106,9 @@ jobs:
           erase_before_boot: true
           shutdown_after_job: true
 
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.0.0'
+          flutter-version: '3.19.0'
           channel: 'stable'
 
       - run: "flutter clean"
@@ -122,7 +122,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # -- Micro --
       - name: Cache Micro
@@ -144,9 +144,9 @@ jobs:
         run: while ! nc -z '0.0.0.0' 9090; do sleep 1; done
 
       # -- Integration tests --
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.0.0'
+          flutter-version: '3.19.0'
           channel: 'stable'
 
       - run: chromedriver --port=4444 &

.github/workflows/publish.yml

@@ -3,18 +3,18 @@ name: Publish package to pub.dev and make a GitHub release
 on:
   push:
     tags:
-    - '*.*.*'
+      - '[0-9]+.[0-9]+.[0-9]+*'
 
 jobs:
   test:
     name: Run unit tests
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        flutter: ['3.0.0']
+        flutter: ['3.19.0']
     steps:
-      - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v1
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ matrix.flutter }}
           channel: 'stable'
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Setup Node
       uses: actions/setup-node@v2
@@ -61,34 +61,37 @@ jobs:
         fi
 
   publish_pubdev:
-    needs: ["test", "version_check"]
     runs-on: ubuntu-latest
-    container:
-      image: google/dart:latest
+    needs: ["test", "version_check"]
+    permissions:
+      id-token: write
     steps:
-    - uses: actions/checkout@v1
-    - name: Setup credentials
-      run: | 
-        mkdir -p ~/.pub-cache 
-        cat <<EOF > ~/.pub-cache/credentials.json
-        {
-          "accessToken":"${{ secrets.ACCESS_TOKEN }}",
-          "refreshToken":"${{ secrets.REFRESH_TOKEN }}",
-          "tokenEndpoint":"https://accounts.google.com/o/oauth2/token",
-          "scopes": [ "openid", "https://www.googleapis.com/auth/userinfo.email" ],
-          "expiration": 1643122520446
-        }
-        EOF
-    - name: Publish package
-      run: pub publish -f
+      - uses: actions/checkout@v4
+
+      - name: Setup Dart
+        uses: dart-lang/setup-dart@v1
+        with:
+          sdk: stable
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+          cache: true
+
+      - name: Check Flutter version
+        run: flutter --version
+
+      - name: Publish to pub.dev
+        run: flutter pub publish --force
 
   release:
     needs: ["test", "publish_pubdev", "version_check"]
     runs-on: ubuntu-latest
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Release
       uses: softprops/[email protected]

CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.6.0
+
+* Upgrade mobile trackers to version 6.0
+* Add support for mobile screen engagement tracking including list item view and scroll changed events (#43)
+* Add configuration to override platform context properties in the mobile context including the IDFA identifiers (#44)
+* Update SDK constraint to <4.0.0 (#42)
+* Fix publish action (#38)
+* Remove deprecated setMockMethodCallHandler from tests (#41)
+* Move the repository to the snowplow Github organization (#29)
+* Update copyright headers
+
 # 0.5.0
 
 *  Add lifecycle autotracking config option (#39)

CONTRIBUTING.md

@@ -26,7 +26,7 @@ If you see an issue you would like to work on, please let us know in the issue!
 not doubling the amount of work.
 
 If you don't know where to start contributing, you can look at
-[the issues labeled `good first issue`](https://github.com/snowplow-incubator/snowplow-flutter-tracker/labels/category%3Agood_first_issue).
+[the issues labeled `good first issue`](https://github.com/snowplow/snowplow-flutter-tracker/labels/category%3Agood_first_issue).
 
 ## Pull requests
 
@@ -68,7 +68,7 @@ If your pull request is fairly chunky, there might be a non-trivial delay betwee
 ### Contributor license agreement
 
 We require outside contributors to sign a Contributor license agreement (or CLA) before we can merge their pull requests.  
-You can find more information on the topic in [the dedicated wiki page](https://github.com/snowplow/snowplow/wiki/CLA).  
+You can find more information on the topic in [the dedicated wiki page](https://docs.snowplow.io/docs/contributing/contributor-license-agreement/).  
 The @snowplowcla bot will guide you through the process.
 
 ## Getting in touch

LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Snowplow Analytics Ltd.
+   Copyright 2022-present Snowplow Analytics Ltd.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -30,9 +30,10 @@ It is build on top of Snowplow's native [iOS](https://github.com/snowplow/snowpl
 | Session context entity added to events                                                                       | ✔ | ✔ | ✔      |
 | Geo-location context entity                                                                                  | ✔ | ✔ | ✔      |
 | Mobile platform context entity                                                                               | ✔ | ✔ |        |
-| Web page context entity                                                                                      | | | ✔      |
+| Web page context entity                                                                                      |   |   | ✔      |
 | Configurable GDPR context entity                                                                             | ✔ | ✔ | ✔      |
 | Lifecycle autotracking                                                                                       | ✔ | ✔ |        |
+| Engagement tracking (activity tracking on Web, mobile screen engagement on mobile)                           | ✔ | ✔ | ✔      |
 
 ## Quick Start
 
@@ -48,7 +49,7 @@ This will add a line with the dependency like this to your `pubspec.yaml`:
 
 ```yml
 dependencies:
-    snowplow_tracker: ^0.5.0
+    snowplow_tracker: ^0.6.0
 ```
 
 Import the package into your Dart code:
@@ -61,7 +62,7 @@ import 'package:snowplow_tracker/snowplow_tracker.dart'
 
 If using the tracker within a Flutter app for Web, you will also need to import the Snowplow JavaScript Tracker in your `index.html` file. Please load the JS tracker with the Snowplow tag as [described in the official documentation](https://docs.snowplow.io/docs/collecting-data/collecting-from-own-applications/javascript-trackers/javascript-tracker/javascript-tracker-v3/tracker-setup/loading/). Do not change the global function name `snowplow` that is used to access the tracker – the Flutter APIs assume that it remains the default as shown in documentation.
 
-Make sure to use JavaScript tracker version `3.5` or newer. You may also refer to the [example project](https://github.com/snowplow-incubator/snowplow-flutter-tracker/tree/main/example) in the Flutter tracker repository to see this in action.
+Make sure to use JavaScript tracker version `3.5` or newer. You may also refer to the [example project](https://github.com/snowplow/snowplow-flutter-tracker/tree/main/example) in the Flutter tracker repository to see this in action.
 
 ### Using the Tracker
 
@@ -146,7 +147,7 @@ Assuming [Flutter SDK](https://docs.flutter.dev/get-started/install) is set up a
 #### Clone Repository
 
 ```bash
-git clone https://github.com/snowplow-incubator/snowplow-flutter-tracker.git
+git clone https://github.com/snowplow/snowplow-flutter-tracker.git
 ```
 
 ## Example App
@@ -211,7 +212,7 @@ To run the integration tests on Web:
 
 ## Copyright and License
 
-The Snowplow Flutter Tracker is copyright 2022 Snowplow Analytics Ltd.
+The Snowplow Flutter Tracker is copyright 2022-present Snowplow Analytics Ltd.
 
 Licensed under the **[Apache License, Version 2.0][license]** (the "License");
 you may not use this software except in compliance with the License.
@@ -227,8 +228,8 @@ limitations under the License.
 [docs]: https://docs.snowplow.io/
 [flutter-docs]: https://docs.snowplow.io/docs/collecting-data/collecting-from-own-applications/flutter-tracker/
 
-[gh-actions]: https://github.com/snowplow-incubator/snowplow-flutter-tracker/actions/workflows/build.yml
-[gh-actions-image]: https://github.com/snowplow-incubator/snowplow-flutter-tracker/actions/workflows/build.yml/badge.svg
+[gh-actions]: https://github.com/snowplow/snowplow-flutter-tracker/actions/workflows/build.yml
+[gh-actions-image]: https://github.com/snowplow/snowplow-flutter-tracker/actions/workflows/build.yml/badge.svg
 
 [license]: https://www.apache.org/licenses/LICENSE-2.0
 [license-image]: https://img.shields.io/badge/license-Apache--2-blue.svg?style=flat

android/build.gradle

@@ -47,5 +47,5 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "com.snowplowanalytics:snowplow-android-tracker:5.+"
+    implementation "com.snowplowanalytics:snowplow-android-tracker:6.0.+"
 }

android/src/main/kotlin/com/snowplowanalytics/snowplow_tracker/SnowplowTrackerController.kt

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Snowplow Analytics Ltd. All rights reserved.
+// Copyright (c) 2022-present Snowplow Analytics Ltd. All rights reserved.
 //
 // This program is licensed to you under the Apache License Version 2.0,
 // and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -71,6 +71,20 @@ object SnowplowTrackerController {
         trackerController?.track(screenView)
     }
 
+    fun trackScrollChanged(eventReader: EventMessageReader) {
+        val trackerController = Snowplow.getTracker(eventReader.tracker)
+        val scroll = eventReader.toScrollChangedWithContexts()
+
+        trackerController?.track(scroll)
+    }
+
+    fun trackListItemView(eventReader: EventMessageReader) {
+        val trackerController = Snowplow.getTracker(eventReader.tracker)
+        val listItem = eventReader.toListItemViewWithContexts()
+
+        trackerController?.track(listItem)
+    }
+
     fun trackTiming(eventReader: EventMessageReader) {
         val trackerController = Snowplow.getTracker(eventReader.tracker)
         val timing = eventReader.toTimingWithContexts()

android/src/main/kotlin/com/snowplowanalytics/snowplow_tracker/SnowplowTrackerPlugin.kt

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Snowplow Analytics Ltd. All rights reserved.
+// Copyright (c) 2022-present Snowplow Analytics Ltd. All rights reserved.
 //
 // This program is licensed to you under the Apache License Version 2.0,
 // and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -45,6 +45,8 @@ class SnowplowTrackerPlugin: FlutterPlugin, MethodCallHandler {
             "trackStructured" -> onTrackStructured(call, result)
             "trackSelfDescribing" -> onTrackSelfDescribing(call, result)
             "trackScreenView" -> onTrackScreenView(call, result)
+            "trackScrollChanged" -> onTrackScrollChanged(call, result)
+            "trackListItemView" -> onTrackListItemView(call, result)
             "trackTiming" -> onTrackTiming(call, result)
             "trackConsentGranted" -> onTrackConsentGranted(call, result)
             "trackConsentWithdrawn" -> onTrackConsentWithdrawn(call, result)
@@ -91,6 +93,20 @@ class SnowplowTrackerPlugin: FlutterPlugin, MethodCallHandler {
         result.success(null)
     }
 
+    private fun onTrackScrollChanged(call: MethodCall, result: MethodChannel.Result) {
+        (call.arguments as? Map<String, Any>)?.let {
+            SnowplowTrackerController.trackScrollChanged(EventMessageReader(it))
+        }
+        result.success(null)
+    }
+
+    private fun onTrackListItemView(call: MethodCall, result: MethodChannel.Result) {
+        (call.arguments as? Map<String, Any>)?.let {
+            SnowplowTrackerController.trackListItemView(EventMessageReader(it))
+        }
+        result.success(null)
+    }
+
     private fun onTrackTiming(call: MethodCall, result: MethodChannel.Result) {
         (call.arguments as? Map<String, Any>)?.let {
             SnowplowTrackerController.trackTiming(EventMessageReader(it))

android/src/main/kotlin/com/snowplowanalytics/snowplow_tracker/TrackerVersion.kt

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Snowplow Analytics Ltd. All rights reserved.
+// Copyright (c) 2022-present Snowplow Analytics Ltd. All rights reserved.
 //
 // This program is licensed to you under the Apache License Version 2.0,
 // and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -12,5 +12,5 @@
 package com.snowplowanalytics.snowplow_tracker
 
 object TrackerVersion {
-    val TRACKER_VERSION = "flutter-0.5.0"
+    val TRACKER_VERSION = "flutter-0.6.0"
 }