From ecf52cc895438b3f8adedb7232da914b38aeb20f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Mar 2026 19:11:00 +0000 Subject: [PATCH 1/5] Bump the pub-deps group with 3 updates Bumps the pub-deps group with 3 updates: [flutter_lints](https://github.com/flutter/packages/tree/main/packages), [flutter_svg](https://github.com/flutter/packages/tree/main/third_party/packages) and [url_launcher](https://github.com/flutter/packages/tree/main/packages/url_launcher). Updates `flutter_lints` from 5.0.0 to 6.0.0 - [Commits](https://github.com/flutter/packages/commits/flutter_lints-v6.0.0/packages) Updates `flutter_svg` from 2.0.17 to 2.2.4 - [Commits](https://github.com/flutter/packages/commits/flutter_svg-v2.2.4/third_party/packages) Updates `url_launcher` from 6.3.1 to 6.3.2 - [Commits](https://github.com/flutter/packages/commits/url_launcher-v6.3.2/packages/url_launcher) --- updated-dependencies: - dependency-name: flutter_lints dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: pub-deps - dependency-name: flutter_svg dependency-version: 2.2.4 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pub-deps - dependency-name: url_launcher dependency-version: 6.3.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: pub-deps ... Signed-off-by: dependabot[bot] --- pubspec.lock | 76 ++++++++++++++++++++++++++-------------------------- pubspec.yaml | 6 ++--- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 2673306..c657558 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -29,34 +29,34 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.19.0" + version: "1.19.1" fake_async: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" flutter: dependency: "direct main" description: flutter @@ -66,18 +66,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" + sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1" url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "6.0.0" flutter_svg: dependency: "direct main" description: name: flutter_svg - sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b + sha256: "1ded017b39c8e15c8948ea855070a5ff8ff8b3d5e83f3446e02d6bb12add7ad9" url: "https://pub.dev" source: hosted - version: "2.0.17" + version: "2.2.4" flutter_test: dependency: "direct dev" description: flutter @@ -108,66 +108,66 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" url: "https://pub.dev" source: hosted - version: "10.0.7" + version: "11.0.2" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.0.10" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" lints: dependency: transitive description: name: lints - sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + sha256: "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df" url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "6.1.0" matcher: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.19" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" url: "https://pub.dev" source: hosted - version: "0.11.1" + version: "0.13.0" meta: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.17.0" path: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" path_parsing: dependency: transitive description: @@ -209,18 +209,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: @@ -241,10 +241,10 @@ packages: dependency: transitive description: name: test_api - sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a" url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "0.7.10" typed_data: dependency: transitive description: @@ -257,10 +257,10 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603" + sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8 url: "https://pub.dev" source: hosted - version: "6.3.1" + version: "6.3.2" url_launcher_android: dependency: transitive description: @@ -345,10 +345,10 @@ packages: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" vm_service: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 740cb55..b189d19 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,13 +9,13 @@ environment: dependencies: flutter: sdk: flutter - url_launcher: ^6.3.1 - flutter_svg: ^2.0.17 + url_launcher: ^6.3.2 + flutter_svg: ^2.2.4 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^5.0.0 + flutter_lints: ^6.0.0 flutter: uses-material-design: true From bd93e048fce6ad18c86037a994c6a0814f050499 Mon Sep 17 00:00:00 2001 From: Jelle Buning Date: Mon, 16 Mar 2026 10:13:40 +0100 Subject: [PATCH 2/5] Fixed issues --- lib/app/home_page.dart | 4 ++-- lib/app/widgets/url_information.dart | 2 +- lib/theme/theme_provider.dart | 4 ++-- pubspec.lock | 2 +- pubspec.yaml | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/app/home_page.dart b/lib/app/home_page.dart index 2a60e76..e3a3bcf 100644 --- a/lib/app/home_page.dart +++ b/lib/app/home_page.dart @@ -1,4 +1,4 @@ -import 'dart:html' as html; // ignore: avoid_web_libraries_in_flutter +import 'package:web/web.dart' as web; import 'package:flutter/material.dart'; import 'package:portfolio/app/contact_card.dart'; import 'package:portfolio/app/content.dart'; @@ -71,7 +71,7 @@ class _HomePageState extends State { } bool isWindowsClient() { - String userAgent = html.window.navigator.userAgent.toLowerCase(); + String userAgent = web.window.navigator.userAgent.toLowerCase(); return userAgent.contains('windows') || userAgent.contains('win32') || userAgent.contains('win64') || diff --git a/lib/app/widgets/url_information.dart b/lib/app/widgets/url_information.dart index 7824ba7..c9877b1 100644 --- a/lib/app/widgets/url_information.dart +++ b/lib/app/widgets/url_information.dart @@ -64,7 +64,7 @@ class UrlInformation extends StatelessWidget { ); } - descriptionWidget(String description) { + Widget descriptionWidget(String description) { return uri == null ? Text(description) : InkWell( diff --git a/lib/theme/theme_provider.dart b/lib/theme/theme_provider.dart index 4512398..4163ef6 100644 --- a/lib/theme/theme_provider.dart +++ b/lib/theme/theme_provider.dart @@ -18,7 +18,7 @@ class ThemeProvider { onError: Colors.white, ), iconTheme: IconThemeData(color: accentColor), - cardTheme: CardTheme( + cardTheme: CardThemeData( color: Color.fromARGB(255, 30, 30, 31), margin: EdgeInsets.zero, shape: RoundedRectangleBorder( @@ -49,7 +49,7 @@ class ThemeProvider { error: Colors.red, onError: Colors.white, ), - cardTheme: CardTheme( + cardTheme: CardThemeData( color: Colors.white, margin: EdgeInsets.zero, shape: RoundedRectangleBorder( diff --git a/pubspec.lock b/pubspec.lock index c657558..2c5fcfe 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -358,7 +358,7 @@ packages: source: hosted version: "14.3.0" web: - dependency: transitive + dependency: "direct main" description: name: web sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb diff --git a/pubspec.yaml b/pubspec.yaml index b189d19..4426ed6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,6 +11,7 @@ dependencies: sdk: flutter url_launcher: ^6.3.2 flutter_svg: ^2.2.4 + web: ^1.1.0 dev_dependencies: flutter_test: From dc09ce3304b12bbc17b1c2cd4d004a8899b4c504 Mon Sep 17 00:00:00 2001 From: Jelle Buning Date: Mon, 16 Mar 2026 10:21:14 +0100 Subject: [PATCH 3/5] Removed pinned flutter version --- .github/workflows/web-release.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/web-release.yml b/.github/workflows/web-release.yml index 8cdab5f..65a5ea6 100644 --- a/.github/workflows/web-release.yml +++ b/.github/workflows/web-release.yml @@ -15,14 +15,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: 'zulu' - java-version: "12.x" - cache: gradle - uses: subosito/flutter-action@v2 with: - flutter-version: "3.27.3" channel: 'stable' cache: true From 9f09ff843f837bf136a4cf38df833ef16b2446ab Mon Sep 17 00:00:00 2001 From: Jelle Buning Date: Mon, 16 Mar 2026 10:40:22 +0100 Subject: [PATCH 4/5] Introduced ci workflow --- .github/workflows/ci.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..a9fdd53 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,19 @@ +name: CI + +on: + pull_request: + branches: [ "main" ] + +jobs: + build: + name: Build web + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: subosito/flutter-action@v2 + with: + channel: 'stable' + cache: true + + - name: Build web + run: flutter build web --release --base-href "/portfolio/" From 707adfa9803d080e78f219efa753a5f68f2fed44 Mon Sep 17 00:00:00 2001 From: Jelle Buning Date: Mon, 16 Mar 2026 10:42:49 +0100 Subject: [PATCH 5/5] workflow improvement --- .github/workflows/build-web.yml | 24 +++++++++++++++ .github/workflows/ci.yml | 12 +------- .github/workflows/release.yml | 29 ++++++++++++++++++ .github/workflows/web-release.yml | 50 ------------------------------- 4 files changed, 54 insertions(+), 61 deletions(-) create mode 100644 .github/workflows/build-web.yml create mode 100644 .github/workflows/release.yml delete mode 100644 .github/workflows/web-release.yml diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml new file mode 100644 index 0000000..a2cdd91 --- /dev/null +++ b/.github/workflows/build-web.yml @@ -0,0 +1,24 @@ +name: Build web + +on: + workflow_call: + +jobs: + build: + name: Build web + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: subosito/flutter-action@v2 + with: + channel: 'stable' + cache: true + + - name: Build web + run: flutter build web --release --base-href "/portfolio/" + + - name: Upload web build files + uses: actions/upload-artifact@v4 + with: + name: web-release + path: ./build/web diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9fdd53..1e1fc77 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,14 +6,4 @@ on: jobs: build: - name: Build web - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: subosito/flutter-action@v2 - with: - channel: 'stable' - cache: true - - - name: Build web - run: flutter build web --release --base-href "/portfolio/" + uses: ./.github/workflows/build-web.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..82c0afe --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,29 @@ +name: Web release + +on: + push: + branches: [ "main" ] + workflow_dispatch: + +permissions: + contents: write + +jobs: + build: + uses: ./.github/workflows/build-web.yml + + deploy: + name: Deploy to gh-pages + needs: build + runs-on: ubuntu-latest + steps: + - name: Download web build files + uses: actions/download-artifact@v4 + with: + name: web-release + + - name: Deploy to gh-pages + uses: peaceiris/actions-gh-pages@v4 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./ diff --git a/.github/workflows/web-release.yml b/.github/workflows/web-release.yml deleted file mode 100644 index eefed2a..0000000 --- a/.github/workflows/web-release.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: Web release -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - workflow_dispatch: - -permissions: - contents: write - -jobs: - build: - name: Create web build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v6 - - uses: subosito/flutter-action@v2 - with: - channel: 'stable' - cache: true - - - name: Get dependencies - run: flutter pub get - - - name: Start web release build - run: flutter build web --release --base-href "/portfolio/" - - - name: Upload web build files - uses: actions/upload-artifact@v7 - with: - name: web-release - path: ./build/web - - deploy: - name: Deploy web build - needs: build - runs-on: ubuntu-latest - - steps: - - name: Download web release - uses: actions/download-artifact@v8 - with: - name: web-release - - - name: Deploy to gh-pages - uses: peaceiris/actions-gh-pages@v4 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./