From a5a081bcb5d07cfd7450b161211d944338742ec0 Mon Sep 17 00:00:00 2001 From: Philipp Keller Date: Sat, 28 May 2022 08:21:34 +0200 Subject: [PATCH 1/3] Make it it work for current android (api 32) and flutter 3.0.1 --- android/app/build.gradle | 6 +++--- android/app/src/main/AndroidManifest.xml | 12 ++++-------- .../java/co/appbrewery/flash_chat/MainActivity.java | 9 +-------- android/build.gradle | 2 +- android/gradle/wrapper/gradle-wrapper.properties | 2 +- lib/main.dart | 2 +- lib/screens/welcome_screen.dart | 1 + pubspec.yaml | 4 ++-- 8 files changed, 14 insertions(+), 24 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index e8d2b49ddc..fe6968cfe0 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 29 + compileSdkVersion flutter.compileSdkVersion lintOptions { disable 'InvalidPackage' @@ -35,8 +35,8 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "co.appbrewery.flash_chat" - minSdkVersion 16 - targetSdkVersion 29 + minSdkVersion flutter.minSdkVersion + targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName multiDexEnabled true diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 29713595af..b02facbc45 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - - + diff --git a/android/app/src/main/java/co/appbrewery/flash_chat/MainActivity.java b/android/app/src/main/java/co/appbrewery/flash_chat/MainActivity.java index b68d4927dc..83cbc3591d 100644 --- a/android/app/src/main/java/co/appbrewery/flash_chat/MainActivity.java +++ b/android/app/src/main/java/co/appbrewery/flash_chat/MainActivity.java @@ -1,13 +1,6 @@ package co.appbrewery.flash_chat; -import android.os.Bundle; -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; +import io.flutter.embedding.android.FlutterActivity; public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } } diff --git a/android/build.gradle b/android/build.gradle index 6de372893d..c9e3db0a0f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:4.1.0' } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 63ab3ae08f..bc6a58afdd 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-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip diff --git a/lib/main.dart b/lib/main.dart index 6ea23d095c..a97abd52f5 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -12,7 +12,7 @@ class FlashChat extends StatelessWidget { return MaterialApp( theme: ThemeData.dark().copyWith( textTheme: TextTheme( - body1: TextStyle(color: Colors.black54), + bodyText1: TextStyle(color: Colors.black54), ), ), home: WelcomeScreen(), diff --git a/lib/screens/welcome_screen.dart b/lib/screens/welcome_screen.dart index 6270ccf476..7d2dc9b0ae 100644 --- a/lib/screens/welcome_screen.dart +++ b/lib/screens/welcome_screen.dart @@ -27,6 +27,7 @@ class _WelcomeScreenState extends State { style: TextStyle( fontSize: 45.0, fontWeight: FontWeight.w900, + color: Colors.black54, ), ), ], diff --git a/pubspec.yaml b/pubspec.yaml index e6d5ae3d17..c8b21b1ce8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,13 +4,13 @@ description: A new Flutter application. version: 1.0.0+1 environment: - sdk: ">=2.1.0<3.0.0" + sdk: ">=2.16.1<3.0.0" dependencies: flutter: sdk: flutter - cupertino_icons: ^0.1.2 + cupertino_icons: ^1.0.3 dev_dependencies: flutter_test: From 9d5b6fb6970608fe30fdc30c813a6baeadee18f2 Mon Sep 17 00:00:00 2001 From: Philipp Keller Date: Sun, 29 May 2022 18:06:31 +0200 Subject: [PATCH 2/3] firebase requires minimum version of 19 --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index fe6968cfe0..3ad19bd1db 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -35,7 +35,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "co.appbrewery.flash_chat" - minSdkVersion flutter.minSdkVersion + minSdkVersion 19 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName From 92a1974fd12bd4e5f6d34aae5d9b8add34de174e Mon Sep 17 00:00:00 2001 From: Philipp Keller Date: Mon, 30 May 2022 21:18:33 +0200 Subject: [PATCH 3/3] modal_progress_hud requires a Kotlin version to be configure. Taking the latest one --- android/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android/build.gradle b/android/build.gradle index c9e3db0a0f..c1a2db78eb 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,4 +1,6 @@ buildscript { + ext.kotlin_version = '1.6.21' + repositories { google() jcenter()