From dd8ba3f56740ba2e1b1e98e2e09dc3d110963ea9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Apr 2022 01:03:41 +0000 Subject: [PATCH 01/11] Bump json_serializable from 6.1.5 to 6.1.6 Bumps [json_serializable](https://github.com/google/json_serializable.dart) from 6.1.5 to 6.1.6. - [Release notes](https://github.com/google/json_serializable.dart/releases) - [Commits](https://github.com/google/json_serializable.dart/compare/json_serializable-v6.1.5...json_serializable-v6.1.6) --- updated-dependencies: - dependency-name: json_serializable dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.lock b/pubspec.lock index c197e41b..30ffe679 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -538,7 +538,7 @@ packages: name: json_serializable url: "https://pub.dartlang.org" source: hosted - version: "6.1.5" + version: "6.1.6" klizma: dependency: transitive description: From 4503ec93e734c4c75201288453770c019209a5cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Apr 2022 01:04:01 +0000 Subject: [PATCH 02/11] Bump build_runner from 2.1.8 to 2.1.10 Bumps [build_runner](https://github.com/dart-lang/build) from 2.1.8 to 2.1.10. - [Release notes](https://github.com/dart-lang/build/releases) - [Commits](https://github.com/dart-lang/build/compare/build_daemon-v2.1.8...build_runner-v2.1.10) --- updated-dependencies: - dependency-name: build_runner dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index c197e41b..adf3b61b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -70,7 +70,7 @@ packages: name: build_daemon url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.1.0" build_resolvers: dependency: transitive description: @@ -84,7 +84,7 @@ packages: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "2.1.8" + version: "2.1.10" build_runner_core: dependency: transitive description: From 2161a618d343312e198f9f5f1e5c6ef80d0a2425 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Apr 2022 01:44:12 +0000 Subject: [PATCH 03/11] Bump flutter_typeahead from 3.2.4 to 3.2.5 Bumps [flutter_typeahead](https://github.com/AbdulRahmanAlHamali/flutter_typeahead) from 3.2.4 to 3.2.5. - [Release notes](https://github.com/AbdulRahmanAlHamali/flutter_typeahead/releases) - [Changelog](https://github.com/AbdulRahmanAlHamali/flutter_typeahead/blob/master/CHANGELOG.md) - [Commits](https://github.com/AbdulRahmanAlHamali/flutter_typeahead/commits) --- updated-dependencies: - dependency-name: flutter_typeahead dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 48a79bf0..2a25548d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -400,7 +400,7 @@ packages: name: flutter_typeahead url: "https://pub.dartlang.org" source: hosted - version: "3.2.4" + version: "3.2.5" flutter_web_plugins: dependency: transitive description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index 9c6d30b8..d2d06ab5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,7 +39,7 @@ dependencies: equatable: ^2.0.3 flutter_calendar_carousel: ^2.0.3 flutter_html: ^2.1.2 - flutter_typeahead: ^3.2.0 + flutter_typeahead: ^3.2.5 font_awesome_flutter: ">=9.1.0 <11.0.0" http: ^0.13.3 image_picker: ^0.8.4+9 From 53eae73f780e60e87d6aaac3f8278da2e31a03e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Apr 2022 01:44:29 +0000 Subject: [PATCH 04/11] Bump url_launcher from 6.0.20 to 6.1.0 Bumps [url_launcher](https://github.com/flutter/plugins) from 6.0.20 to 6.1.0. - [Release notes](https://github.com/flutter/plugins/releases) - [Commits](https://github.com/flutter/plugins/compare/url_launcher-v6.0.20...url_launcher-v6.1.0) --- updated-dependencies: - dependency-name: url_launcher dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 48a79bf0..16a36a5c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -942,7 +942,7 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.20" + version: "6.1.0" url_launcher_android: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 9c6d30b8..cc3bad3b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -51,7 +51,7 @@ dependencies: rive: ^0.8.1 shared_preferences: ^2.0.13 table_calendar: ^3.0.2 - url_launcher: ^6.0.20 + url_launcher: ^6.1.0 flutter_barcode_scanner: ^2.0.0 video_player: ^2.2.16 From f9ecebfa8d7c529d9e36f2ca37a5b49333c7aa38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Apr 2022 01:44:47 +0000 Subject: [PATCH 05/11] Bump video_player from 2.3.0 to 2.4.0 Bumps [video_player](https://github.com/flutter/plugins) from 2.3.0 to 2.4.0. - [Release notes](https://github.com/flutter/plugins/releases) - [Commits](https://github.com/flutter/plugins/compare/video_player-v2.3.0...video_player-v2.4.0) --- updated-dependencies: - dependency-name: video_player dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 48a79bf0..ddd112cc 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1026,7 +1026,7 @@ packages: name: video_player url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.4.0" video_player_android: dependency: transitive description: @@ -1162,4 +1162,4 @@ packages: version: "3.1.0" sdks: dart: ">=2.15.1 <3.0.0" - flutter: ">=2.8.0" + flutter: ">=2.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index 9c6d30b8..ea57e1a1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -53,7 +53,7 @@ dependencies: table_calendar: ^3.0.2 url_launcher: ^6.0.20 flutter_barcode_scanner: ^2.0.0 - video_player: ^2.2.16 + video_player: ^2.4.0 dev_dependencies: flutter_test: From f314e3dba15dad850a312863d4236f0019b936ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 00:49:08 +0000 Subject: [PATCH 06/11] Bump json_annotation from 4.4.0 to 4.5.0 Bumps [json_annotation](https://github.com/google/json_serializable.dart) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/google/json_serializable.dart/releases) - [Commits](https://github.com/google/json_serializable.dart/compare/json_annotation-v4.4.0...json_annotation-v4.5.0) --- updated-dependencies: - dependency-name: json_annotation dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index b739e41f..f8db3000 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -531,14 +531,14 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.4.0" + version: "4.5.0" json_serializable: dependency: "direct dev" description: name: json_serializable url: "https://pub.dartlang.org" source: hosted - version: "6.1.6" + version: "6.2.0" klizma: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 68c69e13..995de5c8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -44,7 +44,7 @@ dependencies: http: ^0.13.3 image_picker: ^0.8.4+9 intl: ^0.17.0 - json_annotation: ^4.3.0 + json_annotation: ^4.5.0 version: ^2.0.0 package_info: ^2.0.2 provider: ^6.0.1 From 720855d5e12edb441616238b63062a26ef712aef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 00:49:35 +0000 Subject: [PATCH 07/11] Bump json_serializable from 6.1.6 to 6.2.0 Bumps [json_serializable](https://github.com/google/json_serializable.dart) from 6.1.6 to 6.2.0. - [Release notes](https://github.com/google/json_serializable.dart/releases) - [Commits](https://github.com/google/json_serializable.dart/compare/json_serializable-v6.1.6...json_serializable-v6.2.0) --- updated-dependencies: - dependency-name: json_serializable dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index b739e41f..f8db3000 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -531,14 +531,14 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.4.0" + version: "4.5.0" json_serializable: dependency: "direct dev" description: name: json_serializable url: "https://pub.dartlang.org" source: hosted - version: "6.1.6" + version: "6.2.0" klizma: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 68c69e13..4f08d34e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -62,7 +62,7 @@ dev_dependencies: # sdk: flutter build_runner: ^2.1.2 flutter_launcher_icons: ^0.9.1 - json_serializable: ^6.0.1 + json_serializable: ^6.2.0 mockito: ^5.1.0 network_image_mock: ^2.0.1 flutter_lints: ^1.0.4 From e95e5510672c008a7092481e7d1b152239c27189 Mon Sep 17 00:00:00 2001 From: Artem Date: Sun, 8 May 2022 11:53:46 +0200 Subject: [PATCH 08/11] Added translation using Weblate (Ukrainian) --- lib/l10n/app_uk.arb | 1 + 1 file changed, 1 insertion(+) create mode 100644 lib/l10n/app_uk.arb diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/lib/l10n/app_uk.arb @@ -0,0 +1 @@ +{} From e5b6ad7b25cca89e83102ebed71bdbda4ec66478 Mon Sep 17 00:00:00 2001 From: Artem Date: Sun, 8 May 2022 09:56:34 +0000 Subject: [PATCH 09/11] Translated using Weblate (Ukrainian) Currently translated at 7.5% (12 of 159 strings) Translation: wger Workout Manager/Mobile App Translate-URL: https://hosted.weblate.org/projects/wger/mobile/uk/ --- lib/l10n/app_uk.arb | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb index 0967ef42..8a27b681 100644 --- a/lib/l10n/app_uk.arb +++ b/lib/l10n/app_uk.arb @@ -1 +1,42 @@ -{} +{ + "weight": "Вага", + "@weight": { + "description": "The weight of a workout log or body weight entry" + }, + "login": "Увійти", + "@login": { + "description": "Text for login button" + }, + "logout": "Вийти", + "@logout": { + "description": "Text for logout button" + }, + "register": "Реєстрація", + "@register": { + "description": "Text for registration button" + }, + "useDefaultServer": "Використати сервер за замовчуванням", + "@useDefaultServer": { + "description": "Toggle button allowing users to switch between the default and a custom wger server" + }, + "useCustomServer": "Використати користувацький сервер", + "@useCustomServer": { + "description": "Toggle button allowing users to switch between the default and a custom wger server" + }, + "invalidUrl": "Будь ласка, введіть прийнятну URL-адресу", + "@invalidUrl": { + "description": "Error message when the user enters an invalid URL, e.g. in the login form" + }, + "nutritionalPlan": "План харчування", + "@nutritionalPlan": {}, + "difference": "Різниця", + "@difference": {}, + "edit": "Змінити", + "@edit": {}, + "delete": "Видалити", + "@delete": {}, + "date": "Дата", + "@date": { + "description": "The date of a workout log or body weight entry" + } +} From aa536408e88df174ea0c89d4a83309cb053958aa Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Tue, 10 May 2022 14:46:14 +0200 Subject: [PATCH 10/11] Commit updated pubspec.lock --- pubspec.lock | 73 ++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 40 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index f8db3000..5843a457 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,14 +7,14 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "34.0.0" + version: "38.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "3.2.0" + version: "3.4.1" android_metadata: dependency: "direct main" description: @@ -28,7 +28,7 @@ packages: name: archive url: "https://pub.dartlang.org" source: hosted - version: "3.2.1" + version: "3.3.0" args: dependency: transitive description: @@ -56,7 +56,7 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "2.2.1" + version: "2.3.0" build_config: dependency: transitive description: @@ -77,7 +77,7 @@ packages: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" + version: "2.0.8" build_runner: dependency: "direct dev" description: @@ -105,21 +105,21 @@ packages: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "8.1.4" + version: "8.3.0" camera: dependency: "direct main" description: name: camera url: "https://pub.dartlang.org" source: hosted - version: "0.9.4+14" + version: "0.9.4+21" camera_platform_interface: dependency: transitive description: name: camera_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.1.5" + version: "2.1.6" camera_web: dependency: transitive description: @@ -175,7 +175,7 @@ packages: name: chewie url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.2" chewie_audio: dependency: transitive description: @@ -190,13 +190,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.1" - cli_util: - dependency: transitive - description: - name: cli_util - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.5" clock: dependency: transitive description: @@ -231,14 +224,14 @@ packages: name: cross_file url: "https://pub.dartlang.org" source: hosted - version: "0.3.2" + version: "0.3.3" crypto: dependency: transitive description: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.2" csslib: dependency: transitive description: @@ -259,7 +252,7 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "2.2.1" + version: "2.2.3" equatable: dependency: "direct main" description: @@ -355,7 +348,7 @@ packages: name: flutter_layout_grid url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.6" flutter_lints: dependency: "direct dev" description: @@ -496,7 +489,7 @@ packages: name: image_picker_ios url: "https://pub.dartlang.org" source: hosted - version: "0.8.4+11" + version: "0.8.5" image_picker_platform_interface: dependency: transitive description: @@ -601,7 +594,7 @@ packages: name: mime url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" mockito: dependency: "direct dev" description: @@ -734,7 +727,7 @@ packages: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" pubspec_parse: dependency: transitive description: @@ -748,14 +741,14 @@ packages: name: quiver url: "https://pub.dartlang.org" source: hosted - version: "3.0.1+1" + version: "3.1.0" rfc_6901: dependency: transitive description: name: rfc_6901 url: "https://pub.dartlang.org" source: hosted - version: "0.1.0" + version: "0.1.1" rive: dependency: "direct main" description: @@ -825,7 +818,7 @@ packages: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" shelf_web_socket: dependency: transitive description: @@ -851,14 +844,14 @@ packages: name: source_gen url: "https://pub.dartlang.org" source: hosted - version: "1.2.1" + version: "1.2.2" source_helper: dependency: transitive description: name: source_helper url: "https://pub.dartlang.org" source: hosted - version: "1.3.1" + version: "1.3.2" source_span: dependency: transitive description: @@ -949,7 +942,7 @@ packages: name: url_launcher_android url: "https://pub.dartlang.org" source: hosted - version: "6.0.15" + version: "6.0.16" url_launcher_ios: dependency: transitive description: @@ -984,7 +977,7 @@ packages: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" + version: "2.0.9" url_launcher_windows: dependency: transitive description: @@ -1033,35 +1026,35 @@ packages: name: video_player_android url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.3.2" video_player_avfoundation: dependency: transitive description: name: video_player_avfoundation url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.3.3" video_player_platform_interface: dependency: transitive description: name: video_player_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "5.1.0" + version: "5.1.2" video_player_web: dependency: transitive description: name: video_player_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.7" + version: "2.0.8" wakelock: dependency: transitive description: name: wakelock url: "https://pub.dartlang.org" source: hosted - version: "0.6.1+1" + version: "0.6.1+2" wakelock_macos: dependency: transitive description: @@ -1103,7 +1096,7 @@ packages: name: web_socket_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.2.0" webview_flutter: dependency: transitive description: @@ -1117,7 +1110,7 @@ packages: name: webview_flutter_android url: "https://pub.dartlang.org" source: hosted - version: "2.8.3" + version: "2.8.6" webview_flutter_platform_interface: dependency: transitive description: @@ -1131,14 +1124,14 @@ packages: name: webview_flutter_wkwebview url: "https://pub.dartlang.org" source: hosted - version: "2.7.1" + version: "2.7.3" win32: dependency: transitive description: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.4.1" + version: "2.5.2" xdg_directories: dependency: transitive description: @@ -1161,5 +1154,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.15.1 <3.0.0" + dart: ">=2.16.0 <3.0.0" flutter: ">=2.10.0" From 46ad19dd45e34c129d6396f2f4bc0510bc223e3d Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Tue, 10 May 2022 14:46:27 +0200 Subject: [PATCH 11/11] Update release steps --- fastlane/metadata/android/README.md | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/fastlane/metadata/android/README.md b/fastlane/metadata/android/README.md index 46cc7441..934ba465 100644 --- a/fastlane/metadata/android/README.md +++ b/fastlane/metadata/android/README.md @@ -1,4 +1,6 @@ -# Dry-run release before uploading +# Release process + +## 1. Dry-run release before uploading * Increase build nr in pubspec.yaml * `flutter build appbundle --release` @@ -7,13 +9,22 @@ It might be necessary to repeat these steps if upload_to_play_store returns any errors such as a missing title or similar. -# Accepted language codes +Also note that if a language was added over the weblate UI, it might be necessary +to set the correct language code: + -https://support.google.com/googleplay/android-developer/answer/9844778?hl=en#zippy=%2Cview-list-of-available-languages +## 2. Push tags to trigger release -# Push tags to trigger release +Make sure that the commit that will be tagged was already pushed or didn't change +any dart code, otherwise the automatic linter might push a "correction" commit +and the build step will fail. -Set the vX.Y.Z tag here, push it and delete it, since it gets re-created by github actions -to just X.Y.Z +Set the vX.Y.Z tag locally, push it and delete it. It will get recreated to X.Y.Z. +by github actions. -`TAG=vX.Y.Z && git tag $TAG && git push origin $TAG && git tag -d $TAG` \ No newline at end of file +`TAG=vX.Y.Z && git tag $TAG && git push origin $TAG && git tag -d $TAG` + + +## 3. Edit release + +I necessary, edit the created release on github