Merge pull request #14 from vbalagovic/stage

Stage
vbalagovic · Oct 19, 2023 · 860939e · 860939e
2 parents 4a8737a + 691f357
commit 860939e
Show file tree

Hide file tree

Showing 20 changed files with 501 additions and 266 deletions.
diff --git a/.env.example b/.env.example
@@ -37,4 +37,4 @@ KEY_ISSUER_ID=""
 PATH_TO_THE_P8_KEY="$PWD/applestore_key.p8"
 
 # Flutter version
-FLUTTER_VERSION=3.10.6
+FLUTTER_VERSION=3.13.7
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.10.6",
+  "flutterSdkVersion": "3.13.7",
   "flavors": {}
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "type": "dart",
             "flutterMode": "debug",
             "program": "lib/main_dev.dart",
-            "args": ["--flavor", "dev"],
+            "args": ["--flavor", "dev", "--no-enable-impeller"],
         },
         {
             "name": "FlutterPresetup PROD",

diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ NOTE: dev & prod scheme must be added manually in xcode (check the article above
 
 ## Dependencies & versions
 
-Current Flutter version 3.10.6
+Current Flutter version 3.13.7
 
 Install all dependecies:
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -56,7 +56,7 @@ android {
         applicationId "com.example.presetup"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,14 +1,14 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         // START: FlutterFire Configuration
-        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.gms:google-services:4.3.14'
         // END: FlutterFire Configuration
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }

diff --git 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-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/docs/dependencies-and-versions.md b/docs/dependencies-and-versions.md
@@ -1,6 +1,6 @@
 # Dependencies & versions
 
-Current Flutter version 3.10.6
+Current Flutter version 3.13.7
 
 Install all dependecies:
 

diff --git a/ios/Podfile b/ios/Podfile
@@ -38,7 +38,11 @@ post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
     target.build_configurations.each do |config|
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
+      xcconfig_path = config.base_configuration_reference.real_path
+      xcconfig = File.read(xcconfig_path)
+      xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")
+      File.open(xcconfig_path, "w") { |file| file << xcconfig_mod }
     end
   end
 end