chore: merge latest dev

GroovinChip · Oct 9, 2021 · 2e9fb23 · 2e9fb23
2 parents 71e01b6 + ed1c1db
commit 2e9fb23
Show file tree

Hide file tree

Showing 46 changed files with 631 additions and 738 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,7 @@ android/key.properties
 *.iml
 /metrics
 .vscode/launch.json
+detective_connect.txt
+
+*.patch
+.vscode/launch.json
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -1,3 +1,5 @@
+include: package:flutter_lints/flutter.yaml
+
 linter:
   rules:
     - prefer_single_quotes

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -36,7 +36,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     lintOptions {
         disable 'InvalidPackage'
@@ -45,7 +45,7 @@ android {
     defaultConfig {
         applicationId "com.groovinchip.flutter.callmanager"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/android/app/google-services.json b/android/app/google-services.json
@@ -22,6 +22,14 @@
             "certificate_hash": "11743c6d989da7c5fc95a69f9f8851ef57c3c40b"
           }
         },
+        {
+          "client_id": "1053316160376-a5ophi33ioqa0sp0efc1g9g1p3dug62c.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.groovinchip.flutter.callmanager",
+            "certificate_hash": "bd512282d3192eb10c311691a907423947cff8fc"
+          }
+        },
         {
           "client_id": "1053316160376-e77pbuh7scqba2fgae9fi0r5dt0nerkv.apps.googleusercontent.com",
           "client_type": 1,

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -34,6 +34,7 @@
             android:resource="@color/notificationColor" />
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,20 +1,20 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.4'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         //noinspection GradleDependency
-        classpath 'com.google.gms:google-services:3.2.1'
+        classpath 'com.google.gms:google-services:4.3.8'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>
diff --git a/ios/Podfile b/ios/Podfile
@@ -32,6 +32,7 @@ target 'Runner' do
   use_modular_headers!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '8.7.0'
 end
 
 #post_install do |installer|