From 99b2d67f5c41064c48d0993c28e88b28cefdb83c Mon Sep 17 00:00:00 2001 From: Tricked <72335827+SkyBlockDev@users.noreply.github.com> Date: Sat, 19 Mar 2022 22:54:47 +0100 Subject: [PATCH] feat: fix ci and "master branch" --- .github/workflows/flutterci.yml | 10 +++--- pubspec.lock | 43 +++++++------------------- pubspec.yaml | 13 ++------ scripts/windows-setup-creator.iss | 2 +- windows/runner/resources/app_icon.ico | Bin 0 -> 2932 bytes 5 files changed, 18 insertions(+), 50 deletions(-) create mode 100644 windows/runner/resources/app_icon.ico diff --git a/.github/workflows/flutterci.yml b/.github/workflows/flutterci.yml index f126822..c602ea5 100644 --- a/.github/workflows/flutterci.yml +++ b/.github/workflows/flutterci.yml @@ -81,12 +81,10 @@ jobs: draft: true prerelease: false files: | - build/installer/ArgonInstaller-windows-x86_64-setup.exe - scripts/ArgonInstaller-windows-x86_64-setup.exe - scripts/ArgonInstaller-windows-x86_64-setup.exe.exe - build/argoninstaller.*.nupkg - scripts/Output/ArgonInstaller-windows-x86_64-setup.exe.exe - scripts/Output/ArgonInstaller-windows-x86_64-setup.exe + build/installer/*-setup.exe + build/*-setup.exe + scripts/*-setup.exe + scripts/Output/*-setup.exe ArgonInstaller-windows-x86_64.zip token: ${{ secrets.GITHUB_TOKEN }} diff --git a/pubspec.lock b/pubspec.lock index 2f3b3cf..f83dbc4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -120,20 +120,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.1" - cli_dialog: - dependency: transitive - description: - name: cli_dialog - url: "https://pub.dartlang.org" - source: hosted - version: "0.5.0" - cli_util: - dependency: transitive - description: - name: cli_util - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.5" clock: dependency: transitive description: @@ -176,13 +162,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.0.1" - dart_console: - dependency: transitive - description: - name: dart_console - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" dart_style: dependency: transitive description: @@ -277,10 +256,12 @@ packages: fluent_ui: dependency: "direct main" description: - name: fluent_ui - url: "https://pub.dartlang.org" - source: hosted - version: "3.9.1" + path: "." + ref: HEAD + resolved-ref: "99282610c6660da08030ec2550464b9de069563d" + url: "https://github.com/bdlukaa/fluent_ui.git" + source: git + version: "3.9.2" flutter: dependency: "direct main" description: flutter @@ -300,6 +281,11 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.4" + flutter_localizations: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" flutter_markdown: dependency: "direct main" description: @@ -492,13 +478,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.1" - msix: - dependency: "direct dev" - description: - name: msix - url: "https://pub.dartlang.org" - source: hosted - version: "3.3.2" nested: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 8540b5c..1ef9769 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,7 +17,6 @@ dependencies: flutter_native_splash: ^2.0.5 url_launcher: ^6.0.20 url_strategy: ^0.2.0 - # bitsdojo_window: ^0.1.1+1 window_manager: ^0.2.0 shared_preferences: ^2.0.8 flutter_svg: ^1.0.3 @@ -31,7 +30,8 @@ dependencies: file_selector_macos: file_selector_windows: file_selector: ^0.8.3 - fluent_ui: ^3.9.1 + fluent_ui: + git: https://github.com/bdlukaa/fluent_ui.git dev_dependencies: build_runner: ^2.0.0 @@ -39,15 +39,6 @@ dev_dependencies: dependency_validator: ^3.0.0 isar_generator: 2.2.1 flutter_lints: ^1.0.0 - msix: ^3.3.1 - -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -msix_config: - identity_name: pro.tricked.argoninstaller - install_certificate: false - capabilities: internetClient flutter_native_splash: color: '#42a5f5' diff --git a/scripts/windows-setup-creator.iss b/scripts/windows-setup-creator.iss index 57bb132..266940e 100644 --- a/scripts/windows-setup-creator.iss +++ b/scripts/windows-setup-creator.iss @@ -27,7 +27,7 @@ DisableProgramGroupPage=yes ; Remove the following line to run in administrative install mode (install for all users.) PrivilegesRequired=lowest PrivilegesRequiredOverridesAllowed=dialog -OutputBaseFilename=ArgonInstaller-windows-x86_64-setup +OutputBaseFilename=argoninstaller-windows-x86_64-setup Compression=lzma SolidCompression=yes WizardStyle=modern diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..b2b1fada4c7f8790a47bd377019b4a26b00e290d GIT binary patch literal 2932 zcmcImd011&7N3OGunM8@3J9%MiB!M^sX!p&!Xg6CAgD-!S^>){ASeWKt%56yrLrg? z(N+*qP*6~zNhn*zk3|%aO&|!Au!OKBB#_&Cq3`|m`d<6JulIg4bM866nK^UjH)k#Y z801AC3@`>16#za#cS5<{w76(~vF524Kp_QUKQ^A5t<%O@qPntT_rv=!#Hrd3LaRTA3HY4CL1h9TU$OAO~=nNzA9+KVH+t6)k$Bf%Z`7{^v9lm z9NvhBUwv%-1?Py14 zx9Ai&v^2Lf8=E2OrCToL%k7Wn2@XkCUyGzSPDNr)8L3Mn((|D_?9_~zedJC5v2FbY zvq!lKz*DJzI_a(cL)ooSf^pxaK4g#OkwQYs{}7x2fDq^(G+Cd4VOf-HI4W*#ap*<4 z`N@F}LDH5}ig8xRB!PY92(?glX`=J|M&rt#0j2JSi__EdSK-NYIt>IGfUqRP0ZDCe zZ!aoaXF6Vg$8;8eX&$ncJqg)}yC5$o$7P z`pB?*fX(Fl!!LhAqxd~&Ibx}h6Sf`570FP=M&RL!u{tU{xHTU#E2PH;$Cv3MYN&(^ zH4*y7Z~WabzTU6`3jG1gdO{|3Z-tExTW5##opH1l`yg3?t7+qDd%3+bVtvJE>u7M} z>wt}!Y%^Ls=9PnnQ>%-P*TY7o$!5DKp{KRQSVA*TS~UL4TEG&LNtH$&WRL^JTp7=-jGR8t4n3B0hdD|3JUr6K-$bAfH z1pj#8NtjyzPA_5wvks7NWA{E@v9IF3%ZFA!T#nLS!1c_7#KaG=n|)^Zor@!~YtJYJ ztB_$>@{kv$GQ6$SB>b4&V@XpQGbIzO{>bOTH6%*kGWWlW(xp>ce91@^TN%pAvnG8IdgDXDZ%#s;EXOK-wXkOjaW^XCb{90d7&U4ciG!x z&1-xbb?S#cKGRD&mG!ySX`j%}a+Dlg3sCd=+j@H=cew`jJYKfwhC9Zz5I)e{#))4{ z?SA>Z$f39Zr3@DWH3y%HyJjC$l#F1buOGvic)=YBhuM;Pfl=A%TZcX*5PbE%py)jB z7(){ZP{olF=%MF6-Z`HK&DqN)11Y*KYzZCizE?=M6|eOW;#?!?OKJ!b`lno)*FXZ9 zWMb%ftSz@9A~XtNZzKH`pGo!F6jCj=G-skAwQvEv2@;tkj_Y8=Mm;C68u&(KR9m7` zy5q$S*eUcLgWg~*UJ+P)J_lwGd9NL2PN32CQw5&4u)Kw{3<9g}1>9Adnm@rPlb%6L zU=YJ((ZUjjx1Zwsr!wSNlzryg6EPEDoQlJ9`KP&qP^YE=}_>@ z#dg^Z7f$o3G$LYxghVBaDSR4dTTDN}?|vI>fGV$GH1i?vX0IG(qN-*LhI5C$hr{T zy1}b>naS(rN%e`=yn|;Y`!PZ-U*CKvszC5N%h#)t67;E;m`$R62-#zo4wAVhE2m9c zo)w9EUs@r-rxnYDPc(j7b}I`Ds$DU)d^&GHCJ>L6uP7}*wHs!E&ot|^9OrAG0dN7H zSyIC9CVD;f&{AA{9aZ{FCS6HEd4SYQFn%~J%!b887nmkXfY~eSAz;(s7+NBw zQz-&(8cVAbE_FD