Merge branch 'main' into dev

CHANGELOG.md

@@ -1,5 +1,26 @@
 # 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
+* 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

README.md

@@ -360,15 +360,15 @@ await MatomoTracker.instance.initialize(
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/stefan01">
-            <img src="https://avatars.githubusercontent.com/u/1234184?v=4" width="100;" alt="stefan01"/>
+        <a href="https://github.com/KawachenCofinpro">
+            <img src="https://avatars.githubusercontent.com/u/56601057?v=4" width="100;" alt="KawachenCofinpro"/>
             <br />
             <sub><b>Null</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/KawachenCofinpro">
-            <img src="https://avatars.githubusercontent.com/u/56601057?v=4" width="100;" alt="KawachenCofinpro"/>
+        <a href="https://github.com/stefan01">
+            <img src="https://avatars.githubusercontent.com/u/1234184?v=4" width="100;" alt="stefan01"/>
             <br />
             <sub><b>Null</b></sub>
         </a>
@@ -409,6 +409,13 @@ await MatomoTracker.instance.initialize(
             <sub><b>Lsaudon</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/kuhnroyal">
+            <img src="https://avatars.githubusercontent.com/u/1260818?v=4" width="100;" alt="kuhnroyal"/>
+            <br />
+            <sub><b>Peter Leibiger</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/zvikarp">
             <img src="https://avatars.githubusercontent.com/u/13397207?v=4" width="100;" alt="zvikarp"/>
@@ -422,15 +429,22 @@ await MatomoTracker.instance.initialize(
             <br />
             <sub><b>Null</b></sub>
         </a>
+    </td></tr>
+<tr>
+    <td align="center">
+        <a href="https://github.com/Hyla96">
+            <img src="https://avatars.githubusercontent.com/u/16517737?v=4" width="100;" alt="Hyla96"/>
+            <br />
+            <sub><b>Gabriel Costache</b></sub>
+        </a>
     </td>
     <td align="center">
         <a href="https://github.com/hpoul">
             <img src="https://avatars.githubusercontent.com/u/313066?v=4" width="100;" alt="hpoul"/>
             <br />
             <sub><b>Herbert Poul</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/jainhitesh9998">
             <img src="https://avatars.githubusercontent.com/u/16622965?v=4" width="100;" alt="jainhitesh9998"/>

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;

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;

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
@@ -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
-  package_info_plus: ">=4.2.0 <8.0.0"
-  shared_preferences: ^2.2.2
+  http: ^1.2.1
+  package_info_plus: ">=4.2.0 <9.0.0"
+  shared_preferences: ^2.2.3
   uuid: ">=4.1.0 <6.0.0"
 
 dev_dependencies:
-  custom_lint: ^0.5.4
-  fd_lints: ^2.2.0
+  custom_lint: ">=0.5.4 <0.7.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

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';

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();

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',
       );
     });