Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit cc9ba47

Browse files
committed
Update version information
1 parent 94caf49 commit cc9ba47

File tree

6 files changed

+31
-34
lines changed

6 files changed

+31
-34
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
12
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
23
#include "Generated.xcconfig"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
12
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
23
#include "Generated.xcconfig"

packages/camera/camera/example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@
147147
97C146EC1CF9000F007C117D /* Resources */,
148148
9705A1C41CF9048500538489 /* Embed Frameworks */,
149149
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
150-
FE224661708E6DA2A0F8B952 /* [CP] Embed Pods Frameworks */,
151150
);
152151
buildRules = (
153152
);
@@ -252,24 +251,6 @@
252251
shellPath = /bin/sh;
253252
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
254253
};
255-
FE224661708E6DA2A0F8B952 /* [CP] Embed Pods Frameworks */ = {
256-
isa = PBXShellScriptBuildPhase;
257-
buildActionMask = 2147483647;
258-
files = (
259-
);
260-
inputPaths = (
261-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
262-
"${PODS_ROOT}/../Flutter/Flutter.framework",
263-
);
264-
name = "[CP] Embed Pods Frameworks";
265-
outputPaths = (
266-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
267-
);
268-
runOnlyForDeploymentPostprocessing = 0;
269-
shellPath = /bin/sh;
270-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
271-
showEnvVarsInLog = 0;
272-
};
273254
/* End PBXShellScriptBuildPhase section */
274255

275256
/* Begin PBXSourcesBuildPhase section */

packages/camera/camera/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/camera/camera/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ version: 0.8.0-nullsafety
66
homepage: https://github.com/flutter/plugins/tree/master/packages/camera/camera
77

88
# TODO(mvanbeusekom): Contains temporary path reference so should not be publishable. Remove once
9-
# PR 3497 has been merged and published.
9+
# PR 3530 has been merged and published.
1010
publish_to: none
1111

1212
dependencies:
1313
flutter:
1414
sdk: flutter
1515

1616
# TODO(mvanbeusekom): Temporary reference via path to continue NNDB development. Remove once
17-
# PR 3497 has been merged and published.
17+
# PR 3530 has been merged and published.
1818
camera_platform_interface:
1919
path: ../camera_platform_interface
2020

@@ -40,5 +40,5 @@ flutter:
4040
pluginClass: CameraPlugin
4141

4242
environment:
43-
sdk: '>=2.12.0-133.7.beta <3.0.0'
44-
flutter: ">=1.12.13+hotfix.5"
43+
sdk: '>=2.12.0-0 <3.0.0'
44+
flutter: ">=1.22.0"

packages/camera/camera/test/camera_test.dart

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,12 +1315,16 @@ class MockCameraPlatform extends Mock
13151315
.noSuchMethod(Invocation.method(#unlockCaptureOrientation, [cameraId]));
13161316

13171317
@override
1318-
Future<double> getMaxZoomLevel(int? cameraId) async =>
1319-
super.noSuchMethod(Invocation.method(#getMaxZoomLevel, [cameraId]), 1.0);
1318+
Future<double> getMaxZoomLevel(int? cameraId) async => super.noSuchMethod(
1319+
Invocation.method(#getMaxZoomLevel, [cameraId]),
1320+
returnValue: 1.0,
1321+
);
13201322

13211323
@override
1322-
Future<double> getMinZoomLevel(int? cameraId) async =>
1323-
super.noSuchMethod(Invocation.method(#getMinZoomLevel, [cameraId]), 0.0);
1324+
Future<double> getMinZoomLevel(int? cameraId) async => super.noSuchMethod(
1325+
Invocation.method(#getMinZoomLevel, [cameraId]),
1326+
returnValue: 0.0,
1327+
);
13241328

13251329
@override
13261330
Future<void> setZoomLevel(int? cameraId, double? zoom) async =>
@@ -1340,22 +1344,32 @@ class MockCameraPlatform extends Mock
13401344
Invocation.method(#setExposurePoint, [cameraId, point]));
13411345

13421346
@override
1343-
Future<double> getMinExposureOffset(int? cameraId) async => super
1344-
.noSuchMethod(Invocation.method(#getMinExposureOffset, [cameraId]), 0.0);
1347+
Future<double> getMinExposureOffset(int? cameraId) async =>
1348+
super.noSuchMethod(
1349+
Invocation.method(#getMinExposureOffset, [cameraId]),
1350+
returnValue: 0.0,
1351+
);
13451352

13461353
@override
1347-
Future<double> getMaxExposureOffset(int? cameraId) async => super
1348-
.noSuchMethod(Invocation.method(#getMaxExposureOffset, [cameraId]), 1.0);
1354+
Future<double> getMaxExposureOffset(int? cameraId) async =>
1355+
super.noSuchMethod(
1356+
Invocation.method(#getMaxExposureOffset, [cameraId]),
1357+
returnValue: 1.0,
1358+
);
13491359

13501360
@override
13511361
Future<double> getExposureOffsetStepSize(int? cameraId) async =>
13521362
super.noSuchMethod(
1353-
Invocation.method(#getExposureOffsetStepSize, [cameraId]), 1.0);
1363+
Invocation.method(#getExposureOffsetStepSize, [cameraId]),
1364+
returnValue: 1.0,
1365+
);
13541366

13551367
@override
13561368
Future<double> setExposureOffset(int? cameraId, double? offset) async =>
13571369
super.noSuchMethod(
1358-
Invocation.method(#setExposureOffset, [cameraId, offset]), 1.0);
1370+
Invocation.method(#setExposureOffset, [cameraId, offset]),
1371+
returnValue: 1.0,
1372+
);
13591373
}
13601374

13611375
class MockCameraDescription extends CameraDescription {

0 commit comments

Comments
 (0)