diff --git a/android/app/build.gradle b/android/app/build.gradle index ff4d168..df007e1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -30,15 +30,23 @@ if (flutterVersionName == null) { android { namespace = "com.github.haorendashu.nowser" compileSdk = flutter.compileSdkVersion - ndkVersion = "26.1.10909125" + ndkVersion = "28.0.13004108" + // compileOptions { + // sourceCompatibility = JavaVersion.VERSION_17 + // targetCompatibility = JavaVersion.VERSION_17 + // } + + // kotlinOptions { + // jvmTarget = "17" + // } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = "17" + jvmTarget = JavaVersion.VERSION_1_8 } defaultConfig { @@ -46,8 +54,10 @@ android { applicationId = "com.github.haorendashu.nowser" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdk = flutter.minSdkVersion - targetSdk = flutter.targetSdkVersion + // minSdk = flutter.minSdkVersion + // targetSdk = flutter.targetSdkVersion + minSdk = 23 + targetSdk = 33 versionCode = flutterVersionCode.toInteger() versionName = flutterVersionName } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 8bc9958..dedd5d1 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index aa419b3..dbf9ff3 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version '8.1.1' apply false - id "org.jetbrains.kotlin.android" version "1.8.10" apply false + id "com.android.application" version "8.7.0" apply false + id "org.jetbrains.kotlin.android" version "2.0.20" apply false } include ":app" diff --git a/lib/component/qrscanner.dart b/lib/component/qrscanner.dart index a945e8c..397929f 100644 --- a/lib/component/qrscanner.dart +++ b/lib/component/qrscanner.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:qr_code_scanner/qr_code_scanner.dart'; +import 'package:qr_code_scanner_plus/qr_code_scanner_plus.dart'; import '../util/router_util.dart'; diff --git a/pubspec.lock b/pubspec.lock index 7bfb272..59aec4d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: android_content_provider - sha256: c39dae7c8a520e11d210690d1340bbc86c871271b3f501a67724baff2f7da167 + sha256: "992552642553e25b97a9953797058f8c3476a22700f0fa0cac6fbf4dcdc17d86" url: "https://pub.dev" source: hosted - version: "0.4.2" + version: "0.5.2" archive: dependency: transitive description: @@ -172,10 +172,11 @@ packages: cryptography_flutter: dependency: transitive description: - name: cryptography_flutter - sha256: a7fc3f0de42fb0947cbf213257aa3a69c89df561d104723ede8050658621f292 - url: "https://pub.dev" - source: hosted + path: cryptography_flutter + ref: "fix/compatibility-agp-8x" + resolved-ref: "666e4c20a87097f0fc69596dab366c53eea8899d" + url: "https://github.com/mvarendorff/cryptography" + source: git version: "2.3.2" cupertino_icons: dependency: "direct main" @@ -213,10 +214,10 @@ packages: dependency: transitive description: name: dio - sha256: "0dfb6b6a1979dac1c1245e17cef824d7b452ea29bd33d3467269f9bef3715fb0" + sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260" url: "https://pub.dev" source: hosted - version: "5.6.0" + version: "5.7.0" dio_cookie_manager: dependency: transitive description: @@ -585,10 +586,10 @@ packages: dependency: transitive description: name: mime - sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "2.0.0" nested: dependency: transitive description: @@ -756,14 +757,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" - qr_code_scanner: + qr_code_scanner_plus: dependency: "direct main" description: - name: qr_code_scanner - sha256: f23b68d893505a424f0bd2e324ebea71ed88465d572d26bb8d2e78a4749591fd + name: qr_code_scanner_plus + sha256: "39696b50d277097ee4d90d4292de36f38c66213a4f5216a06b2bdd2b63117859" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.0.10+1" quick_actions: dependency: "direct main" description: @@ -863,10 +864,10 @@ packages: dependency: "direct main" description: name: searchfield - sha256: "8d23d53967ac5b0774611150b286dacd70c9c5de74d3db433bda2104b4803755" + sha256: "223fca0828ec95f45501db93feac7b120b93600760c0d8c04039fb2eeed9cc20" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.7" shared_preferences: dependency: "direct main" description: @@ -948,10 +949,10 @@ packages: dependency: transitive description: name: sqflite - sha256: "79a297dc3cc137e758c6a4baf83342b039e5a6d2436fcdf3f96a00adaaf2ad62" + sha256: "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" sqflite_android: dependency: transitive description: @@ -964,34 +965,34 @@ packages: dependency: transitive description: name: sqflite_common - sha256: "4468b24876d673418a7b7147e5a08a715b4998a7ae69227acafaab762e0e5490" + sha256: "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709" url: "https://pub.dev" source: hosted - version: "2.5.4+5" + version: "2.5.4+6" sqflite_common_ffi: dependency: transitive description: name: sqflite_common_ffi - sha256: a6057d4c87e9260ba1ec436ebac24760a110589b9c0a859e128842eb69a7ef04 + sha256: "883dd810b2b49e6e8c3b980df1829ef550a94e3f87deab5d864917d27ca6bf36" url: "https://pub.dev" source: hosted - version: "2.3.3+1" + version: "2.3.4+4" sqflite_common_ffi_web: dependency: transitive description: name: sqflite_common_ffi_web - sha256: f540ad769e5fd31aabe77bfa6e774fdd36145a83e33cdc39239f310c5f8559c3 + sha256: "61ea702e7aba727f28be7ead00b84c19c745cd4a4934d0c41473303df11ac9ea" url: "https://pub.dev" source: hosted - version: "0.4.5+3" + version: "0.4.5+4" sqflite_darwin: dependency: transitive description: name: sqflite_darwin - sha256: "5e325c925cbd63f27e0e538aed018a40852325e590b5d83165181e492d272f9b" + sha256: "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c" url: "https://pub.dev" source: hosted - version: "2.4.1-0" + version: "2.4.1+1" sqflite_platform_interface: dependency: transitive description: @@ -1124,10 +1125,10 @@ packages: dependency: transitive description: name: web_socket_channel - sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" + sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.3" webview_cef: dependency: "direct main" description: @@ -1186,4 +1187,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.5.3 <4.0.0" - flutter: ">=3.24.0" + flutter: ">=3.27.0" diff --git a/pubspec.yaml b/pubspec.yaml index e60b122..299f53e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -49,13 +49,15 @@ dependencies: flutter_font_picker: ^1.4.0 flutter_secure_storage: ^9.2.2 pretty_qr_code: ^3.3.0 - qr_code_scanner: ^1.0.1 + # qr_code_scanner: ^1.0.1 + qr_code_scanner_plus: ^2.0.10+1 flutter_slidable: ^3.1.1 window_manager: ^0.4.2 quick_actions: ^1.0.8 flutter_pinned_shortcut_plus: ^0.0.2 flutter_cache_manager: ^3.4.1 - searchfield: 1.2.0 + # searchfield: 1.2.0 + searchfield: ^1.2.7 webview_cef: ^0.2.2 dev_dependencies: