Update targetSdk + minSdk + update flutter version

ngthailam · Jan 26, 2024 · 5c6b2c3 · 5c6b2c3
1 parent fda5531
commit 5c6b2c3
Show file tree

Hide file tree

Showing 13 changed files with 489 additions and 356 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -29,6 +29,5 @@ linter:
   rules:
     avoid_print: false  # Uncomment to disable the `avoid_print` rule
     prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
-    unnecessary_question_mark: false
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -49,8 +49,8 @@ android {
 
     defaultConfig {
         applicationId "vn.thailam.flutter_password_saver"
-        minSdkVersion 21
-        targetSdkVersion 31
+        minSdkVersion 24
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -2,4 +2,6 @@ org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
 # Prevent crashes on Android 6 according to https://docs.flutter.dev/deployment/android
-# android.bundle.enableUncompressedNativeLibs=false 
+# android.bundle.enableUncompressedNativeLibs=false 
+
+org.gradle.jvmargs=-Xmx1536M --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED
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-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
diff --git a/lib/main.config.dart b/lib/main.config.dart
diff --git a/lib/main.dart b/lib/main.dart
@@ -18,7 +18,6 @@ import 'package:flutter_password_saver/initializer/uri_handler.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:get_it/get_it.dart';
 import 'package:injectable/injectable.dart';
-import 'generated/l10n.dart';
 import 'main.config.dart';
 
 final RouteObserver<ModalRoute> routeObserver = RouteObserver<ModalRoute>();

diff --git a/lib/modules/auth/presentation/auth/authen/authen_bottom_sheet.dart b/lib/modules/auth/presentation/auth/authen/authen_bottom_sheet.dart
@@ -25,8 +25,8 @@ Future<bool?> showAuthenBottomSheet(BuildContext context,
       ),
     ),
     builder: (context) {
-      return Wrap(
-        children: const [AuthenBottomSheet()],
+      return const Wrap(
+        children: [AuthenBottomSheet()],
       );
     },
   );

diff --git a/lib/presentation/page/onboarding/onboarding_bottom_sheet.dart b/lib/presentation/page/onboarding/onboarding_bottom_sheet.dart
@@ -16,8 +16,8 @@ Future showOnboardingBottomSheet(BuildContext context) {
       ),
     ),
     builder: (context) {
-      return Wrap(
-        children: const [OnboardingBottomSheet()],
+      return const Wrap(
+        children: [OnboardingBottomSheet()],
       );
     },
   );

diff --git a/lib/presentation/page/preferences/preferences_page.dart b/lib/presentation/page/preferences/preferences_page.dart
@@ -109,10 +109,10 @@ class _PreferencesPageState extends State<PreferencesPage> {
                   if (state.deleteLoadState == LoadState.none) {
                     return _primary(state);
                   } else {
-                    return Center(
+                    return const Center(
                       child: Column(
                         crossAxisAlignment: CrossAxisAlignment.center,
-                        children: const [
+                        children: [
                           LoadingIndicator(),
                         ],
                       ),

diff --git a/lib/presentation/widget/delete_account_button_widget.dart b/lib/presentation/widget/delete_account_button_widget.dart
@@ -18,10 +18,10 @@ class DeleteAccountButton extends StatelessWidget {
           color: AppColors.red500,
         ),
         padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-        child: Row(
+        child: const Row(
           mainAxisAlignment: MainAxisAlignment.center,
           crossAxisAlignment: CrossAxisAlignment.center,
-          children: const [
+          children: [
             Icon(
               Icons.delete,
               color: AppColors.white500,