Julian Steenbakker
Committed by GitHub

Merge branch 'master' into master

@@ -11,7 +11,7 @@ jobs: @@ -11,7 +11,7 @@ jobs:
11 analysis: 11 analysis:
12 runs-on: ubuntu-latest 12 runs-on: ubuntu-latest
13 steps: 13 steps:
14 - - uses: actions/checkout@v3.5.3 14 + - uses: actions/checkout@v4.0.0
15 - uses: actions/setup-java@v3.12.0 15 - uses: actions/setup-java@v3.12.0
16 with: 16 with:
17 java-version: 11 17 java-version: 11
@@ -28,7 +28,7 @@ jobs: @@ -28,7 +28,7 @@ jobs:
28 formatting: 28 formatting:
29 runs-on: ubuntu-latest 29 runs-on: ubuntu-latest
30 steps: 30 steps:
31 - - uses: actions/checkout@v3.5.3 31 + - uses: actions/checkout@v4.0.0
32 - uses: actions/setup-java@v3.12.0 32 - uses: actions/setup-java@v3.12.0
33 with: 33 with:
34 java-version: 11 34 java-version: 11
@@ -2,14 +2,14 @@ group 'dev.steenbakker.mobile_scanner' @@ -2,14 +2,14 @@ group 'dev.steenbakker.mobile_scanner'
2 version '1.0-SNAPSHOT' 2 version '1.0-SNAPSHOT'
3 3
4 buildscript { 4 buildscript {
5 - ext.kotlin_version = '1.9.0' 5 + ext.kotlin_version = '1.9.10'
6 repositories { 6 repositories {
7 google() 7 google()
8 mavenCentral() 8 mavenCentral()
9 } 9 }
10 10
11 dependencies { 11 dependencies {
12 - classpath 'com.android.tools.build:gradle:8.1.0' 12 + classpath 'com.android.tools.build:gradle:8.1.1'
13 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" 13 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
14 } 14 }
15 } 15 }
1 buildscript { 1 buildscript {
2 - ext.kotlin_version = '1.9.0' 2 + ext.kotlin_version = '1.9.10'
3 repositories { 3 repositories {
4 google() 4 google()
5 mavenCentral() 5 mavenCentral()
6 } 6 }
7 7
8 dependencies { 8 dependencies {
9 - classpath 'com.android.tools.build:gradle:8.1.0' 9 + classpath 'com.android.tools.build:gradle:8.1.1'
10 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" 10 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11 } 11 }
12 } 12 }
@@ -204,7 +204,7 @@ class _MobileScannerState extends State<MobileScanner> @@ -204,7 +204,7 @@ class _MobileScannerState extends State<MobileScanner>
204 alignment: Alignment.center, 204 alignment: Alignment.center,
205 children: [ 205 children: [
206 _scanner(value.size, value.webId, value.textureId), 206 _scanner(value.size, value.webId, value.textureId),
207 - widget.overlay! 207 + widget.overlay!,
208 ], 208 ],
209 ); 209 );
210 } else { 210 } else {
@@ -384,7 +384,7 @@ class MobileScannerController { @@ -384,7 +384,7 @@ class MobileScannerController {
384 barcodes: [ 384 barcodes: [
385 Barcode( 385 Barcode(
386 rawValue: (data as Map)['payload'] as String?, 386 rawValue: (data as Map)['payload'] as String?,
387 - ) 387 + ),
388 ], 388 ],
389 ), 389 ),
390 ); 390 );
@@ -80,7 +80,7 @@ mixin InternalStreamCreation on WebBarcodeReaderBase { @@ -80,7 +80,7 @@ mixin InternalStreamCreation on WebBarcodeReaderBase {
80 'video': VideoOptions( 80 'video': VideoOptions(
81 facingMode: 81 facingMode:
82 cameraFacing == CameraFacing.front ? 'user' : 'environment', 82 cameraFacing == CameraFacing.front ? 'user' : 'environment',
83 - ) 83 + ),
84 }; 84 };
85 } else { 85 } else {
86 constraints = {'video': true}; 86 constraints = {'video': true};
@@ -147,8 +147,8 @@ mixin InternalTorchDetection on InternalStreamCreation { @@ -147,8 +147,8 @@ mixin InternalTorchDetection on InternalStreamCreation {
147 final track = localMediaStream?.getVideoTracks(); 147 final track = localMediaStream?.getVideoTracks();
148 await track?.first.applyConstraints({ 148 await track?.first.applyConstraints({
149 'advanced': [ 149 'advanced': [
150 - {'torch': enabled}  
151 - ] 150 + {'torch': enabled},
  151 + ],
152 }); 152 });
153 } 153 }
154 } 154 }