From 96b0c46396118f0a877eb8e7b6a483155ab2f39f Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Tue, 8 Oct 2024 08:23:25 +0200 Subject: [PATCH 1/8] Reduce scheduled CI to weekly --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c61722d..ace513b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: push: branches: [main] schedule: - - cron: 0 4 * * * + - cron: 0 4 * * 1 workflow_dispatch: env: From b894a9fc5696ffcdc673dccaf811fbf497e1e2e3 Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Tue, 8 Oct 2024 08:24:38 +0200 Subject: [PATCH 2/8] Print Flutter version in CI --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ace513b..cc3a067 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,7 @@ jobs: - uses: subosito/flutter-action@v2 with: channel: ${{ matrix.flutter-channel }} + - run: flutter --version - run: flutter pub get @@ -47,6 +48,7 @@ jobs: - uses: subosito/flutter-action@v2 with: channel: ${{ matrix.flutter-channel }} + - run: flutter --version - run: flutter pub get @@ -67,6 +69,7 @@ jobs: - uses: subosito/flutter-action@v2 with: channel: ${{ matrix.flutter-channel }} + - run: flutter --version - run: flutter pub get working-directory: example From 5548d3a0c276baf94d149567896dbe1dd3d71d21 Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Tue, 8 Oct 2024 08:26:37 +0200 Subject: [PATCH 3/8] Migrate from iterable.whereNotNull() to .nonNulls --- example/lib/main.dart | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 8c4b349..9ba529d 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,7 +1,8 @@ +// ignore_for_file: avoid_print + import 'dart:async'; import 'package:black_hole_flutter/black_hole_flutter.dart'; -import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:time/time.dart'; @@ -91,7 +92,7 @@ class _TimetableExampleState extends State (it) => it.toTimeOverlay(date: date, widget: BasicEventWidget(it)), ) - .whereNotNull() + .nonNulls .toList(), ]), callbacks: TimetableCallbacks( @@ -259,5 +260,3 @@ extension on PredefinedVisibleDateRange { }; } } - -// ignore_for_file: avoid_print, unused_element From 3ae480725feb05cb6498767779e655e84603a2e3 Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Tue, 8 Oct 2024 09:22:01 +0200 Subject: [PATCH 4/8] Disable Flutter beta CI --- .github/workflows/build.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc3a067..3fcfe0e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - flutter-channel: [stable, beta] + # TODO(JonasWanke): re-enable beta CI when next stable Flutter version + # including breaking changes to Color are released + flutterChannel: [stable] steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 @@ -38,7 +40,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - flutter-channel: [stable, beta] + # TODO(JonasWanke): re-enable beta CI when next stable Flutter version + # including breaking changes to Color are released + flutterChannel: [stable] steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 @@ -59,7 +63,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - flutter-channel: [stable, beta] + # TODO(JonasWanke): re-enable beta CI when next stable Flutter version + # including breaking changes to Color are released + flutterChannel: [stable] steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 From 823bf1b5e9f3619b2707922ea3a978d29cd91662 Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Tue, 8 Oct 2024 09:22:20 +0200 Subject: [PATCH 5/8] Update to Flutter 3.24 --- flake.lock | 14 +++++++------- flake.nix | 6 ++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 03b9118..1e8e4eb 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715823142, - "narHash": "sha256-svrQv3XCcCxjf5lzMZ4BXHmU6B8a9M1H3DMa/shP1k8=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a22a985f13d58b2bafb4964dd2bdf6376106a2d2", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { "owner": "nixos", - "ref": "a22a985f13d58b2bafb4964dd2bdf6376106a2d2", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index d3ba02d..c0f2517 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,6 @@ { inputs = { - nixpkgs.url = - "github:nixos/nixpkgs?ref=a22a985f13d58b2bafb4964dd2bdf6376106a2d2"; - # https://github.com/NixOS/nixpkgs/pull/311815 + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; }; @@ -17,7 +15,7 @@ }; }; - flutter = pkgs.flutterPackages.v3_22; + flutter = pkgs.flutterPackages.v3_24; # Android androidSdkArgs = { From 08cfc5a889fe514c050ee485143ce10feeda7ea1 Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Tue, 8 Oct 2024 09:23:00 +0200 Subject: [PATCH 6/8] Update dependencies --- example/pubspec.lock | 109 ++++++++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 48 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 60b8114..798b951 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,18 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 url: "https://pub.dev" source: hosted - version: "67.0.0" + version: "72.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.2" analyzer: dependency: transitive description: name: analyzer - sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "6.7.0" analyzer_plugin: dependency: transitive description: @@ -37,10 +42,10 @@ packages: dependency: transitive description: name: ansicolor - sha256: "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880" + sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.0.3" args: dependency: transitive description: @@ -117,10 +122,10 @@ packages: dependency: transitive description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" csslib: dependency: transitive description: @@ -142,26 +147,26 @@ packages: dependency: transitive description: name: dart_code_metrics_presets - sha256: "44d57d129f6c6533bd636d3dfa0854a1a17d0b172d2bc316f419cf3ddbb7c55f" + sha256: "2a889a92995fadaf770ee9d08792dd04ae0259029600be55554b6790f1b5da38" url: "https://pub.dev" source: hosted - version: "2.14.0" + version: "2.16.0" dart_date: dependency: transitive description: name: dart_date - sha256: "27f00f342710ba310f6052e415cc5799b3b6ad04f72f6bc5fae4da4f6365725e" + sha256: b107b5fed4aa2a0e5ccc636049a98833f5bdbb99e1d67b9b1a4ef80037482f01 url: "https://pub.dev" source: hosted - version: "1.3.3" + version: "1.4.0" dart_style: dependency: transitive description: name: dart_style - sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" + sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" url: "https://pub.dev" source: hosted - version: "2.3.6" + version: "2.3.7" dartx: dependency: transitive description: @@ -182,26 +187,26 @@ packages: dependency: "direct main" description: name: debug_overlay - sha256: "3c630f1c4e59dca72e9da9caac8602645c252b78fd9f6802ef5b2b260e40a6b2" + sha256: "7598d3867c036db7c41d25b6a847f7780bd91384808949c453bc4d6c55138c47" url: "https://pub.dev" source: hosted - version: "0.2.11" + version: "0.2.12" device_info_plus: dependency: transitive description: name: device_info_plus - sha256: "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110" + sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074 url: "https://pub.dev" source: hosted - version: "9.1.2" + version: "10.1.2" device_info_plus_platform_interface: dependency: transitive description: name: device_info_plus_platform_interface - sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64 + sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" email_validator: dependency: transitive description: @@ -222,10 +227,10 @@ packages: dependency: transitive description: name: ffi - sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" file: dependency: transitive description: @@ -293,10 +298,10 @@ packages: dependency: transitive description: name: http - sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.2" http_parser: dependency: transitive description: @@ -353,6 +358,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" + macros: + dependency: transitive + description: + name: macros + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + url: "https://pub.dev" + source: hosted + version: "0.1.2-main.4" matcher: dependency: transitive description: @@ -365,18 +378,18 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" oxidized: dependency: transitive description: @@ -397,18 +410,18 @@ packages: dependency: transitive description: name: package_info_plus - sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79" + sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918 url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "8.0.2" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66 url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" path: dependency: transitive description: @@ -445,10 +458,10 @@ packages: dependency: transitive description: name: quiver - sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47 + sha256: ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2 url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" rxdart: dependency: transitive description: @@ -514,10 +527,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" stream_channel: dependency: transitive description: @@ -555,10 +568,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.3" time: dependency: "direct main" description: @@ -611,10 +624,10 @@ packages: dependency: transitive description: name: uuid - sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90" + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.4.2" + version: "4.5.1" vector_math: dependency: transitive description: @@ -635,26 +648,26 @@ packages: dependency: transitive description: name: web - sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05" + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "0.4.2" + version: "1.1.0" win32: dependency: transitive description: name: win32 - sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4 + sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec" url: "https://pub.dev" source: hosted - version: "5.5.1" + version: "5.5.5" win32_registry: dependency: transitive description: name: win32_registry - sha256: "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb" + sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852" url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "1.1.5" xml: dependency: transitive description: @@ -672,5 +685,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" - flutter: ">=3.10.0" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.19.0" From 6e4eff555c53e3eba95bc427293509026782d0d6 Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Tue, 8 Oct 2024 09:35:01 +0200 Subject: [PATCH 7/8] Update to Java 17 --- example/android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index f0b618e..7a95c07 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -29,8 +29,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } defaultConfig { From 559b3301249d45a957eb639d6279f5c64a7c93e5 Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Tue, 15 Oct 2024 08:41:13 +0200 Subject: [PATCH 8/8] Update CI to Java 17 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3fcfe0e..fefa349 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ on: workflow_dispatch: env: - JAVA_VERSION: 12.x + JAVA_VERSION: 17 jobs: test: