From 01e2790de7fed992120eeb0aef4f29a018281cdf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 01:00:05 +0000
Subject: [PATCH 1/3] Bump json_annotation from 4.6.0 to 4.7.0

Bumps [json_annotation](https://github.com/google/json_serializable.dart) from 4.6.0 to 4.7.0.
- [Release notes](https://github.com/google/json_serializable.dart/releases)
- [Commits](https://github.com/google/json_serializable.dart/compare/json_annotation-v4.6.0...json_annotation-v4.7.0)

---
updated-dependencies:
- dependency-name: json_annotation
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pubspec.lock | 4 ++--
 pubspec.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index c36665f2..09d6373e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -545,14 +545,14 @@ packages:
       name: json_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.6.0"
+    version: "4.7.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.3.2"
+    version: "6.4.0"
   klizma:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 31f3890f..9eef35ab 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -44,7 +44,7 @@ dependencies:
   http: ^0.13.5
   image_picker: ^0.8.4+9
   intl: ^0.17.0
-  json_annotation: ^4.5.0
+  json_annotation: ^4.7.0
   version: ^3.0.2
   package_info: ^2.0.2
   provider: ^6.0.3

From 12a8e73809470d5a001b9faec6a2dcd0ab1f3c29 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Mon, 26 Sep 2022 15:20:59 +0200
Subject: [PATCH 2/3] Update flutter version used for CI and builds

---
 .github/workflows/android-release.yml | 2 +-
 .github/workflows/ci.yml              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
index 1aac6143..681dcad5 100644
--- a/.github/workflows/android-release.yml
+++ b/.github/workflows/android-release.yml
@@ -25,7 +25,7 @@ jobs:
         uses: subosito/flutter-action@v1
         with:
           channel: 'stable'
-          flutter-version: '3.0.x'
+          flutter-version: '3.3.x'
 
       - name: Decrypt config files
         run: |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8e7e2894..c8c30c33 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ on:
       - 'pubspec.yaml'
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:  
     - uses: actions/checkout@v1
 
@@ -20,7 +20,7 @@ jobs:
       uses: subosito/flutter-action@v1
       with:
         channel: 'stable'
-        flutter-version: '3.0.x'
+        flutter-version: '3.3.x'
 
     - run: dart --version
     - run: flutter --version

From f5efefe798bfa39adcde3d8c9aed5d8294953ebe Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Mon, 26 Sep 2022 15:21:47 +0200
Subject: [PATCH 3/3] Remove workflow for dependency management

This is now handled by the official Github dependabot
---
 .github/workflows/dependabot.yml | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 .github/workflows/dependabot.yml

diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
deleted file mode 100644
index 7e827d5a..00000000
--- a/.github/workflows/dependabot.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Dependabot Pub
-
-on: workflow_dispatch
-
-jobs:
-  pub:
-    name: Dependabot Pub
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: dart-lang/setup-dart@v1
-      - name: Update
-        uses: IchordeDionysos/dependabot-pub-runner@main
-        with:
-          path: /
\ No newline at end of file