Merge branch 'main' into features

CCExtractor · Aug 18, 2024 · 70e7e2c · 70e7e2c
2 parents 8fed16b + 78c8808
commit 70e7e2c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,7 +1,9 @@
 buildscript {
     ext.kotlin_version = '1.7.10'
    ext {
-       compileSdkVersion   = 34            // or latest
+
+       compileSdkVersion   = 34           // or latest
+
        targetSdkVersion    = 34                // or latest
        appCompatVersion    = "1.4.2"           // or latest
    }
@@ -25,11 +27,16 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = '../build' 
 subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
+    afterEvaluate{
+        android{
+            compileSdkVersion 34
+        }
+    }
 }
 subprojects {
+    project.buildDir = "${rootProject.buildDir}/${project.name}"
     project.evaluationDependsOn(':app')
 }
 

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4608m
 android.useAndroidX=true
 android.enableJetifier=true
 android.enableR8=true
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,13 +3,17 @@ version: 0.2.0
 publish_to: none
 description: A new Flutter project.
 environment:
+
   sdk: ">=3.4.3 <4.0.0"
   flutter: 3.22.2
 
+
 dependencies:
   firebase_core: ^2.27.0
+
   screen_state: ^4.0.0
-  cupertino_icons: ^1.0.2
+  cupertino_icons: ^1.0.8
+
   get: 4.6.6
   get_storage: ^2.1.1
   flutter_time_picker_spinner: ^2.0.0
@@ -39,7 +43,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_native_splash: ^2.3.8
-  fluttertoast: ^8.2.4
+  fluttertoast: ^8.2.5
   path_provider: ^2.1.1
   audio_session: ^0.1.18
   uuid: ^4.3.3