1
0
mirror of https://github.com/flutter/samples.git synced 2025-11-08 13:58:47 +00:00

Lands beta branch into master for 2.5 (#895)

This commit is contained in:
Andrew Brogdon
2021-09-08 17:35:05 -07:00
committed by GitHub
parent e43698fa01
commit 4cac0e6661
54 changed files with 188 additions and 277 deletions

View File

@@ -28,7 +28,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.8.2"
version: "2.8.1"
boolean_selector:
dependency: transitive
description:
@@ -36,27 +36,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
build:
dependency: transitive
description:
name: build
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
built_collection:
dependency: transitive
description:
name: built_collection
url: "https://pub.dartlang.org"
source: hosted
version: "5.1.1"
built_value:
dependency: transitive
description:
name: built_value
url: "https://pub.dartlang.org"
source: hosted
version: "8.1.2"
characters:
dependency: transitive
description:
@@ -85,13 +64,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
code_builder:
dependency: transitive
description:
name: code_builder
url: "https://pub.dartlang.org"
source: hosted
version: "4.1.0"
collection:
dependency: transitive
description:
@@ -113,13 +85,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.1"
dart_style:
dependency: transitive
description:
name: dart_style
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.3"
fake_async:
dependency: transitive
description:
@@ -134,13 +99,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.2"
fixnum:
dependency: transitive
description:
name: fixnum
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0"
flutter:
dependency: "direct main"
description: flutter
@@ -152,7 +110,7 @@ packages:
name: flutter_lints
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.3"
version: "1.0.4"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -172,20 +130,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
logging:
dependency: transitive
description:
name: logging
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.11"
version: "0.12.10"
meta:
dependency: transitive
description:
@@ -193,13 +144,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.7.0"
mockito:
dependency: "direct dev"
description:
name: mockito
url: "https://pub.dartlang.org"
source: hosted
version: "5.0.15"
package_config:
dependency: transitive
description:
@@ -227,7 +171,7 @@ packages:
name: pigeon
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
version: "1.0.2"
pub_semver:
dependency: transitive
description:
@@ -240,13 +184,6 @@ packages:
description: flutter
source: sdk
version: "0.0.99"
source_gen:
dependency: transitive
description:
name: source_gen
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.3"
source_span:
dependency: transitive
description:
@@ -288,7 +225,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.3"
version: "0.4.2"
typed_data:
dependency: transitive
description:

View File

@@ -13,11 +13,10 @@ dependencies:
sdk: flutter
dev_dependencies:
pigeon: ^1.0.0
mockito: ^5.0.0
pigeon: ^1.0.2
flutter_test:
sdk: flutter
flutter_lints: ^1.0.0
flutter_lints: ^1.0.4
flutter:
uses-material-design: true

View File

@@ -6,7 +6,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_module_books/api.dart';
import 'package:flutter_module_books/main.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/mockito.dart';
void main() {
testWidgets('Pressing clear calls the cancel API', (tester) async {
@@ -20,7 +19,7 @@ void main() {
await tester.tap(find.byIcon(Icons.clear));
verify(mockHostApi.cancel());
expect(mockHostApi.cancelCalls, 1);
});
testWidgets('Pressing done calls the finish editing API', (tester) async {
@@ -34,8 +33,22 @@ void main() {
await tester.tap(find.byIcon(Icons.check));
verify(mockHostApi.finishEditingBook(any));
expect(mockHostApi.booksFinished.length, 1);
});
}
class MockHostBookApi extends Mock implements HostBookApi {}
// A super-simple mock for testing that calls are made to the API.
class MockHostBookApi implements HostBookApi {
int cancelCalls = 0;
final booksFinished = <Book>[];
@override
Future<void> cancel() async {
cancelCalls++;
}
@override
Future<void> finishEditingBook(Book arg) async {
booksFinished.add(arg);
}
}

View File

@@ -109,7 +109,6 @@
buildConfigurationList = 0DDE4C4B25E0390700389930 /* Build configuration list for PBXNativeTarget "IosBooks" */;
buildPhases = (
10D6942EFE7900338BEA50F9 /* [CP] Check Pods Manifest.lock */,
676852EE9ED16CAB1E3D2710 /* [CP] Prepare Artifacts */,
887B098B8DCF409FE0F1E164 /* [CP-User] Run Flutter Build flutter_module_books Script */,
0DDE4C3325E0390700389930 /* Sources */,
0DDE4C3425E0390700389930 /* Frameworks */,
@@ -194,23 +193,6 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
676852EE9ED16CAB1E3D2710 /* [CP] Prepare Artifacts */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-IosBooks/Pods-IosBooks-artifacts-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Prepare Artifacts";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-IosBooks/Pods-IosBooks-artifacts-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-IosBooks/Pods-IosBooks-artifacts.sh\"\n";
showEnvVarsInLog = 0;
};
887B098B8DCF409FE0F1E164 /* [CP-User] Run Flutter Build flutter_module_books Script */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;

View File

@@ -25,4 +25,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 96e3c2df11e96c20ece1d4185fde634ec6324fcc
COCOAPODS: 1.9.3
COCOAPODS: 1.10.1

View File

@@ -25,4 +25,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 1f9809794b37c933b7cb40791d64724dc2376c54
COCOAPODS: 1.10.0
COCOAPODS: 1.10.1

View File

@@ -108,7 +108,6 @@
buildConfigurationList = 0D61B1F225BB8A2400A1A590 /* Build configuration list for PBXNativeTarget "MultipleFluttersIos" */;
buildPhases = (
3BC074A3AF94322EF6E73F8B /* [CP] Check Pods Manifest.lock */,
C63B2D75D5C822F12D344293 /* [CP] Prepare Artifacts */,
9A714FC9CCEF3D4EFCAF0E2F /* [CP-User] Run Flutter Build multiple_flutters_module Script */,
0D61B1DA25BB8A2300A1A590 /* Sources */,
0D61B1DB25BB8A2300A1A590 /* Frameworks */,
@@ -202,23 +201,6 @@
shellPath = /bin/sh;
shellScript = "set -e\nset -u\nsource \"${SRCROOT}/../multiple_flutters_module/.ios/Flutter/flutter_export_environment.sh\"\nexport VERBOSE_SCRIPT_LOGGING=1 && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/xcode_backend.sh build";
};
C63B2D75D5C822F12D344293 /* [CP] Prepare Artifacts */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-MultipleFluttersIos/Pods-MultipleFluttersIos-artifacts-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Prepare Artifacts";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-MultipleFluttersIos/Pods-MultipleFluttersIos-artifacts-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MultipleFluttersIos/Pods-MultipleFluttersIos-artifacts.sh\"\n";
showEnvVarsInLog = 0;
};
D93C82A75960A3ABB9D69453 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;

View File

@@ -19,10 +19,10 @@ EXTERNAL SOURCES:
:path: "../multiple_flutters_module/.ios/Flutter"
SPEC CHECKSUMS:
Flutter: ac41d61a47ae5bf8195a5598d2d63754888ec0d5
Flutter: bdfa2e8fe0e2880a2c6a58a0b1a8675c262a07af
FlutterPluginRegistrant: 2afd5ea46d3a949472c9b7da6462d8fbf7d8b16e
multiple_flutters_module: fdf461a0e4225614d475110d85db6fd6de5aeff1
PODFILE CHECKSUM: d7f39981f450db398859f05de2475ec53909a487
COCOAPODS: 1.9.3
COCOAPODS: 1.10.1

View File

@@ -7,7 +7,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.6.1"
version: "2.8.1"
boolean_selector:
dependency: transitive
description:
@@ -28,7 +28,7 @@ packages:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.1"
clock:
dependency: transitive
description:
@@ -94,7 +94,7 @@ packages:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "1.7.0"
path:
dependency: transitive
description:
@@ -148,7 +148,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.0"
version: "0.4.2"
typed_data:
dependency: transitive
description:

View File

@@ -39,4 +39,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 357b6c94e1edb8289fba0dbdd79daa105ab9d88c
COCOAPODS: 1.10.0
COCOAPODS: 1.10.1

View File

@@ -14,7 +14,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.6.1"
version: "2.8.1"
boolean_selector:
dependency: transitive
description:
@@ -35,7 +35,7 @@ packages:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.1"
clock:
dependency: transitive
description:
@@ -77,7 +77,7 @@ packages:
name: file
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.0"
version: "6.1.2"
flutter:
dependency: "direct main"
description: flutter
@@ -125,7 +125,7 @@ packages:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "1.7.0"
nested:
dependency: transitive
description:
@@ -153,7 +153,7 @@ packages:
name: process
url: "https://pub.dartlang.org"
source: hosted
version: "4.2.1"
version: "4.2.3"
provider:
dependency: "direct main"
description:
@@ -214,7 +214,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.0"
version: "0.4.2"
typed_data:
dependency: transitive
description:
@@ -235,7 +235,7 @@ packages:
name: vm_service
url: "https://pub.dartlang.org"
source: hosted
version: "6.2.0"
version: "7.1.1"
webdriver:
dependency: transitive
description: