From 6daeed71e6325d3f555e119c0c1d34e13fc7af73 Mon Sep 17 00:00:00 2001
From: Benimautner <benimautner@gmail.com>
Date: Wed, 3 Jul 2024 14:02:16 +0200
Subject: [PATCH] fix: upgraded kotlin plugin

---
 android/app/build.gradle                      | 22 +++++++++----------
 android/build.gradle                          |  3 +++
 .../gradle/wrapper/gradle-wrapper.properties  |  3 ++-
 android/settings.gradle                       |  2 +-
 pubspec.lock                                  |  8 +++----
 pubspec.yaml                                  |  1 +
 6 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index b5b6a01..79e7da3 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -31,13 +31,13 @@ if (keystorePropertiesFile.exists()) {
 
 android {
     namespace 'io.vikunja.flutteringvikunja'
-    compileSdkVersion flutter.compileSdkVersion
+    //compileSdkVersion flutter.compileSdkVersion
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
+    //sourceSets {
+    //    main.java.srcDirs += 'src/main/kotlin'
+   // }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
@@ -47,8 +47,8 @@ android {
 
     defaultConfig {
         applicationId "io.vikunja.app"
-        minSdkVersion flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
+        minSdk flutter.minSdkVersion
+        targetSdk flutter.targetSdkVersion
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -111,8 +111,8 @@ flutter {
     source '../..'
 }
 
-dependencies {
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-}
+//dependencies {
+//    testImplementation 'junit:junit:4.13.2'
+//    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+//    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+//}
diff --git a/android/build.gradle b/android/build.gradle
index 89d2d4f..39b5ea4 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -5,6 +5,9 @@ allprojects {
     }
 }
 
+buildscript {
+    ext.kotlin_version = '1.9.0'
+}
 
 rootProject.buildDir = '../build'
 subprojects {
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b9..0c79628 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed Jul 03 00:50:12 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index 7d06449..2be52ed 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -19,7 +19,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.0" apply false
 }
 
 include ":app"
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index 7926aa9..2478dfe 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -125,10 +125,10 @@ packages:
     dependency: transitive
     description:
       name: chewie
-      sha256: e53da939709efb9aad0f3d72a69a8d05f889168b7a138af60ce78bab5c94b135
+      sha256: "1fc84d88d3b1dc26b1fe799500e2ebcc8916af30ce62595ad802cfd965b60bc3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.0"
   cli_util:
     dependency: transitive
     description:
@@ -1465,10 +1465,10 @@ packages:
     dependency: transitive
     description:
       name: wakelock_plus
-      sha256: "14758533319a462ffb5aa3b7ddb198e59b29ac3b02da14173a1715d65d4e6e68"
+      sha256: "104d94837bb28c735894dcd592877e990149c380e6358b00c04398ca1426eed4"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.5"
+    version: "1.2.1"
   wakelock_plus_platform_interface:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 5e3f61f..c372e39 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -41,6 +41,7 @@ dependencies:
   cronet_http: ^1.2.0
   package_info_plus: ^6.0.0
   html_editor_enhanced: ^2.6.0
+
 dev_dependencies:
   flutter_test:
     sdk: flutter