Merge pull request juliansteenbakker#1530 from juliansteenbakker/fix/dependency-update

juliansteenbakker · web-flow · commit e0f9f5a7dd7f · 2025-09-23T10:07:52.000+02:00
fix: dependency update
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## NEXT
+
+* [Android] Update to Java 17, and update other dependencies.
+* [iOS] Upgraded minimum iOS level to 13 due to Flutter requirements.
+
 ## 7.0.1
 
 * Added error handling for when `MobileScannerController.start` is called without an active `MobileScanner` widget.
diff --git a/android/build.gradle b/android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.10.1'
+        classpath 'com.android.tools.build:gradle:8.13.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -29,15 +29,15 @@ android {
         namespace 'dev.steenbakker.mobile_scanner'
     }
 
-    compileSdk 35
+    compileSdk 36
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     sourceSets {
@@ -73,9 +73,9 @@ dependencies {
         implementation 'com.google.mlkit:barcode-scanning:17.3.0'
     }
 
-    implementation 'androidx.camera:camera-lifecycle:1.4.2'
-    implementation 'androidx.camera:camera-camera2:1.4.2'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+    implementation 'androidx.camera:camera-lifecycle:1.5.0'
+    implementation 'androidx.camera:camera-camera2:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2'
 
     testImplementation 'org.jetbrains.kotlin:kotlin-test'
     testImplementation 'org.mockito:mockito-core:5.19.0'
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -24,7 +24,7 @@ if (flutterVersionName == null) {
 
 android {
     namespace "dev.steenbakker.mobile_scanner_example"
-    compileSdk 35
+    compileSdk 36
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
@@ -43,7 +43,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "dev.steenbakker.mobile_scanner_example"
         minSdkVersion 24
-        targetSdkVersion 35
+        targetSdkVersion 36
         ndkVersion flutter.ndkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu May 02 10:24:49 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/example/android/settings.gradle b/example/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.3.2" apply false
-    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
+    id "com.android.application" version '8.13.0' apply false
+    id "org.jetbrains.kotlin.android" version "2.2.20" apply false
 }
 
 include ":app"
diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>12.0</string>
+  <string>13.0</string>
 </dict>
 </plist>
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -243,7 +243,7 @@
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			packageReferences = (
-				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
 			);
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
 			projectDirPath = "";
@@ -460,7 +460,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -478,7 +478,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = 75Y2P2WSQQ;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -591,7 +591,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -640,7 +640,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -660,7 +660,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = 75Y2P2WSQQ;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -686,7 +686,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = 75Y2P2WSQQ;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -738,7 +738,7 @@
 /* End XCConfigurationList section */
 
 /* Begin XCLocalSwiftPackageReference section */
-		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
 		};
diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -44,6 +44,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -72,6 +73,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/example/lib/widgets/dialogs/box_fit_dialog.dart b/example/lib/widgets/dialogs/box_fit_dialog.dart
@@ -46,10 +46,7 @@ class _BoxFitDialogState extends State<BoxFitDialog> {
             child: Column(
               children: [
                 for (final fit in BoxFit.values)
-                  RadioListTile<BoxFit>(
-                    title: Text(fit.name),
-                    value: fit,
-                  ),
+                  RadioListTile<BoxFit>(title: Text(fit.name), value: fit),
               ],
             ),
           ),
diff --git a/lib/src/method_channel/rotated_preview.dart b/lib/src/method_channel/rotated_preview.dart
@@ -120,7 +120,7 @@ final class _RotatedPreviewState extends State<RotatedPreview> {
 
   @override
   void dispose() {
-    _deviceOrientationSubscription?.cancel();
+    unawaited(_deviceOrientationSubscription?.cancel());
     _deviceOrientationSubscription = null;
     super.dispose();
   }
diff --git a/lib/src/mobile_scanner_controller.dart b/lib/src/mobile_scanner_controller.dart
@@ -134,10 +134,10 @@ class MobileScannerController extends ValueNotifier<MobileScannerState> {
   final Completer<void> _isAttachedCompleter = Completer<void>();
 
   void _disposeListeners() {
-    _barcodesSubscription?.cancel();
-    _torchStateSubscription?.cancel();
-    _zoomScaleSubscription?.cancel();
-    _deviceOrientationSubscription?.cancel();
+    unawaited(_barcodesSubscription?.cancel());
+    unawaited(_torchStateSubscription?.cancel());
+    unawaited(_zoomScaleSubscription?.cancel());
+    unawaited(_deviceOrientationSubscription?.cancel());
 
     _barcodesSubscription = null;
     _torchStateSubscription = null;
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -29,7 +29,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   mocktail: ^1.0.4
-  very_good_analysis: ">=7.0.0 <9.0.0"
+  very_good_analysis: ">=8.0.0 <11.0.0"
 
 flutter:
   plugin:
diff --git a/test/mobile_scanner_test.dart b/test/mobile_scanner_test.dart
@@ -63,7 +63,7 @@ void main() {
   });
 
   tearDown(() {
-    barcodeStreamController.close();
+    unawaited(barcodeStreamController.close());
   });
 
   group('MobileScanner Widget Tests', () {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ buildscript {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
`12`		`- classpath 'com.android.tools.build:gradle:8.10.1'`
	`12`	`+ classpath 'com.android.tools.build:gradle:8.13.0'`
`13`	`13`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`14`	`14`	`}`
`15`	`15`	`}`
`@@ -29,15 +29,15 @@ android {`
`29`	`29`	`namespace 'dev.steenbakker.mobile_scanner'`
`30`	`30`	`}`
`31`	`31`
`32`		`- compileSdk 35`
	`32`	`+ compileSdk 36`
`33`	`33`
`34`	`34`	`compileOptions {`
`35`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`36`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`35`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`36`	`+ targetCompatibility JavaVersion.VERSION_17`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`kotlinOptions {`
`40`		`- jvmTarget = '1.8'`
	`40`	`+ jvmTarget = '17'`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`sourceSets {`
`@@ -73,9 +73,9 @@ dependencies {`
`73`	`73`	`implementation 'com.google.mlkit:barcode-scanning:17.3.0'`
`74`	`74`	`}`
`75`	`75`
`76`		`- implementation 'androidx.camera:camera-lifecycle:1.4.2'`
`77`		`- implementation 'androidx.camera:camera-camera2:1.4.2'`
`78`		`- implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'`
	`76`	`+ implementation 'androidx.camera:camera-lifecycle:1.5.0'`
	`77`	`+ implementation 'androidx.camera:camera-camera2:1.5.0'`
	`78`	`+ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2'`
`79`	`79`
`80`	`80`	`testImplementation 'org.jetbrains.kotlin:kotlin-test'`
`81`	`81`	`testImplementation 'org.mockito:mockito-core:5.19.0'`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ pluginManagement {`
`18`	`18`
`19`	`19`	`plugins {`
`20`	`20`	`id "dev.flutter.flutter-plugin-loader" version "1.0.0"`
`21`		`- id "com.android.application" version "8.3.2" apply false`
`22`		`- id "org.jetbrains.kotlin.android" version "2.0.20" apply false`
	`21`	`+ id "com.android.application" version '8.13.0' apply false`
	`22`	`+ id "org.jetbrains.kotlin.android" version "2.2.20" apply false`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`include ":app"`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ final class _RotatedPreviewState extends State<RotatedPreview> {`
`120`	`120`
`121`	`121`	`@override`
`122`	`122`	`void dispose() {`
`123`		`- _deviceOrientationSubscription?.cancel();`
	`123`	`+ unawaited(_deviceOrientationSubscription?.cancel());`
`124`	`124`	`_deviceOrientationSubscription = null;`
`125`	`125`	`super.dispose();`
`126`	`126`	`}`