Merge pull request #170 from JonasWanke/update-CI

JonasWanke · Oct 15, 2024 · 887945d · 887945d
2 parents 324887d + 559b330
commit 887945d
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 70 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,19 +5,21 @@ on:
   push:
     branches: [main]
   schedule:
-    - cron: 0 4 * * *
+    - cron: 0 4 * * 1
   workflow_dispatch:
 
 env:
-  JAVA_VERSION: 12.x
+  JAVA_VERSION: 17
 
 jobs:
   test:
     name: Run tests
     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
@@ -27,6 +29,7 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           channel: ${{ matrix.flutter-channel }}
+      - run: flutter --version
 
       - run: flutter pub get
 
@@ -37,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
@@ -47,6 +52,7 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           channel: ${{ matrix.flutter-channel }}
+      - run: flutter --version
 
       - run: flutter pub get
 
@@ -57,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
@@ -67,6 +75,7 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           channel: ${{ matrix.flutter-channel }}
+      - run: flutter --version
 
       - run: flutter pub get
         working-directory: example

diff --git 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 {

diff --git 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<TimetableExample>
               (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