Upgrade versions

saeub · Sep 27, 2023 · fa5562b · fa5562b
1 parent 540691b
commit fa5562b
Show file tree

Hide file tree

Showing 9 changed files with 316 additions and 225 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -10,11 +10,11 @@ jobs:
     name: Deploy Android
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v1
+      - uses: actions/checkout@v3
+      - uses: subosito/flutter-action@v2
         with:
           channel: stable
-          flutter-version: '3.3.10'
+          flutter-version: '3.13.0'
       - run: flutter build apk
       - uses: w9jds/firebase-action@master
         with:
@@ -23,7 +23,7 @@ jobs:
             build/app/outputs/apk/release/app-release.apk \
             --app ${{ secrets.FIREBASE_ANDROID_APP_ID }}
         env:
-          FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
+          GCP_SA_KEY: ${{ secrets.FIREBASE_SERVICE_ACCOUNT }}
   web:
     name: Deploy Web
     runs-on: ubuntu-latest
@@ -32,11 +32,11 @@ jobs:
       - uses: subosito/flutter-action@v1
         with:
           channel: stable
-          flutter-version: '3.3.10'
+          flutter-version: '3.13.0'
       - run: flutter config --enable-web
       - run: flutter build web
       - uses: w9jds/firebase-action@master
         with:
           args: deploy --project ${{ secrets.FIREBASE_PROJECT_ID }}
         env:
-          FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
+          GCP_SA_KEY: ${{ secrets.FIREBASE_SERVICE_ACCOUNT }}
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -16,23 +16,23 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v1
+      - uses: actions/checkout@v3
+      - uses: subosito/flutter-action@v2
         with:
           channel: stable
-          flutter-version: '3.3.10'
-      - run: flutter format -n --set-exit-if-changed lib/main.dart lib/src/ test/ integration_test/
+          flutter-version: '3.13.0'
+      - run: dart format -o none --set-exit-if-changed lib/main.dart lib/src/ test/ integration_test/
       - run: flutter analyze
   test:
     name: Unit tests
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v1
+      - uses: actions/checkout@v3
+      - uses: subosito/flutter-action@v2
         with:
           channel: stable
-          flutter-version: '3.3.10'
+          flutter-version: '3.13.0'
       - run: sudo apt-get update && sudo apt-get install -y lcov
       - run: flutter test --coverage
       - run: lcov --remove coverage/lcov.info 'lib/generated/*' > coverage/lcov_nogen.info
@@ -52,11 +52,11 @@ jobs:
           - 29
     needs: test
     steps:
-      - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v1
+      - uses: actions/checkout@v3
+      - uses: subosito/flutter-action@v2
         with:
           channel: stable
-          flutter-version: '3.3.10'
+          flutter-version: '3.13.0'
       - uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/docs/index.md b/docs/index.md
@@ -84,6 +84,6 @@ Running tests:
 
 Code formatting / static analysis:
 
-- `flutter format lib/main.dart lib/src/ test/ integration_test/`
+- `dart format lib/main.dart lib/src/ test/ integration_test/`
 - `flutter analyze`
 - Keep translation files (`lib/i10n/*.arb`) sorted
diff --git a/lib/src/pages/registration.dart b/lib/src/pages/registration.dart
@@ -154,8 +154,8 @@ class RegistrationCodeScanner extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(title: Text(S.of(context).registrationQrScannerTitle)),
       body: MobileScanner(
-        onDetect: (barcode, args) {
-          var data = barcode.rawValue?.split('\n');
+        onDetect: (barcode) {
+          var data = barcode.raw.split('\n');
           if (data == null || data.length != 3) {
             throw QrScanError(S.of(context).registrationInvalidQrCode);
           }