diff --git a/analysis_options.yaml b/analysis_options.yaml index 1a10aa78..1186c8a7 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -31,6 +31,8 @@ linter: # https://dart.dev/guides/language/analysis-options analyzer: + optional-checks: + chrome-os-manifest-checks exclude: - "**/*.g.dart" - - "**/*.freezed.dart" \ No newline at end of file + - "**/*.freezed.dart" diff --git a/android/app/build.gradle b/android/app/build.gradle index df1e31c5..79804cb1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -53,7 +53,7 @@ android { defaultConfig { applicationId "com.yubico.yubioath" minSdkVersion project.minSdkVersion - targetSdkVersion project.targetSdkVersion + targetSdk project.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName } @@ -109,7 +109,7 @@ dependencies { implementation 'androidx.fragment:fragment-ktx:1.6.1' implementation 'androidx.preference:preference-ktx:1.2.1' - implementation 'com.google.android.material:material:1.9.0' + implementation 'com.google.android.material:material:1.10.0' implementation 'com.github.tony19:logback-android:3.0.0' diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index b56df176..91362906 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -5,6 +5,10 @@ --> + + + + diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index f880684a..b9c761ed 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -3,4 +3,9 @@ to allow setting breakpoints, to provide hot reload, etc. --> + + + diff --git a/android/build.gradle b/android/build.gradle index b6fbeba6..5e594282 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,12 +21,12 @@ allprojects { project.ext { minSdkVersion = 21 - targetSdkVersion = 33 + targetSdkVersion = 34 compileSdkVersion = 34 yubiKitVersion = "2.4.0-beta01" junitVersion = "4.13.2" - mockitoVersion = "5.5.0" + mockitoVersion = "5.6.0" } } diff --git a/android/flutter_plugins/qrscanner_zxing/android/src/main/AndroidManifest.xml b/android/flutter_plugins/qrscanner_zxing/android/src/main/AndroidManifest.xml index 1d048636..349df9fd 100644 --- a/android/flutter_plugins/qrscanner_zxing/android/src/main/AndroidManifest.xml +++ b/android/flutter_plugins/qrscanner_zxing/android/src/main/AndroidManifest.xml @@ -8,6 +8,10 @@ android:name="android.hardware.camera.any" android:required="false" /> + +