From f3a57fe0aeaeebf58d2c8fe404467d40f8fbffea Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 9 Feb 2021 11:30:18 +0200 Subject: [PATCH] Set version --- .github/workflows/build.yml | 4 ++++ lib/flutter_version.dart | 10 ++++++++++ lib/ui/app/menu_drawer.dart | 9 +++++++++ pubspec.lock | 8 ++++---- pubspec.yaml | 2 +- 5 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 lib/flutter_version.dart diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 933ac844a..b4280d600 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,10 @@ jobs: cp android/app/build.gradle.prod android/app/build.gradle sed -i 's/secret/${{secrets.api_secret}}/g' lib/.env.dart sed -i 's/dns/${{secrets.app_sentry}}/g' lib/.env.dart + - run: | + echo "const version = const " > lib/flutter_version.dart + flutter --version --machine >> lib/flutter_version.dart + echo ";" >> lib/flutter_version.dart - run: flutter upgrade - run: flutter config --enable-web - run: flutter build web --web-renderer html --release diff --git a/lib/flutter_version.dart b/lib/flutter_version.dart new file mode 100644 index 000000000..f430d2117 --- /dev/null +++ b/lib/flutter_version.dart @@ -0,0 +1,10 @@ +const FLUTTER_VERSION = const { + "frameworkVersion": "1.26.0-17.2.pre", + "channel": "dev", + "repositoryUrl": "git@github.com:flutter/flutter.git", + "frameworkRevision": "79b49b9e1057f90ebf797725233c6b311722de69", + "frameworkCommitDate": "2021-02-03 15:33:39 -0800", + "engineRevision": "2c527d6c7e70e2f51bca1a46f1174b250f84c5da", + "dartSdkVersion": "2.12.0 (build 2.12.0-259.8.beta)", + "flutterRoot": "C:\\Users\\hillel\\Documents\\flutter" +}; diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart index 1d15bdd8f..e56c6a1ed 100644 --- a/lib/ui/app/menu_drawer.dart +++ b/lib/ui/app/menu_drawer.dart @@ -6,6 +6,7 @@ import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:invoiceninja_flutter/data/web_client.dart'; +import 'package:invoiceninja_flutter/flutter_version.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/pref_state.dart'; @@ -890,6 +891,14 @@ void _showAbout(BuildContext context) async { showToast(localization.copiedToClipboard .replaceFirst(':value', state.appVersion)); }, + onLongPress: () { + showMessageDialog( + context: context, + message: FLUTTER_VERSION['channel'].toUpperCase() + + ' • ' + + FLUTTER_VERSION['frameworkVersion'], + ); + }, ), Padding( padding: const EdgeInsets.only(top: 24), diff --git a/pubspec.lock b/pubspec.lock index b37dc51da..d2802129d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -196,7 +196,7 @@ packages: name: coverage url: "https://pub.dartlang.org" source: hosted - version: "0.15.1" + version: "0.15.2" crypto: dependency: transitive description: @@ -442,7 +442,7 @@ packages: name: flutter_styled_toast url: "https://pub.dartlang.org" source: hosted - version: "1.4.0+1" + version: "1.5.1+1" flutter_test: dependency: transitive description: flutter @@ -816,7 +816,7 @@ packages: name: pubspec_parse url: "https://pub.dartlang.org" source: hosted - version: "0.1.7" + version: "0.1.8" quiver: dependency: transitive description: @@ -1185,7 +1185,7 @@ packages: name: webkit_inspection_protocol url: "https://pub.dartlang.org" source: hosted - version: "0.7.4" + version: "0.7.5" webview_flutter: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index d912be3e4..c011cadee 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -58,7 +58,7 @@ dependencies: # idb_shim: ^1.11.1+1 flutter_launcher_icons: ^0.8.0 overflow_view: ^0.2.1 - flutter_styled_toast: 1.4.0+1 #TODO add ^ + flutter_styled_toast: ^1.5.1+1 permission_handler: ^5.0.1+1 contacts_service: ^0.4.6 extended_image: 1.3.1-dev #TODO remove