From cc67cba44719564788409191e7f35b6abce433d8 Mon Sep 17 00:00:00 2001 From: mateusz-bak <32651935+mateusz-bak@users.noreply.github.com> Date: Wed, 23 Oct 2024 22:16:33 +0200 Subject: [PATCH 1/7] build: Upgraded Java to 17, ndkVersion to 25.1.8937393 --- android/app/build.gradle | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 9deea462..a1776bcd 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -31,15 +31,16 @@ if (keystorePropertiesFile.exists()) { android { namespace "software.mdev.bookstracker" compileSdk flutter.compileSdkVersion - ndkVersion flutter.ndkVersion + // ndkVersion flutter.ndkVersion + ndkVersion = "25.1.8937393" compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = JavaVersion.VERSION_17 } sourceSets { From 2c3bc2259d1c2a4daf4fc016c415da4bde75156f Mon Sep 17 00:00:00 2001 From: mateusz-bak <32651935+mateusz-bak@users.noreply.github.com> Date: Wed, 23 Oct 2024 22:16:53 +0200 Subject: [PATCH 2/7] build: Upgraded Gradle to 8.4 --- android/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 3c472b99..5e6b5427 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,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 From 8d3d6af126164a333af10af084064a71ceb1ce78 Mon Sep 17 00:00:00 2001 From: mateusz-bak <32651935+mateusz-bak@users.noreply.github.com> Date: Wed, 23 Oct 2024 22:17:17 +0200 Subject: [PATCH 3/7] build: Upgraded AGP to 8.3.1, Kotlin to 1.8.22 --- android/settings.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/settings.gradle b/android/settings.gradle index 1d6d19b7..f6908ffc 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -19,8 +19,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "com.android.application" version "8.3.1" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false } include ":app" From dace0e5ce74ab11a8c7540e4af7271fa13162328 Mon Sep 17 00:00:00 2001 From: mateusz-bak <32651935+mateusz-bak@users.noreply.github.com> Date: Wed, 23 Oct 2024 22:17:55 +0200 Subject: [PATCH 4/7] chore: Removed discontinued plugin shared_storage --- pubspec.lock | 8 -------- pubspec.yaml | 1 - 2 files changed, 9 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 47376d79..bedf3aed 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1093,14 +1093,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.4.1" - shared_storage: - dependency: "direct main" - description: - name: shared_storage - sha256: cf20428d06af065311b71e09cbfbbfe431e979a3bf9180001c1952129b7c708f - url: "https://pub.dev" - source: hosted - version: "0.8.1" sky_engine: dependency: transitive description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index 0db29311..3e673b37 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -47,7 +47,6 @@ dependencies: image_fade: ^0.6.2 package_info_plus: ^8.0.0 animated_widgets: ^1.1.0 - shared_storage: ^0.8.0 shared_preferences: ^2.2.1 easy_localization: ^3.0.7 flutter_typeahead: ^5.0.1 From 8b812a132e98c1d4fc9fc97f0ec209a653f69e12 Mon Sep 17 00:00:00 2001 From: mateusz-bak <32651935+mateusz-bak@users.noreply.github.com> Date: Wed, 23 Oct 2024 22:18:22 +0200 Subject: [PATCH 5/7] fix: Creating namespaces for not migrated plugins --- android/build.gradle | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/android/build.gradle b/android/build.gradle index bc157bd1..f52747ce 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -6,6 +6,17 @@ allprojects { } rootProject.buildDir = '../build' +subprojects { + afterEvaluate { project -> + if (project.plugins.hasPlugin("com.android.library")) { + project.android { + if (namespace == null) { + namespace project.group + } + } + } + } +} subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } From d64b023c62f08ed252c45addd1e5bbfa32853740 Mon Sep 17 00:00:00 2001 From: mateusz-bak <32651935+mateusz-bak@users.noreply.github.com> Date: Wed, 23 Oct 2024 22:19:56 +0200 Subject: [PATCH 6/7] build: Upgraded flutter to 3.24.3 --- submodules/flutter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/flutter b/submodules/flutter index 80c2e849..2663184a 160000 --- a/submodules/flutter +++ b/submodules/flutter @@ -1 +1 @@ -Subproject commit 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 +Subproject commit 2663184aa79047d0a33a14a3b607954f8fdd8730 From a473a71decd804175a8235d00ed3ae2d8735bf31 Mon Sep 17 00:00:00 2001 From: mateusz-bak <32651935+mateusz-bak@users.noreply.github.com> Date: Wed, 23 Oct 2024 22:36:45 +0200 Subject: [PATCH 7/7] chore: Temporary removed functionality from shared_storage --- lib/core/helpers/backup/backup_export.dart | 23 ++++++++------- lib/core/helpers/backup/backup_general.dart | 12 ++++---- lib/core/helpers/backup/backup_import.dart | 5 ++-- lib/core/helpers/backup/csv_export.dart | 32 +++++++++++---------- 4 files changed, 39 insertions(+), 33 deletions(-) diff --git a/lib/core/helpers/backup/backup_export.dart b/lib/core/helpers/backup/backup_export.dart index 7f68f41d..02c40794 100644 --- a/lib/core/helpers/backup/backup_export.dart +++ b/lib/core/helpers/backup/backup_export.dart @@ -8,7 +8,7 @@ import 'package:archive/archive.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:package_info_plus/package_info_plus.dart'; -import 'package:shared_storage/shared_storage.dart'; +// import 'package:shared_storage/shared_storage.dart'; // TODO: Migrate to another package import 'package:openreads/core/helpers/backup/backup.dart'; import 'package:openreads/generated/locale_keys.g.dart'; @@ -43,16 +43,17 @@ class BackupExport { try { if (Platform.isAndroid) { - final selectedUriDir = await openDocumentTree(); - if (selectedUriDir == null) { - return; - } - createFileAsBytes( - selectedUriDir, - mimeType: '', - displayName: fileName, - bytes: File(tmpBackupPath).readAsBytesSync(), - ); + // TODO: Migrate to another package + // final selectedUriDir = await openDocumentTree(); + // if (selectedUriDir == null) { + // return; + // } + // createFileAsBytes( + // selectedUriDir, + // mimeType: '', + // displayName: fileName, + // bytes: File(tmpBackupPath).readAsBytesSync(), + // ); } else if (Platform.isIOS) { String? selectedDirectory = await FilePicker.platform.getDirectoryPath(); diff --git a/lib/core/helpers/backup/backup_general.dart b/lib/core/helpers/backup/backup_general.dart index 4812db34..325a79b2 100644 --- a/lib/core/helpers/backup/backup_general.dart +++ b/lib/core/helpers/backup/backup_general.dart @@ -13,7 +13,7 @@ import 'package:openreads/ui/settings_screen/download_missing_covers_screen.dart import 'package:permission_handler/permission_handler.dart'; import 'package:openreads/generated/locale_keys.g.dart'; -import 'package:shared_storage/shared_storage.dart'; +// import 'package:shared_storage/shared_storage.dart'; // TODO: Migrate to another package class BackupGeneral { static showInfoSnackbar(String message) { @@ -132,18 +132,20 @@ class BackupGeneral { } static Future pickFileAndroid() async { - final selectedUris = await openDocument(multiple: false); + // TODO: Migrate to another package + // final selectedUris = await openDocument(multiple: false); - if (selectedUris == null || selectedUris.isEmpty) return null; + // if (selectedUris == null || selectedUris.isEmpty) return null; - return selectedUris[0]; + // return selectedUris[0]; } static Future pickFileAndGetContent() async { if (Platform.isAndroid) { final fileLocation = await pickFileAndroid(); if (fileLocation != null) { - return await getDocumentContent(fileLocation); + // TODO: Migrate to another package + // return await getDocumentContent(fileLocation); } } else if (Platform.isIOS) { FilePickerResult? result = await FilePicker.platform.pickFiles(); diff --git a/lib/core/helpers/backup/backup_import.dart b/lib/core/helpers/backup/backup_import.dart index 8b7c71b8..a6ab2ca6 100644 --- a/lib/core/helpers/backup/backup_import.dart +++ b/lib/core/helpers/backup/backup_import.dart @@ -11,7 +11,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:openreads/core/constants/constants.dart'; import 'package:openreads/logic/cubit/backup_progress_cubit.dart'; import 'package:openreads/ui/books_screen/books_screen.dart'; -import 'package:shared_storage/shared_storage.dart'; +// import 'package:shared_storage/shared_storage.dart'; // TODO: Migrate to another package import 'package:sqflite/sqflite.dart'; import 'package:path/path.dart' as path; import 'package:blurhash_dart/blurhash_dart.dart' as blurhash_dart; @@ -89,7 +89,8 @@ class BackupImport { fileLocation = await BackupGeneral.pickFileAndroid(); if (fileLocation != null) { - backupFile = await getDocumentContent(fileLocation); + // TODO: Migrate to another package + // backupFile = await getDocumentContent(fileLocation); } } else if (Platform.isIOS) { FilePickerResult? result = await FilePicker.platform.pickFiles(); diff --git a/lib/core/helpers/backup/csv_export.dart b/lib/core/helpers/backup/csv_export.dart index 5c260be8..cac4f296 100644 --- a/lib/core/helpers/backup/csv_export.dart +++ b/lib/core/helpers/backup/csv_export.dart @@ -7,7 +7,7 @@ import 'package:flutter/material.dart'; import 'package:csv/csv.dart'; import 'package:easy_localization/easy_localization.dart'; -import 'package:shared_storage/shared_storage.dart'; +// import 'package:shared_storage/shared_storage.dart'; // TODO: Migrate to another package import 'package:openreads/core/constants/enums/enums.dart'; import 'package:openreads/core/helpers/backup/backup.dart'; @@ -27,12 +27,13 @@ class CSVExport { final filePath = '$exportPath/$fileName'; try { - createFileAsBytes( - Uri(path: filePath), - mimeType: 'text/csv', - displayName: fileName, - bytes: Uint8List.fromList(utf8.encode(csv)), - ); + // TODO: Migrate to another package + // createFileAsBytes( + // Uri(path: filePath), + // mimeType: 'text/csv', + // displayName: fileName, + // bytes: Uint8List.fromList(utf8.encode(csv)), + // ); BackupGeneral.showInfoSnackbar(LocaleKeys.export_successful.tr()); } catch (e) { @@ -49,16 +50,17 @@ class CSVExport { try { if (Platform.isAndroid) { - final selectedUriDir = await openDocumentTree(); + // TODO: Migrate to another package + // final selectedUriDir = await openDocumentTree(); - if (selectedUriDir == null) return; + // if (selectedUriDir == null) return; - createFileAsBytes( - selectedUriDir, - mimeType: 'text/csv', - displayName: fileName, - bytes: csv, - ); + // createFileAsBytes( + // selectedUriDir, + // mimeType: 'text/csv', + // displayName: fileName, + // bytes: csv, + // ); } else if (Platform.isIOS) { String? selectedDirectory = await FilePicker.platform.getDirectoryPath();