Skip to content

Commit

Permalink
Merge branch 'master' into mac_os_fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanduffyne authored Sep 15, 2023
2 parents c7cf763 + 8d7a063 commit b09c91d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/flutter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
analysis:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.5.3
- uses: actions/checkout@v4.0.0
- uses: actions/[email protected]
with:
java-version: 11
Expand All @@ -28,7 +28,7 @@ jobs:
formatting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.5.3
- uses: actions/checkout@v4.0.0
- uses: actions/[email protected]
with:
java-version: 11
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ group 'dev.steenbakker.mobile_scanner'
version '1.0-SNAPSHOT'

buildscript {
ext.kotlin_version = '1.9.0'
ext.kotlin_version = '1.9.10'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.0'
classpath 'com.android.tools.build:gradle:8.1.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
4 changes: 2 additions & 2 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.9.0'
ext.kotlin_version = '1.9.10'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.0'
classpath 'com.android.tools.build:gradle:8.1.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/mobile_scanner.dart
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ class _MobileScannerState extends State<MobileScanner>
alignment: Alignment.center,
children: [
_scanner(value.size, value.webId, value.textureId),
widget.overlay!
widget.overlay!,
],
);
} else {
Expand Down
6 changes: 3 additions & 3 deletions lib/src/web/base.dart
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ mixin InternalStreamCreation on WebBarcodeReaderBase {
'video': VideoOptions(
facingMode:
cameraFacing == CameraFacing.front ? 'user' : 'environment',
)
),
};
} else {
constraints = {'video': true};
Expand Down Expand Up @@ -147,8 +147,8 @@ mixin InternalTorchDetection on InternalStreamCreation {
final track = localMediaStream?.getVideoTracks();
await track?.first.applyConstraints({
'advanced': [
{'torch': enabled}
]
{'torch': enabled},
],
});
}
}
Expand Down

0 comments on commit b09c91d

Please sign in to comment.