From 8894ceda668aa7f0e1eac293267aea4872a14495 Mon Sep 17 00:00:00 2001 From: Guillaume Roux Date: Fri, 19 Apr 2024 15:33:03 +0200 Subject: [PATCH 01/12] chore: update CHANGELOG --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc765e1..1955583 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [5.0.0-dev.2] + +* build(deps): bump device_info_plus from 9.1.2 to 10.0.1 by @dependabot in https://github.com/Floating-Dartists/matomo-tracker/pull/146 +* build(deps): bump package_info_plus from 6.0.0 to 7.0.0 by @dependabot in https://github.com/Floating-Dartists/matomo-tracker/pull/148 +* Prepare v5.0.0-dev.2 by @TesteurManiak in https://github.com/Floating-Dartists/matomo-tracker/pull/150 + + +**Full Changelog**: https://github.com/Floating-Dartists/matomo-tracker/compare/5.0.0-dev.1...5.0.0-dev.2 + ## [5.0.0-dev.1] * build(deps): bump uuid from 3.0.7 to 4.1.0 by @dependabot in https://github.com/Floating-Dartists/matomo-tracker/pull/125 From 51996a3eff0134280aa44c6b43a67c8b1e02de6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 09:38:42 +0000 Subject: [PATCH 02/12] build(deps): bump package_info_plus from 7.0.0 to 8.0.0 Bumps [package_info_plus](https://github.com/fluttercommunity/plus_plugins/tree/main/packages/package_info_plus) from 7.0.0 to 8.0.0. - [Release notes](https://github.com/fluttercommunity/plus_plugins/releases) - [Commits](https://github.com/fluttercommunity/plus_plugins/commits/package_info_plus-v8.0.0/packages/package_info_plus) --- updated-dependencies: - dependency-name: package_info_plus dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 5b862f4..b58a6e5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: flutter: sdk: flutter http: ^1.1.0 - package_info_plus: ">=4.2.0 <8.0.0" + package_info_plus: ">=4.2.0 <9.0.0" shared_preferences: ^2.2.2 uuid: ">=4.1.0 <6.0.0" From c8abcf48e03f8676bea964306800d19d2cef9142 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 09:55:30 +0000 Subject: [PATCH 03/12] build(deps): bump custom_lint from 0.5.11 to 0.6.4 Bumps [custom_lint](https://github.com/invertase/dart_custom_lint) from 0.5.11 to 0.6.4. - [Commits](https://github.com/invertase/dart_custom_lint/compare/custom_lint-v0.5.11...custom_lint-v0.6.4) --- updated-dependencies: - dependency-name: custom_lint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index b58a6e5..afe6c5e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -25,7 +25,7 @@ dependencies: uuid: ">=4.1.0 <6.0.0" dev_dependencies: - custom_lint: ^0.5.4 + custom_lint: ">=0.5.4 <0.7.0" fd_lints: ^2.2.0 flutter_test: sdk: flutter From a868c6f7cd1bfb066f1624378e5d0036569e1176 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Mon, 27 May 2024 15:28:21 +0200 Subject: [PATCH 04/12] Bumping up versions and min SDK to 3.4.1 --- pubspec.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index afe6c5e..ec2de48 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,26 +10,26 @@ topics: - analytics environment: - sdk: ">=3.0.0 <4.0.0" + sdk: ">=3.4.1 <=4.0.0" flutter: ">=3.3.0" dependencies: clock: ^1.1.1 - collection: ^1.17.2 + collection: ^1.18.0 device_info_plus: ">=9.1.0 <11.0.0" flutter: sdk: flutter - http: ^1.1.0 + http: ^1.2.1 package_info_plus: ">=4.2.0 <9.0.0" - shared_preferences: ^2.2.2 + shared_preferences: ^2.2.3 uuid: ">=4.1.0 <6.0.0" dev_dependencies: custom_lint: ">=0.5.4 <0.7.0" - fd_lints: ^2.2.0 + fd_lints: ^2.2.1 flutter_test: sdk: flutter - meta: ^1.9.1 - mocktail: ^1.0.2 + meta: ^1.12.0 + mocktail: ^1.0.3 flutter: null From 90e5d1f9dcbfbdc65a4790ce74b41a9bbba10e63 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 09:32:55 +0000 Subject: [PATCH 05/12] docs(contributor): contrib-readme-action has updated readme --- README.md | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3b8cf8a..a5c3c27 100644 --- a/README.md +++ b/README.md @@ -360,15 +360,15 @@ await MatomoTracker.instance.initialize( - - stefan01 + + KawachenCofinpro
Null - - KawachenCofinpro + + stefan01
Null @@ -423,14 +423,21 @@ await MatomoTracker.instance.initialize( Null + + + Hyla96 +
+ Gabriel Costache + + + hpoul
Herbert Poul - - + jainhitesh9998 From b710a405e9c39b53ad231480d8be6409728f3fbc Mon Sep 17 00:00:00 2001 From: Guillaume Roux Date: Thu, 6 Jun 2024 14:58:56 +0200 Subject: [PATCH 06/12] chore: prepare v5.0.0-dev.3 --- CHANGELOG.md | 12 ++++++++++++ pubspec.yaml | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1955583..3f9f9d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [5.0.0-dev.3] + +* build(deps): bump package_info_plus from 7.0.0 to 8.0.0 by @dependabot in https://github.com/Floating-Dartists/matomo-tracker/pull/151 +* build(deps): bump custom_lint from 0.5.11 to 0.6.4 by @dependabot in https://github.com/Floating-Dartists/matomo-tracker/pull/152 +* Bumping up versions and min SDK to 3.4.1 by @Hyla96 in https://github.com/Floating-Dartists/matomo-tracker/pull/153 +* docs(contributor): contributors readme action update by @github-actions in https://github.com/Floating-Dartists/matomo-tracker/pull/154 + +## New Contributors +* @Hyla96 made their first contribution in https://github.com/Floating-Dartists/matomo-tracker/pull/153 + +**Full Changelog**: https://github.com/Floating-Dartists/matomo-tracker/compare/5.0.0-dev.2...5.0.0-dev.3 + ## [5.0.0-dev.2] * build(deps): bump device_info_plus from 9.1.2 to 10.0.1 by @dependabot in https://github.com/Floating-Dartists/matomo-tracker/pull/146 diff --git a/pubspec.yaml b/pubspec.yaml index ec2de48..bf56452 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: matomo_tracker description: A fully cross-platform wrap of the Matomo tracking client for Flutter, using the Matomo API. -version: 5.0.0-dev.2 +version: 5.0.0-dev.3 homepage: https://github.com/Floating-Dartists/matomo-tracker repository: https://github.com/Floating-Dartists/matomo-tracker issue_tracker: https://github.com/Floating-Dartists/matomo-tracker/issues From 362721c331046decadeedc86190a5e134b07c63b Mon Sep 17 00:00:00 2001 From: Guillaume Roux Date: Thu, 6 Jun 2024 15:01:31 +0200 Subject: [PATCH 07/12] fix: dart SDK constraints --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index bf56452..ebf9972 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,7 +10,7 @@ topics: - analytics environment: - sdk: ">=3.4.1 <=4.0.0" + sdk: ">=3.4.1 <4.0.0" flutter: ">=3.3.0" dependencies: From 06353cb54bb7f436aed8f7e66ddea940fa3e6ae8 Mon Sep 17 00:00:00 2001 From: Peter Leibiger Date: Tue, 18 Jun 2024 13:29:11 +0200 Subject: [PATCH 08/12] Fix country code case Convert to lowercase since upper case codes lead to missing flag symbols in the backend. --- lib/src/matomo_action.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/matomo_action.dart b/lib/src/matomo_action.dart index 5a23b67..c38a0f2 100644 --- a/lib/src/matomo_action.dart +++ b/lib/src/matomo_action.dart @@ -200,7 +200,7 @@ class MatomoAction { final ua = tracker.userAgent; final dims = dimensions; final locale = PlatformDispatcher.instance.locale; - final country = locale.countryCode; + final country = locale.countryCode?.toLowerCase(); final nV = newVisit; final p = ping; final cont = content; From 87683c7aa70c0700554996e968c22c29ed1a6a08 Mon Sep 17 00:00:00 2001 From: Peter Leibiger Date: Tue, 18 Jun 2024 13:38:45 +0200 Subject: [PATCH 09/12] Add iOS machine name to user agent This allows matomo to figure out the exact iOS device (for example "iPhone 14 Pro Max") instead of just "iPhone". --- lib/src/matomo.dart | 3 ++- test/ressources/mock/data.dart | 1 + test/ressources/mock/mock.dart | 3 +++ test/src/matomo_test.dart | 4 +++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/src/matomo.dart b/lib/src/matomo.dart index 091d5ec..505b7a1 100644 --- a/lib/src/matomo.dart +++ b/lib/src/matomo.dart @@ -385,8 +385,9 @@ class MatomoTracker { final systemName = iosInfo.systemName; final version = iosInfo.systemVersion; final model = iosInfo.model; + final machine = iosInfo.utsname.machine; - return '$systemName $version, $model'; + return '$systemName $version, $model $machine'; } else if (_platformInfo.isWindows) { final windowsInfo = await effectiveDeviceInfo.windowsInfo; final releaseId = windowsInfo.releaseId; diff --git a/test/ressources/mock/data.dart b/test/ressources/mock/data.dart index 4760d6d..1350067 100644 --- a/test/ressources/mock/data.dart +++ b/test/ressources/mock/data.dart @@ -150,6 +150,7 @@ const androidModel = 'androidModel'; const iosSystemName = 'iosSystemName'; const iosSystemVersion = 'iosSystemVersion'; const iosModel = 'iosModel'; +const iosMachine = 'iosMachine'; const windowsReleaseId = 'windowsReleaseId'; const windowsBuildNumber = 1; const macOsModel = 'macOsModel'; diff --git a/test/ressources/mock/mock.dart b/test/ressources/mock/mock.dart index 0853f2c..b708442 100644 --- a/test/ressources/mock/mock.dart +++ b/test/ressources/mock/mock.dart @@ -42,6 +42,8 @@ class MockAndroidBuildVersion extends Mock implements AndroidBuildVersion {} class MockIosDeviceInfo extends Mock implements IosDeviceInfo {} +class MockIosDeviceUtsname extends Mock implements IosUtsname {} + class MockWindowsDeviceInfo extends Mock implements WindowsDeviceInfo {} class MockMacOsDeviceInfo extends Mock implements MacOsDeviceInfo {} @@ -76,6 +78,7 @@ final mockWebBrowserInfo = MockWebBrowserInfo(); final mockAndroidDeviceInfo = MockAndroidDeviceInfo(); final mockAndroidBuildVersion = MockAndroidBuildVersion(); final mockIosDeviceInfo = MockIosDeviceInfo(); +final mockIosUtsname = MockIosDeviceUtsname(); final mockWindowsDeviceInfo = MockWindowsDeviceInfo(); final mockMacOsDeviceInfo = MockMacOsDeviceInfo(); final mockLinuxDeviceInfo = MockLinuxDeviceInfo(); diff --git a/test/src/matomo_test.dart b/test/src/matomo_test.dart index 395ecb5..d8ffbfc 100644 --- a/test/src/matomo_test.dart +++ b/test/src/matomo_test.dart @@ -303,6 +303,8 @@ void main() { when(() => mockIosDeviceInfo.systemName).thenReturn(iosSystemName); when(() => mockIosDeviceInfo.systemVersion).thenReturn(iosSystemVersion); when(() => mockIosDeviceInfo.model).thenReturn(iosModel); + when(() => mockIosDeviceInfo.utsname).thenReturn(mockIosUtsname); + when(() => mockIosUtsname.machine).thenReturn(iosMachine); // Windows when(() => mockDeviceInfoPlugin.windowsInfo) @@ -373,7 +375,7 @@ void main() { expect( userAgent, - '$iosSystemName $iosSystemVersion, $iosModel', + '$iosSystemName $iosSystemVersion, $iosModel $iosMachine', ); }); From 0bcf3fecffdac02ed55ea68d9f55184366f26783 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 17:02:44 +0000 Subject: [PATCH 10/12] docs(contributor): contrib-readme-action has updated readme --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index a5c3c27..9335d54 100644 --- a/README.md +++ b/README.md @@ -452,6 +452,13 @@ await MatomoTracker.instance.initialize( Lukas Lihotzki + + + kuhnroyal +
+ Peter Leibiger + + svprdga From 7bcb82d5fe14d5faec346db807d144462703d03e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 19:17:17 +0000 Subject: [PATCH 11/12] docs(contributor): contrib-readme-action has updated readme --- README.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a5c3c27..af3b6b0 100644 --- a/README.md +++ b/README.md @@ -409,6 +409,13 @@ await MatomoTracker.instance.initialize( Lsaudon + + + kuhnroyal +
+ Peter Leibiger + + zvikarp @@ -422,15 +429,15 @@ await MatomoTracker.instance.initialize(
Null - + + Hyla96
Gabriel Costache - - + hpoul From 7113d78c20bd87646861b4f6ef2edf3f45cde47c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 19:18:04 +0000 Subject: [PATCH 12/12] docs(contributor): contrib-readme-action has updated readme --- README.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/README.md b/README.md index 6b88029..af3b6b0 100644 --- a/README.md +++ b/README.md @@ -459,13 +459,6 @@ await MatomoTracker.instance.initialize( Lukas Lihotzki - - - kuhnroyal -
- Peter Leibiger - - svprdga