From 33228b62d06dcdd9ce30980c6a81017ef328c99f Mon Sep 17 00:00:00 2001
From: Fritz Matthaeus <fritz@mevimedia.de>
Date: Thu, 12 Dec 2024 10:40:12 +0100
Subject: [PATCH] fix: Tutorial fix

Upgrade patrol dependency to be compatible with Patrol CLI 3.4.1
Upgrade Android Gradle
Upgrade Android NDK Version
Add desugaring to fix Flutter Local Notification dependency error
---
 android/app/build.gradle                         | 6 ++++--
 android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 android/settings.gradle                          | 2 +-
 pubspec.lock                                     | 4 ++--
 pubspec.yaml                                     | 6 +++---
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index e98b6ce..b3972d6 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -8,11 +8,12 @@ plugins {
 android {
     namespace = "com.resocoder.patrol_basics_tutorial"
     compileSdk = flutter.compileSdkVersion
-    ndkVersion = flutter.ndkVersion
+    ndkVersion = "26.1.10909125"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
+        coreLibraryDesugaringEnabled true
     }
 
     kotlinOptions {
@@ -51,5 +52,6 @@ flutter {
 }
 
 dependencies {
-    androidTestUtil "androidx.test:orchestrator:1.4.2"
+    androidTestUtil "androidx.test:orchestrator:1.5.1"
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 7bb2df6..3c85cfe 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index b9e43bd..21fdb9e 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.1.0" apply false
+    id "com.android.application" version '8.5.1' apply false
     id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
diff --git a/pubspec.lock b/pubspec.lock
index f441a4c..abec6e1 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -252,10 +252,10 @@ packages:
     dependency: "direct dev"
     description:
       name: patrol
-      sha256: "829065b7daa1307283339a2b3a2d57f29631e5178d2f9d5276b376f34efda2e8"
+      sha256: "7e7c346890fa234af948fbdf024e09e80142deef7aef572dead1001446ca853c"
       url: "https://pub.dev"
     source: hosted
-    version: "3.13.0"
+    version: "3.13.1"
   patrol_finders:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 3655f23..1ea9ca3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: patrol_basics_tutorial
-description: 'A new Flutter project.'
-publish_to: 'none'
+description: "A new Flutter project."
+publish_to: "none"
 version: 0.1.0
 
 environment:
@@ -19,7 +19,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^4.0.0
-  patrol: ^3.13.0
+  patrol: ^3.13.1
 
 flutter:
   uses-material-design: true