Update Android wrappers for Flutter 3

This commit is contained in:
Hillel Coren 2022-05-24 19:12:22 +03:00
parent 3e664d3fab
commit ab52a0f63e
11 changed files with 20 additions and 8 deletions

View File

@ -15,7 +15,7 @@ migration:
- platform: root - platform: root
create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
- platform: linux - platform: android
create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851 base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851

View File

@ -27,6 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android { android {
compileSdkVersion 31 compileSdkVersion 31
ndkVersion flutter.ndkVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
@ -42,7 +43,10 @@ android {
} }
defaultConfig { defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.invoiceninja.app" 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 minSdkVersion 19
targetSdkVersion 30 targetSdkVersion 30
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()

View File

@ -32,6 +32,7 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
android { android {
compileSdkVersion 31 compileSdkVersion 31
ndkVersion flutter.ndkVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
@ -47,7 +48,10 @@ android {
} }
defaultConfig { defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.invoiceninja.app" 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 minSdkVersion 19
targetSdkVersion 30 targetSdkVersion 30
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()

View File

@ -15,6 +15,7 @@
android:icon="@mipmap/ic_launcher"> android:icon="@mipmap/ic_launcher">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@style/LaunchTheme" android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

View File

@ -15,6 +15,7 @@
android:icon="@mipmap/ic_launcher"> android:icon="@mipmap/ic_launcher">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@style/LaunchTheme" android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

View File

@ -6,7 +6,7 @@ buildscript {
} }
dependencies { 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 'com.google.gms:google-services:4.3.10'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
@ -22,6 +22,8 @@ allprojects {
rootProject.buildDir = '../build' rootProject.buildDir = '../build'
subprojects { subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}" project.buildDir = "${rootProject.buildDir}/${project.name}"
}
subprojects {
project.evaluationDependsOn(':app') project.evaluationDependsOn(':app')
} }

View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

View File

@ -41,7 +41,7 @@ dependencies:
git: git:
url: https://github.com/theyakka/qr.flutter.git url: https://github.com/theyakka/qr.flutter.git
local_auth: ^1.1.6 local_auth: ^1.1.6
sentry_flutter: ^6.1.2 sentry_flutter: ^6.5.1
image_picker: ^0.8.3+1 image_picker: ^0.8.3+1
flutter_colorpicker: ^1.0.3 flutter_colorpicker: ^1.0.3
flutter_json_viewer: ^1.0.1 flutter_json_viewer: ^1.0.1

View File

@ -986,14 +986,14 @@ packages:
name: sentry name: sentry
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "6.4.0" version: "6.5.1"
sentry_flutter: sentry_flutter:
dependency: "direct main" dependency: "direct main"
description: description:
name: sentry_flutter name: sentry_flutter
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "6.4.0" version: "6.5.1"
share: share:
dependency: "direct main" dependency: "direct main"
description: description:

View File

@ -41,7 +41,7 @@ dependencies:
git: git:
url: https://github.com/theyakka/qr.flutter.git url: https://github.com/theyakka/qr.flutter.git
local_auth: ^1.1.6 local_auth: ^1.1.6
sentry_flutter: ^6.1.2 sentry_flutter: ^6.5.1
image_picker: ^0.8.3+1 image_picker: ^0.8.3+1
flutter_colorpicker: ^1.0.3 flutter_colorpicker: ^1.0.3
flutter_json_viewer: ^1.0.1 flutter_json_viewer: ^1.0.1

View File

@ -41,7 +41,7 @@ dependencies:
git: git:
url: https://github.com/theyakka/qr.flutter.git url: https://github.com/theyakka/qr.flutter.git
local_auth: ^1.1.6 local_auth: ^1.1.6
sentry_flutter: ^6.1.2 sentry_flutter: ^6.5.1
image_picker: ^0.8.3+1 image_picker: ^0.8.3+1
flutter_colorpicker: ^1.0.3 flutter_colorpicker: ^1.0.3
flutter_json_viewer: ^1.0.1 flutter_json_viewer: ^1.0.1