From ab52a0f63e46101c8dc2d70e470dcec6feabcf58 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 24 May 2022 19:12:22 +0300
Subject: [PATCH] Update Android wrappers for Flutter 3

---
 .metadata                                        | 2 +-
 android/app/build.gradle.dev                     | 4 ++++
 android/app/build.gradle.prod                    | 4 ++++
 android/app/src/main/AndroidManifest.foss.xml    | 1 +
 android/app/src/main/AndroidManifest.xml         | 1 +
 android/build.gradle                             | 4 +++-
 android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 pubspec.foss.yaml                                | 2 +-
 pubspec.lock                                     | 4 ++--
 pubspec.next.yaml                                | 2 +-
 pubspec.yaml                                     | 2 +-
 11 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.metadata b/.metadata
index deb187da7..8bb66d200 100644
--- a/.metadata
+++ b/.metadata
@@ -15,7 +15,7 @@ migration:
     - platform: root
       create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
       base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-    - platform: linux
+    - platform: android
       create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
       base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
 
diff --git a/android/app/build.gradle.dev b/android/app/build.gradle.dev
index 128047c4b..5bc941e85 100644
--- a/android/app/build.gradle.dev
+++ b/android/app/build.gradle.dev
@@ -27,6 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion 31
+    ndkVersion flutter.ndkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -42,7 +43,10 @@ android {
     }
 
     defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.invoiceninja.app"
+        // 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 19
         targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
diff --git a/android/app/build.gradle.prod b/android/app/build.gradle.prod
index 6fe1914a9..7919611d7 100644
--- a/android/app/build.gradle.prod
+++ b/android/app/build.gradle.prod
@@ -32,6 +32,7 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
     compileSdkVersion 31
+    ndkVersion flutter.ndkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -47,7 +48,10 @@ android {
     }
 
     defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.invoiceninja.app"
+        // 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 19
         targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
diff --git a/android/app/src/main/AndroidManifest.foss.xml b/android/app/src/main/AndroidManifest.foss.xml
index 70b558a1a..84db5f89b 100644
--- a/android/app/src/main/AndroidManifest.foss.xml
+++ b/android/app/src/main/AndroidManifest.foss.xml
@@ -15,6 +15,7 @@
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 75a975c80..e5e39a4eb 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
diff --git a/android/build.gradle b/android/build.gradle
index 125594d77..bb34f990b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath 'com.google.gms:google-services:4.3.10'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
@@ -22,6 +22,8 @@ allprojects {
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
     project.evaluationDependsOn(':app')
 }
 
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index bc6a58afd..cc5527d78 100644
--- 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-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
diff --git a/pubspec.foss.yaml b/pubspec.foss.yaml
index a2c0fb143..44c2b6b7b 100644
--- a/pubspec.foss.yaml
+++ b/pubspec.foss.yaml
@@ -41,7 +41,7 @@ dependencies:
     git:
       url: https://github.com/theyakka/qr.flutter.git
   local_auth: ^1.1.6
-  sentry_flutter: ^6.1.2
+  sentry_flutter: ^6.5.1
   image_picker: ^0.8.3+1
   flutter_colorpicker: ^1.0.3
   flutter_json_viewer: ^1.0.1
diff --git a/pubspec.lock b/pubspec.lock
index d43509a3d..33e4ec2a4 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -986,14 +986,14 @@ packages:
       name: sentry
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.4.0"
+    version: "6.5.1"
   sentry_flutter:
     dependency: "direct main"
     description:
       name: sentry_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.4.0"
+    version: "6.5.1"
   share:
     dependency: "direct main"
     description:
diff --git a/pubspec.next.yaml b/pubspec.next.yaml
index 5233d2012..5a4edde0d 100644
--- a/pubspec.next.yaml
+++ b/pubspec.next.yaml
@@ -41,7 +41,7 @@ dependencies:
     git:
       url: https://github.com/theyakka/qr.flutter.git
   local_auth: ^1.1.6
-  sentry_flutter: ^6.1.2
+  sentry_flutter: ^6.5.1
   image_picker: ^0.8.3+1
   flutter_colorpicker: ^1.0.3
   flutter_json_viewer: ^1.0.1
diff --git a/pubspec.yaml b/pubspec.yaml
index 8eabd4ea0..10a82a9d4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -41,7 +41,7 @@ dependencies:
     git:
       url: https://github.com/theyakka/qr.flutter.git
   local_auth: ^1.1.6
-  sentry_flutter: ^6.1.2
+  sentry_flutter: ^6.5.1
   image_picker: ^0.8.3+1
   flutter_colorpicker: ^1.0.3
   flutter_json_viewer: ^1.0.1