From 88b306335df1e90f5168f4687ef27a3346eed47e Mon Sep 17 00:00:00 2001 From: nohli <43643339+nohli@users.noreply.github.com> Date: Wed, 29 Dec 2021 15:12:47 +0100 Subject: [PATCH 01/10] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3d578ae389..0d5bf4d921 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store .atom/ .idea/ +.vscode/ .packages .pub/ From f4ba113498764cfb8c7d65ac73c0af35ce4b1ad6 Mon Sep 17 00:00:00 2001 From: nohli <43643339+nohli@users.noreply.github.com> Date: Wed, 29 Dec 2021 15:13:50 +0100 Subject: [PATCH 02/10] Bump versions of device_info_plus and device_info_plus_macos --- packages/device_info_plus/device_info_plus/pubspec.yaml | 4 ++-- packages/device_info_plus/device_info_plus_macos/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/device_info_plus/device_info_plus/pubspec.yaml b/packages/device_info_plus/device_info_plus/pubspec.yaml index bd8b488c94..ae2498065f 100644 --- a/packages/device_info_plus/device_info_plus/pubspec.yaml +++ b/packages/device_info_plus/device_info_plus/pubspec.yaml @@ -1,7 +1,7 @@ name: device_info_plus description: Flutter plugin providing detailed information about the device (make, model, etc.), and Android or iOS version the app is running on. -version: 3.2.0 +version: 3.2.1 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ @@ -27,7 +27,7 @@ dependencies: sdk: flutter device_info_plus_platform_interface: ^2.3.0 device_info_plus_linux: ^2.1.0 - device_info_plus_macos: ^2.2.0 + device_info_plus_macos: ^2.2.1 device_info_plus_web: ^2.1.0 device_info_plus_windows: ^2.1.0 diff --git a/packages/device_info_plus/device_info_plus_macos/pubspec.yaml b/packages/device_info_plus/device_info_plus_macos/pubspec.yaml index 738f5bb602..032a5f6b24 100644 --- a/packages/device_info_plus/device_info_plus_macos/pubspec.yaml +++ b/packages/device_info_plus/device_info_plus_macos/pubspec.yaml @@ -2,7 +2,7 @@ name: device_info_plus_macos description: Macos implementation of the device_info_plus plugin homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ -version: 2.2.0 +version: 2.2.1 environment: sdk: ">=2.12.0 <3.0.0" From b6a1ca0459821cc4d7a89bb03b238af6376dc275 Mon Sep 17 00:00:00 2001 From: nohli <43643339+nohli@users.noreply.github.com> Date: Wed, 29 Dec 2021 15:13:56 +0100 Subject: [PATCH 03/10] Update changelogs --- packages/device_info_plus/device_info_plus/CHANGELOG.md | 4 ++++ packages/device_info_plus/device_info_plus_macos/CHANGELOG.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/packages/device_info_plus/device_info_plus/CHANGELOG.md b/packages/device_info_plus/device_info_plus/CHANGELOG.md index 9c1d94b8a0..f98971a45a 100644 --- a/packages/device_info_plus/device_info_plus/CHANGELOG.md +++ b/packages/device_info_plus/device_info_plus/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.2.1 + +- Fix warnings when building for macOS + ## 3.2.0 - add `deviceInfo` diff --git a/packages/device_info_plus/device_info_plus_macos/CHANGELOG.md b/packages/device_info_plus/device_info_plus_macos/CHANGELOG.md index a905a6e9a6..9baf6200bd 100644 --- a/packages/device_info_plus/device_info_plus_macos/CHANGELOG.md +++ b/packages/device_info_plus/device_info_plus_macos/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.2.1 + +- Fix build warnings + ## 2.2.0 - add System GUID to MacOS From 7c4f97a890174173613570a84a01b8dab2da9eb4 Mon Sep 17 00:00:00 2001 From: nohli <43643339+nohli@users.noreply.github.com> Date: Wed, 29 Dec 2021 15:15:29 +0100 Subject: [PATCH 04/10] Revert "Update .gitignore" This reverts commit 88b306335df1e90f5168f4687ef27a3346eed47e. --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0d5bf4d921..3d578ae389 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .DS_Store .atom/ .idea/ -.vscode/ .packages .pub/ From 20e8c74918bdf865e34184b7fd0403a72a39157b Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Wed, 29 Dec 2021 17:06:36 +0300 Subject: [PATCH 05/10] [package_info_plus] fix test on linux (#661) --- .../package_info_plus/test/package_info_test.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/package_info_plus/package_info_plus/test/package_info_test.dart b/packages/package_info_plus/package_info_plus/test/package_info_test.dart index 4d84db11ec..fccc38b749 100644 --- a/packages/package_info_plus/package_info_plus/test/package_info_test.dart +++ b/packages/package_info_plus/package_info_plus/test/package_info_test.dart @@ -44,6 +44,9 @@ void main() { isMethodCall('getAll', arguments: null), ], ); + }, onPlatform: { + 'linux': + const Skip('PackageInfoPlus on Linux does not use platform channels'), }); test('Mock initial values', () async { From a3ea7eba1325ebaadf36451123a0e1092295f798 Mon Sep 17 00:00:00 2001 From: Joachim Nohl <43643339+nohli@users.noreply.github.com> Date: Sat, 1 Jan 2022 13:09:51 +0100 Subject: [PATCH 06/10] Update CONTRIBUTING.md (#672) --- .github/PULL_REQUEST_TEMPLATE.md | 3 ++- CONTRIBUTING.md | 14 ++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9de2954d47..ee45dcf394 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -9,11 +9,12 @@ ## Checklist Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes (`[x]`). -This will ensure a smooth and quick review process. Updating the `pubspec.yaml` and changelogs is not required. +This will ensure a smooth and quick review process. - [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [ ] My PR includes unit or integration tests for *all* changed/updated/fixed behaviors (See [Contributor Guide]). - [ ] All existing and new tests are passing. +- [ ] I updated the version in `pubspec.yaml` and `CHANGELOG.md`. - [ ] I updated/added relevant documentation (doc comments with `///`). - [ ] The analyzer (`flutter analyze`) does not report any problems on my PR. - [ ] I read and followed the [Flutter Style Guide]. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fe0461818e..4b74e3f32e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -182,18 +182,24 @@ melos run analyze melos run format ``` -Before opening a Pull-Request, **please increase the build number in the `pubspec.yaml` +### 5.3 Update version and changelog + +Before opening a Pull-Request, **please increase the version number in the `pubspec.yaml` and create a new entry in the `CHANGELOG.md` describing the change**. This will help us speed-up the release process for the provided fix or feature. -### 5.3 Commit and push your changes +If updating a platform package (e.g. `device_info_plus_macos`), please remember to update version and changelog of the main package (e.g. `device_info_plus`). + +More info about versioning can be found on [semver.org](https://semver.org/). + +### 5.4 Commit and push your changes Assuming all is successful, commit and push your code: 1. `git commit -a -m ""` 2. `git push origin ` -### 5.4 Create a pull request +### 5.5 Create a pull request To send us a pull request: @@ -211,7 +217,7 @@ guide. For example, for a fix to the `sensor_plus` plugin: Please also enable **“Allow edits by maintainers”**, this will help to speed-up the review process as well. -### 5.5 Now be patient :) +### 5.6 Now be patient :) Plugins tests are run automatically on contributions using GitHub Actions. Depending on your code contributions, various tests will be run against your updated code automatically. From b08f744c71ce8965814bafbaf8b6d38a1a1d4b4b Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Sat, 1 Jan 2022 15:19:19 +0300 Subject: [PATCH 07/10] [device_info_plus] update versions for publishing (#663) --- packages/device_info_plus/device_info_plus/CHANGELOG.md | 1 + packages/device_info_plus/device_info_plus/pubspec.yaml | 8 ++++---- .../device_info_plus/device_info_plus_linux/CHANGELOG.md | 4 ++++ .../device_info_plus/device_info_plus_linux/pubspec.yaml | 4 ++-- .../device_info_plus_windows/CHANGELOG.md | 4 ++++ .../lib/src/device_info_plus_windows.dart | 2 +- .../device_info_plus_windows/pubspec.yaml | 4 ++-- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/packages/device_info_plus/device_info_plus/CHANGELOG.md b/packages/device_info_plus/device_info_plus/CHANGELOG.md index f98971a45a..188fc94e0a 100644 --- a/packages/device_info_plus/device_info_plus/CHANGELOG.md +++ b/packages/device_info_plus/device_info_plus/CHANGELOG.md @@ -1,6 +1,7 @@ ## 3.2.1 - Fix warnings when building for macOS +- Use automatic plugin registration on Linux and Windows ## 3.2.0 diff --git a/packages/device_info_plus/device_info_plus/pubspec.yaml b/packages/device_info_plus/device_info_plus/pubspec.yaml index ae2498065f..0104fda17a 100644 --- a/packages/device_info_plus/device_info_plus/pubspec.yaml +++ b/packages/device_info_plus/device_info_plus/pubspec.yaml @@ -26,10 +26,10 @@ dependencies: flutter: sdk: flutter device_info_plus_platform_interface: ^2.3.0 - device_info_plus_linux: ^2.1.0 device_info_plus_macos: ^2.2.1 + device_info_plus_linux: ^2.1.1 device_info_plus_web: ^2.1.0 - device_info_plus_windows: ^2.1.0 + device_info_plus_windows: ^2.1.1 dev_dependencies: test: ^1.16.4 @@ -38,5 +38,5 @@ dev_dependencies: flutter_lints: ^1.0.4 environment: - sdk: ">=2.12.0 <3.0.0" - flutter: ">=1.12.13+hotfix.5" + sdk: '>=2.12.0 <3.0.0' + flutter: '>=1.12.13+hotfix.5' diff --git a/packages/device_info_plus/device_info_plus_linux/CHANGELOG.md b/packages/device_info_plus/device_info_plus_linux/CHANGELOG.md index 97c41c6722..b87a445da4 100644 --- a/packages/device_info_plus/device_info_plus_linux/CHANGELOG.md +++ b/packages/device_info_plus/device_info_plus_linux/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.1.1 + +- Use automatic plugin registration + ## 2.1.0 - add toMap to models diff --git a/packages/device_info_plus/device_info_plus_linux/pubspec.yaml b/packages/device_info_plus/device_info_plus_linux/pubspec.yaml index 476d51029a..95c9a4f142 100644 --- a/packages/device_info_plus/device_info_plus_linux/pubspec.yaml +++ b/packages/device_info_plus/device_info_plus_linux/pubspec.yaml @@ -1,6 +1,6 @@ name: device_info_plus_linux description: Linux implementation of the device_info_plus plugin -version: 2.1.0 +version: 2.1.1 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ @@ -25,4 +25,4 @@ flutter: implements: device_info_plus platforms: linux: - dartPluginClass: DeviceInfoLinux \ No newline at end of file + dartPluginClass: DeviceInfoLinux diff --git a/packages/device_info_plus/device_info_plus_windows/CHANGELOG.md b/packages/device_info_plus/device_info_plus_windows/CHANGELOG.md index a92d7db572..c55825e89b 100644 --- a/packages/device_info_plus/device_info_plus_windows/CHANGELOG.md +++ b/packages/device_info_plus/device_info_plus_windows/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.1.1 + +- Use automatic plugin registration + ## 2.1.0 - add toMap to models diff --git a/packages/device_info_plus/device_info_plus_windows/lib/src/device_info_plus_windows.dart b/packages/device_info_plus/device_info_plus_windows/lib/src/device_info_plus_windows.dart index 94af98c355..e9713c6fb2 100644 --- a/packages/device_info_plus/device_info_plus_windows/lib/src/device_info_plus_windows.dart +++ b/packages/device_info_plus/device_info_plus_windows/lib/src/device_info_plus_windows.dart @@ -9,7 +9,7 @@ import 'package:win32/win32.dart'; /// The Windows implementation of [DeviceInfoPlatform]. class DeviceInfoWindows extends DeviceInfoPlatform { - /// Register this dart class as the platform implementation for linux + /// Register this dart class as the platform implementation for windows static void registerWith() { DeviceInfoPlatform.instance = DeviceInfoWindows(); } diff --git a/packages/device_info_plus/device_info_plus_windows/pubspec.yaml b/packages/device_info_plus/device_info_plus_windows/pubspec.yaml index 1188f0950d..cf80901757 100644 --- a/packages/device_info_plus/device_info_plus_windows/pubspec.yaml +++ b/packages/device_info_plus/device_info_plus_windows/pubspec.yaml @@ -1,6 +1,6 @@ name: device_info_plus_windows description: Windows implementation of the device_info_plus plugin -version: 2.1.0 +version: 2.1.1 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ @@ -24,4 +24,4 @@ flutter: implements: device_info_plus platforms: windows: - dartPluginClass: DeviceInfoWindows \ No newline at end of file + dartPluginClass: DeviceInfoWindows From 7e867ca25d3ab3cbdb8e3b45d41f32b43ee44195 Mon Sep 17 00:00:00 2001 From: nohli <43643339+nohli@users.noreply.github.com> Date: Wed, 29 Dec 2021 15:13:56 +0100 Subject: [PATCH 08/10] Update changelogs --- packages/device_info_plus/device_info_plus/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/device_info_plus/device_info_plus/CHANGELOG.md b/packages/device_info_plus/device_info_plus/CHANGELOG.md index 188fc94e0a..9f9f02bf3f 100644 --- a/packages/device_info_plus/device_info_plus/CHANGELOG.md +++ b/packages/device_info_plus/device_info_plus/CHANGELOG.md @@ -2,6 +2,7 @@ - Fix warnings when building for macOS - Use automatic plugin registration on Linux and Windows +- Fix warnings when building for macOS ## 3.2.0 From 56652916cc7b22296115620d81e99146ec9303bd Mon Sep 17 00:00:00 2001 From: nohli <43643339+nohli@users.noreply.github.com> Date: Sat, 1 Jan 2022 13:35:03 +0100 Subject: [PATCH 09/10] Revert auto-format --- packages/device_info_plus/device_info_plus/pubspec.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/device_info_plus/device_info_plus/pubspec.yaml b/packages/device_info_plus/device_info_plus/pubspec.yaml index 0104fda17a..a97f7d3ce4 100644 --- a/packages/device_info_plus/device_info_plus/pubspec.yaml +++ b/packages/device_info_plus/device_info_plus/pubspec.yaml @@ -38,5 +38,5 @@ dev_dependencies: flutter_lints: ^1.0.4 environment: - sdk: '>=2.12.0 <3.0.0' - flutter: '>=1.12.13+hotfix.5' + sdk: ">=2.12.0 <3.0.0" + flutter: ">=1.12.13+hotfix.5" From 8f00f81ec40bc5dd700f8f14b6ef864b8a8e9c76 Mon Sep 17 00:00:00 2001 From: nohli <43643339+nohli@users.noreply.github.com> Date: Sat, 1 Jan 2022 13:53:41 +0100 Subject: [PATCH 10/10] Update CHANGELOG.md --- packages/device_info_plus/device_info_plus/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/device_info_plus/device_info_plus/CHANGELOG.md b/packages/device_info_plus/device_info_plus/CHANGELOG.md index 188fc94e0a..6686ce35bb 100644 --- a/packages/device_info_plus/device_info_plus/CHANGELOG.md +++ b/packages/device_info_plus/device_info_plus/CHANGELOG.md @@ -1,7 +1,8 @@ ## 3.2.1 -- Fix warnings when building for macOS +- iOS: fix `identifierForVendor` (can be `null` in rare circumstances) - Use automatic plugin registration on Linux and Windows +- Fix warnings when building for macOS ## 3.2.0