build(deps): upgrade SDK and packages (#145)

.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.29.0"
+}

.gitignore

@@ -52,6 +52,7 @@ unlinked_spec.ds
 **/android/app/debug
 **/android/app/profile
 **/android/app/release
+**/android/app/.cxx
 *.jks
 
 # iOS/XCode related

analysis_options.yaml

@@ -7,7 +7,8 @@ analyzer:
     - '**app_localizations**.dart'
     - '**/generated_plugin_registrant.dart'
 
-include: package:very_good_analysis/analysis_options.5.1.0.yaml
+include: package:very_good_analysis/analysis_options.yaml
 linter:
   rules:
     public_member_api_docs: false
+    avoid_catches_without_on_clauses: false

android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -27,10 +28,6 @@ if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
     namespace "com.example.numbers"
     compileSdkVersion flutter.compileSdkVersion
@@ -114,5 +111,4 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()

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-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip

android/settings.gradle

@@ -1,11 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+}
+
+include ":app"

lib/bootstrap.dart

@@ -89,10 +89,7 @@ Future<void> setup() async {
       () => GetRandomNumberUseCase(repository: getIt()),
     )
     ..registerFactory<AppCubit>(
-      () => AppCubit(
-        getThemeUseCase: getIt(),
-        saveThemeUseCase: getIt(),
-      ),
+      () => AppCubit(getThemeUseCase: getIt(), saveThemeUseCase: getIt()),
     )
     ..registerFactory<NumberCubit>(
       () => NumberCubit(

lib/src/app/data/datasources/theme_service/shared_pref_theme_service.dart

@@ -3,9 +3,8 @@ import 'package:numbers/src/core/core.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 final class SharedPrefThemeService implements ThemeService {
-  SharedPrefThemeService({
-    required SharedPreferences preferences,
-  }) : _preferences = preferences;
+  SharedPrefThemeService({required SharedPreferences preferences})
+    : _preferences = preferences;
 
   final SharedPreferences _preferences;
 

lib/src/app/data/repositories/theme_repository_impl.dart

@@ -2,9 +2,8 @@ import 'package:numbers/src/app/app.dart';
 import 'package:numbers/src/core/core.dart';
 
 final class ThemeRepositoryImpl implements ThemeRepository {
-  const ThemeRepositoryImpl({
-    required ThemeService service,
-  }) : _themeService = service;
+  const ThemeRepositoryImpl({required ThemeService service})
+    : _themeService = service;
 
   final ThemeService _themeService;
 

lib/src/app/domain/usecases/get_theme_usecase.dart

@@ -3,9 +3,8 @@ import 'package:numbers/src/core/core.dart';
 
 final class GetThemeUseCase
     implements UseCase<DataState<String>, GetThemeParams> {
-  const GetThemeUseCase({
-    required ThemeRepository repository,
-  }) : _themeRepository = repository;
+  const GetThemeUseCase({required ThemeRepository repository})
+    : _themeRepository = repository;
 
   final ThemeRepository _themeRepository;
 

lib/src/app/domain/usecases/save_theme_usecase.dart

@@ -3,9 +3,8 @@ import 'package:numbers/src/core/core.dart';
 
 final class SaveThemeUseCase
     implements UseCase<DataState<void>, SaveThemeParams> {
-  const SaveThemeUseCase({
-    required ThemeRepository repository,
-  }) : _themeRepository = repository;
+  const SaveThemeUseCase({required ThemeRepository repository})
+    : _themeRepository = repository;
 
   final ThemeRepository _themeRepository;
 

lib/src/app/presentation/cubit/app_cubit.dart

@@ -13,9 +13,9 @@ final class AppCubit extends Cubit<AppState> {
   AppCubit({
     required GetThemeUseCase getThemeUseCase,
     required SaveThemeUseCase saveThemeUseCase,
-  })  : _getThemeUseCase = getThemeUseCase,
-        _saveThemeUseCase = saveThemeUseCase,
-        super(const AppState(theme: AvailableTheme.dark));
+  }) : _getThemeUseCase = getThemeUseCase,
+       _saveThemeUseCase = saveThemeUseCase,
+       super(const AppState(theme: AvailableTheme.dark));
 
   final GetThemeUseCase _getThemeUseCase;
   final SaveThemeUseCase _saveThemeUseCase;
@@ -33,9 +33,10 @@ final class AppCubit extends Cubit<AppState> {
       case DataSuccess(data: final theme):
         emit(
           state.copyWith(
-            theme: theme == AvailableTheme.light.value
-                ? AvailableTheme.light
-                : AvailableTheme.dark,
+            theme:
+                theme == AvailableTheme.light.value
+                    ? AvailableTheme.light
+                    : AvailableTheme.dark,
           ),
         );
       case DataFailure():