diff --git a/.github/workflows/build_beta.yml b/.github/workflows/build_beta.yml index b64f83538..11e746a23 100644 --- a/.github/workflows/build_beta.yml +++ b/.github/workflows/build_beta.yml @@ -21,7 +21,8 @@ jobs: - name: Setup Flutter run: | flutter doctor -v - #rm pubspec.lock + cp pubspec.beta.yaml pubspec.yaml + rm pubspec.lock flutter pub get flutter config --enable-web - name: Prepare App @@ -49,21 +50,4 @@ jobs: git add . git commit -m 'New admin portal - Beta [hosted]' git push - cd .. - - name: Build Selfhosted App - run: | - cp lib/utils/oauth.dart.foss lib/utils/oauth.dart - cp lib/ui/app/upgrade_dialog.dart.foss lib/ui/app/upgrade_dialog.dart - cp pubspec.foss.yaml pubspec.yaml - rm pubspec.lock - - flutter build web --web-renderer html --release - - git clone https://${{secrets.commit_secret}}@github.com/invoiceninja/invoiceninja.git invoiceninja_foss - cd invoiceninja_foss - git checkout v5-develop - cp ../build/web/main.dart.js ./public/main.foss.beta.dart.js - #cp ../build/web/main.dart.js.map ./public/main.foss.beta.dart.js.map - git add . - git commit -m 'New admin portal - Beta [selfhosted]' - git push \ No newline at end of file + cd .. \ No newline at end of file diff --git a/.github/workflows/build_last.yml b/.github/workflows/build_last.yml index b41f1e304..c45bf4cd1 100644 --- a/.github/workflows/build_last.yml +++ b/.github/workflows/build_last.yml @@ -21,7 +21,7 @@ jobs: - name: Setup Flutter run: | flutter doctor -v - cp pubspec.any.yaml pubspec.yaml + cp pubspec.last.yaml pubspec.yaml rm pubspec.lock flutter pub get flutter config --enable-web @@ -50,21 +50,4 @@ jobs: git add . git commit -m 'New admin portal - Last [hosted]' git push - cd .. - - name: Build Selfhosted App - run: | - cp lib/utils/oauth.dart.foss lib/utils/oauth.dart - cp lib/ui/app/upgrade_dialog.dart.foss lib/ui/app/upgrade_dialog.dart - cp pubspec.foss.yaml pubspec.yaml - rm pubspec.lock - - flutter build web --web-renderer html --release - - git clone https://${{secrets.commit_secret}}@github.com/invoiceninja/invoiceninja.git invoiceninja_foss - cd invoiceninja_foss - git checkout v5-develop - cp ../build/web/main.dart.js ./public/main.foss.last.dart.js - #cp ../build/web/main.dart.js.map ./public/main.foss.last.dart.js.map - git add . - git commit -m 'New admin portal - Last [selfhosted]' - git push \ No newline at end of file + cd .. \ No newline at end of file diff --git a/pubspec.beta.yaml b/pubspec.beta.yaml new file mode 100644 index 000000000..58a2de116 --- /dev/null +++ b/pubspec.beta.yaml @@ -0,0 +1,89 @@ +name: invoiceninja_flutter +description: Client for Invoice Ninja +version: 5.0.58+58 +author: Hillel Coren +homepage: https://invoiceninja.com +documentation: https://invoiceninja.github.io +publish_to: none + +environment: + sdk: ">=2.9.0 <3.0.0" + +flutter_icons: + android: true + ios: true + image_path: "assets/images/mobile_icon.png" + adaptive_icon_foreground: "assets/images/mobile_icon.png" + adaptive_icon_background: "#0091EA" + +dependencies: + flutter: + sdk: flutter + flutter_localizations: + sdk: flutter + google_sign_in: ^5.0.7 + flutter_redux: ^0.8.2 + redux_logging: ^0.5.0 + http: ^0.13.3 + path_provider: ^2.0.2 + shared_preferences: ^2.0.6 + material_design_icons_flutter: ^4.0.5345 + built_value: ^8.1.2 + built_collection: ^5.1.0 + memoize: ^3.0.0 + cached_network_image: 3.0.0 # imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, + url_launcher: ^6.0.9 + share: ^2.0.4 + intl: ^0.17.0 + flutter_slidable: ^0.6.0 + charts_flutter: ^0.11.0 + qr_flutter: ^4.0.0 + local_auth: ^1.1.6 + sentry_flutter: ^5.1.0 + image_picker: ^0.8.3+1 + flutter_colorpicker: ^0.5.0 + flutter_json_viewer: ^1.0.1 + webview_flutter: ^2.0.10 + timeago: ^3.1.0 + native_pdf_view: ^4.1.0 + # flutter_typeahead: 1.8.0 + flutter_typeahead: + git: + url: git://github.com/hillelcoren/flutter_typeahead.git + flutter_share: ^2.0.0 + package_info: ^2.0.2 + rounded_loading_button: ^2.0.5 + version: ^2.0.0 + flutter_launcher_icons: ^0.9.1 + overflow_view: ^0.3.1 + flutter_styled_toast: ^2.0.0 + permission_handler: ^8.1.4+2 + file_picker: ^3.0.4 + draggable_scrollbar: ^0.1.0 + boardview: ^0.2.2 + pointer_interceptor: ^0.9.0 + contacts_service: ^0.6.1 + super_editor: ^0.1.0 + # quick_actions: ^0.2.1 + # idb_shim: ^1.11.1+1 + +dev_dependencies: + #flutter_driver: + # sdk: flutter + test: ^1.6.3 + flutter_test: + sdk: flutter + build_runner: ^2.1.0 + built_value_generator: ^8.1.1 + faker: ^2.0.0 + +flutter: + + uses-material-design: true + + assets: + - assets/images/icon.png + - assets/images/logo_light.png + - assets/images/logo_dark.png + - assets/images/google_logo.png + - assets/images/payment_types/ \ No newline at end of file diff --git a/pubspec.any.yaml b/pubspec.last.yaml similarity index 52% rename from pubspec.any.yaml rename to pubspec.last.yaml index b5707bf76..54699e138 100644 --- a/pubspec.any.yaml +++ b/pubspec.last.yaml @@ -21,61 +21,61 @@ dependencies: sdk: flutter flutter_localizations: sdk: flutter - google_sign_in: any - flutter_redux: any - redux_logging: any - http: any - path_provider: any - shared_preferences: any - material_design_icons_flutter: any - built_value: any - built_collection: any - memoize: any + google_sign_in: ^5.0.7 + flutter_redux: ^0.8.2 + redux_logging: ^0.5.0 + http: ^0.13.3 + path_provider: ^2.0.2 + shared_preferences: ^2.0.6 + material_design_icons_flutter: ^4.0.5345 + built_value: ^8.1.2 + built_collection: ^5.1.0 + memoize: ^3.0.0 cached_network_image: 3.0.0 # imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, - url_launcher: any - share: any - intl: any - flutter_slidable: any - charts_flutter: any - qr_flutter: any - local_auth: any - sentry_flutter: any - image_picker: any + url_launcher: ^6.0.9 + share: ^2.0.4 + intl: ^0.17.0 + flutter_slidable: ^0.6.0 + charts_flutter: ^0.11.0 + qr_flutter: ^4.0.0 + local_auth: ^1.1.6 + sentry_flutter: ^5.1.0 + image_picker: ^0.8.3+1 flutter_colorpicker: 0.4.0 - flutter_json_viewer: any - webview_flutter: any - timeago: any - native_pdf_view: any + flutter_json_viewer: ^1.0.1 + webview_flutter: ^2.0.10 + timeago: ^3.1.0 + native_pdf_view: ^4.1.0 # flutter_typeahead: 1.8.0 flutter_typeahead: git: url: git://github.com/hillelcoren/flutter_typeahead.git - flutter_share: any - package_info: any - rounded_loading_button: any - version: any - flutter_launcher_icons: any - overflow_view: any - flutter_styled_toast: any - permission_handler: any - file_picker: any - draggable_scrollbar: any - boardview: any - pointer_interceptor: any - contacts_service: any - super_editor: any + flutter_share: ^2.0.0 + package_info: ^2.0.2 + rounded_loading_button: ^2.0.5 + version: ^2.0.0 + flutter_launcher_icons: ^0.9.1 + overflow_view: ^0.3.1 + flutter_styled_toast: ^2.0.0 + permission_handler: ^8.1.4+2 + file_picker: ^3.0.4 + draggable_scrollbar: ^0.1.0 + boardview: ^0.2.2 + pointer_interceptor: ^0.9.0 + contacts_service: ^0.6.1 + super_editor: ^0.1.0 # quick_actions: ^0.2.1 # idb_shim: ^1.11.1+1 dev_dependencies: flutter_driver: sdk: flutter - test: any + test: ^1.6.3 flutter_test: sdk: flutter - build_runner: any - built_value_generator: any - faker: any + build_runner: ^2.1.0 + built_value_generator: ^8.1.1 + faker: ^2.0.0 flutter: