Merge branch 'master' into gameplay_page_chris

cornell-dti · Oct 26, 2023 · 8668843 · 8668843
2 parents 14e4100 + 5646b7d
commit 8668843
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/ci/flutter-build/Dockerfile b/ci/flutter-build/Dockerfile
@@ -1,5 +1,4 @@
-FROM cirrusci/flutter
-
+FROM ghcr.io/cirruslabs/flutter
 WORKDIR /app/game
 COPY game .
 

diff --git a/ci/flutter-format/Dockerfile b/ci/flutter-format/Dockerfile
@@ -1,6 +1,6 @@
-FROM cirrusci/flutter
+FROM ghcr.io/cirruslabs/flutter
 
 WORKDIR /app/game
 COPY game .
 
-RUN flutter format lib | grep '0 changed'
+RUN dart format lib | grep '0 changed'
diff --git a/game/android/build.gradle b/game/android/build.gradle
@@ -25,6 +25,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/game/pubspec.yaml b/game/pubspec.yaml
@@ -18,7 +18,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 version: 1.0.1+5
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
   flutter: