Upgrade dependencies (#113)

* Upgrade dependencies * minor changes * minor changes * minor changes * change configuration * change configuration --------- Co-authored-by: sidhdhi canopas <sidhdhi.p@canopas.com>
canopas · Oct 9, 2024 · d678289 · d678289
1 parent eef3ed4
commit d678289
Show file tree

Hide file tree

Showing 10 changed files with 219 additions and 214 deletions.
diff --git a/data/.flutter-plugins b/data/.flutter-plugins
@@ -1,24 +1,24 @@
 # This is a generated file; do not edit or check into version control.
-cloud_firestore=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/cloud_firestore-5.0.2/
-cloud_firestore_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/cloud_firestore_web-4.0.2/
-cloud_functions=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/cloud_functions-5.1.1/
-cloud_functions_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/cloud_functions_web-4.10.0/
-device_info_plus=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/device_info_plus-10.1.2/
-firebase_auth=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_auth-5.1.1/
-firebase_auth_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_auth_web-5.13.0/
-firebase_core=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_core-3.4.1/
-firebase_core_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_core_web-2.18.0/
-firebase_messaging=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_messaging-15.0.2/
-firebase_messaging_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_messaging_web-3.9.0/
-firebase_storage=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_storage-12.1.0/
-firebase_storage_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_storage_web-3.10.0/
-flutter_timezone=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/flutter_timezone-2.0.1/
-package_info_plus=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/package_info_plus-8.0.2/
-path_provider_linux=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/
-path_provider_windows=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/path_provider_windows-2.2.1/
-shared_preferences=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences-2.2.3/
-shared_preferences_android=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences_android-2.2.3/
-shared_preferences_foundation=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.4.0/
-shared_preferences_linux=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.3.2/
-shared_preferences_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences_web-2.2.1/
-shared_preferences_windows=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.3.2/
+cloud_firestore=/home/mayank/.pub-cache/hosted/pub.dev/cloud_firestore-5.4.4/
+cloud_firestore_web=/home/mayank/.pub-cache/hosted/pub.dev/cloud_firestore_web-4.3.2/
+cloud_functions=/home/mayank/.pub-cache/hosted/pub.dev/cloud_functions-5.1.3/
+cloud_functions_web=/home/mayank/.pub-cache/hosted/pub.dev/cloud_functions_web-4.10.2/
+device_info_plus=/home/mayank/.pub-cache/hosted/pub.dev/device_info_plus-10.1.2/
+firebase_auth=/home/mayank/.pub-cache/hosted/pub.dev/firebase_auth-5.3.1/
+firebase_auth_web=/home/mayank/.pub-cache/hosted/pub.dev/firebase_auth_web-5.13.2/
+firebase_core=/home/mayank/.pub-cache/hosted/pub.dev/firebase_core-3.6.0/
+firebase_core_web=/home/mayank/.pub-cache/hosted/pub.dev/firebase_core_web-2.18.1/
+firebase_messaging=/home/mayank/.pub-cache/hosted/pub.dev/firebase_messaging-15.1.3/
+firebase_messaging_web=/home/mayank/.pub-cache/hosted/pub.dev/firebase_messaging_web-3.9.2/
+firebase_storage=/home/mayank/.pub-cache/hosted/pub.dev/firebase_storage-12.3.2/
+firebase_storage_web=/home/mayank/.pub-cache/hosted/pub.dev/firebase_storage_web-3.10.2/
+flutter_timezone=/home/mayank/.pub-cache/hosted/pub.dev/flutter_timezone-3.0.1/
+package_info_plus=/home/mayank/.pub-cache/hosted/pub.dev/package_info_plus-8.0.2/
+path_provider_linux=/home/mayank/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/
+path_provider_windows=/home/mayank/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/
+shared_preferences=/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences-2.3.2/
+shared_preferences_android=/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences_android-2.3.3/
+shared_preferences_foundation=/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.3/
+shared_preferences_linux=/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/
+shared_preferences_web=/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.2/
+shared_preferences_windows=/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1/
diff --git a/data/.flutter-plugins-dependencies b/data/.flutter-plugins-dependencies
diff --git a/data/pubspec.yaml b/data/pubspec.yaml
@@ -11,46 +11,46 @@ dependencies:
   flutter:
     sdk: flutter
 
-  shared_preferences: ^2.2.3
-  collection: ^1.18.0
+  shared_preferences: ^2.3.2
+  collection: any
 
   # storage
-  firebase_storage: ^12.0.0
-  cloud_firestore: ^5.0.0
+  firebase_storage: ^12.3.2
+  cloud_firestore: ^5.4.3
   firebase_messaging: ^15.0.2
 
   # auth
-  firebase_core: ^3.0.0
-  firebase_auth: ^5.0.0
+  firebase_core: ^3.6.0
+  firebase_auth: ^5.3.1
 
   # io
-  http: ^1.2.1
-  dio: ^5.0.2
-  cloud_functions: ^5.1.1
+  http: ^1.2.2
+  dio: ^5.7.0
+  cloud_functions: ^5.1.3
   json_annotation: ^4.9.0
-  json_serializable: ^6.7.1
-  freezed_annotation: ^2.4.1
+  json_serializable: ^6.8.0
+  freezed_annotation: ^2.4.4
   stream_transform: ^2.1.0
 
   # device + package info
-  device_info_plus: ^10.1.0
-  package_info_plus: ^8.0.0
-  flutter_timezone: ^2.0.0
-  path: ^1.8.3
-  uuid: ^4.4.0
+  device_info_plus: ^10.1.2
+  package_info_plus: ^8.0.2
+  flutter_timezone: ^3.0.1
+  path: ^1.9.0
+  uuid: ^4.5.1
 
   # state management
   flutter_riverpod: ^2.5.1
-  hooks_riverpod: ^2.5.1
+  hooks_riverpod: ^2.5.2
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^4.0.0
+  flutter_lints: ^5.0.0
 
-  build_runner: ^2.3.3
+  build_runner: ^2.4.13
   build_verify: ^3.1.0
-  freezed: ^2.5.2
+  freezed: ^2.5.7
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

diff --git a/khelo/android/app/build.gradle b/khelo/android/app/build.gradle
@@ -27,15 +27,16 @@ if (flutterVersionName == null) {
 android {
     namespace "com.canopas.khelo"
     compileSdkVersion 34
-    ndkVersion flutter.ndkVersion
+    ndkVersion "27.0.12077973"
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     sourceSets {
@@ -104,4 +105,5 @@ flutter {
 }
 
 dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 }
diff --git a/khelo/android/build.gradle b/khelo/android/build.gradle
@@ -1,43 +1,45 @@
-buildscript {
-    ext.kotlin_version = '2.0.20'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.4.0'
-    }
-}
-
 allprojects {
     repositories {
         google()
         mavenCentral()
     }
 }
 
-rootProject.buildDir = '../build'
-
+// Add namespace to all subprojects if missing
 subprojects {
     afterEvaluate { project ->
-        if (project.plugins.hasPlugin("com.android.application") ||
-                project.plugins.hasPlugin("com.android.library")) {
+        if (project.hasProperty('android')) {
             project.android {
-                compileSdkVersion 34
-                buildToolsVersion "34.0.0"
+                if (namespace == null) {
+                    namespace project.group
+                }
             }
         }
     }
 }
+
+rootProject.buildDir = '../build'
+
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
-
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
+
+allprojects {
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile) {
+            sourceCompatibility = JavaVersion.VERSION_1_8
+            targetCompatibility = JavaVersion.VERSION_1_8
+        }
+        tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+            kotlinOptions {
+                jvmTarget = JavaVersion.VERSION_1_8
+            }
+        }
+    }
+}
diff --git a/khelo/android/gradle/wrapper/gradle-wrapper.properties b/khelo/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.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
diff --git a/khelo/android/settings.gradle b/khelo/android/settings.gradle
@@ -23,9 +23,10 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
+    id "com.android.application" version "8.2.0" apply false
     id "com.google.gms.google-services" version "4.3.15" apply false
     id "com.google.firebase.crashlytics" version "2.8.1" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
 include ":app"