Skip to content

Commit 2b7dd0e

Browse files
domesticmousedomesticmouse
authoredDec 12, 2021
cookbook: Update for Flutter 2.8.0 (flutter#217)
1 parent 9f8f445 commit 2b7dd0e

25 files changed

+70
-79
lines changed
 

‎cookbook/analysis_options.yaml

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
1-
include: package:flutter_lints/flutter.yaml
2-
3-
analyzer:
4-
strong-mode:
5-
implicit-casts: false
6-
implicit-dynamic: false
1+
include: ../analysis_options.yaml
72

83
linter:
94
rules:
10-
avoid_types_on_closure_parameters: true
11-
avoid_void_async: true
12-
cancel_subscriptions: true
13-
close_sinks: true
14-
directives_ordering: true
15-
package_api_docs: true
16-
package_prefixed_library_names: true
17-
sort_pub_dependencies: true
18-
test_types_in_equals: true
19-
throw_in_finally: true
20-
unnecessary_statements: true
215
use_key_in_widget_constructors: false

‎cookbook/android/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29-
compileSdkVersion 30
29+
compileSdkVersion flutter.compileSdkVersion
3030

3131
compileOptions {
3232
sourceCompatibility JavaVersion.VERSION_1_8
@@ -44,8 +44,8 @@ android {
4444
defaultConfig {
4545
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4646
applicationId "com.example.cookbook"
47-
minSdkVersion 16
48-
targetSdkVersion 30
47+
minSdkVersion flutter.minSdkVersion
48+
targetSdkVersion flutter.targetSdkVersion
4949
versionCode flutterVersionCode.toInteger()
5050
versionName flutterVersionName
5151
}

‎cookbook/android/app/src/main/AndroidManifest.xml

+2-9
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
package="com.example.cookbook">
33
<application
44
android:label="cookbook"
5+
android:name="${applicationName}"
56
android:icon="@mipmap/ic_launcher">
67
<activity
78
android:name=".MainActivity"
9+
android:exported="true"
810
android:launchMode="singleTop"
911
android:theme="@style/LaunchTheme"
1012
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -18,15 +20,6 @@
1820
android:name="io.flutter.embedding.android.NormalTheme"
1921
android:resource="@style/NormalTheme"
2022
/>
21-
<!-- Displays an Android View that continues showing the launch screen
22-
Drawable until Flutter paints its first frame, then this splash
23-
screen fades out. A splash screen is useful to avoid any visual
24-
gap between the end of Android's launch screen and the painting of
25-
Flutter's first frame. -->
26-
<meta-data
27-
android:name="io.flutter.embedding.android.SplashScreenDrawable"
28-
android:resource="@drawable/launch_background"
29-
/>
3023
<intent-filter>
3124
<action android:name="android.intent.action.MAIN"/>
3225
<category android:name="android.intent.category.LAUNCHER"/>

‎cookbook/android/app/src/main/res/values-night/styles.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
This theme determines the color of the Android Window while your
1111
Flutter UI initializes, as well as behind your Flutter UI while its
1212
running.
13-
13+
1414
This Theme is only used starting with V2 of Flutter's Android embedding. -->
1515
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
1616
<item name="android:windowBackground">?android:colorBackground</item>

‎cookbook/android/app/src/main/res/values/styles.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
This theme determines the color of the Android Window while your
1111
Flutter UI initializes, as well as behind your Flutter UI while its
1212
running.
13-
13+
1414
This Theme is only used starting with V2 of Flutter's Android embedding. -->
1515
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
1616
<item name="android:windowBackground">?android:colorBackground</item>

‎cookbook/android/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ allprojects {
2121
rootProject.buildDir = '../build'
2222
subprojects {
2323
project.buildDir = "${rootProject.buildDir}/${project.name}"
24+
}
25+
subprojects {
2426
project.evaluationDependsOn(':app')
2527
}
2628

‎cookbook/ios/Runner.xcodeproj/project.pbxproj

+19-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 50;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -127,7 +127,7 @@
127127
97C146E61CF9000F007C117D /* Project object */ = {
128128
isa = PBXProject;
129129
attributes = {
130-
LastUpgradeCheck = 1020;
130+
LastUpgradeCheck = 1300;
131131
ORGANIZATIONNAME = "";
132132
TargetAttributes = {
133133
97C146ED1CF9000F007C117D = {
@@ -288,9 +288,13 @@
288288
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
289289
CLANG_ENABLE_MODULES = YES;
290290
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
291+
DEVELOPMENT_TEAM = TC87DMJLQP;
291292
ENABLE_BITCODE = NO;
292293
INFOPLIST_FILE = Runner/Info.plist;
293-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
294+
LD_RUNPATH_SEARCH_PATHS = (
295+
"$(inherited)",
296+
"@executable_path/Frameworks",
297+
);
294298
PRODUCT_BUNDLE_IDENTIFIER = com.example.cookbook;
295299
PRODUCT_NAME = "$(TARGET_NAME)";
296300
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -399,7 +403,8 @@
399403
MTL_ENABLE_DEBUG_INFO = NO;
400404
SDKROOT = iphoneos;
401405
SUPPORTED_PLATFORMS = iphoneos;
402-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
406+
SWIFT_COMPILATION_MODE = wholemodule;
407+
SWIFT_OPTIMIZATION_LEVEL = "-O";
403408
TARGETED_DEVICE_FAMILY = "1,2";
404409
VALIDATE_PRODUCT = YES;
405410
};
@@ -412,9 +417,13 @@
412417
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
413418
CLANG_ENABLE_MODULES = YES;
414419
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
420+
DEVELOPMENT_TEAM = TC87DMJLQP;
415421
ENABLE_BITCODE = NO;
416422
INFOPLIST_FILE = Runner/Info.plist;
417-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
423+
LD_RUNPATH_SEARCH_PATHS = (
424+
"$(inherited)",
425+
"@executable_path/Frameworks",
426+
);
418427
PRODUCT_BUNDLE_IDENTIFIER = com.example.cookbook;
419428
PRODUCT_NAME = "$(TARGET_NAME)";
420429
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -431,9 +440,13 @@
431440
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
432441
CLANG_ENABLE_MODULES = YES;
433442
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
443+
DEVELOPMENT_TEAM = TC87DMJLQP;
434444
ENABLE_BITCODE = NO;
435445
INFOPLIST_FILE = Runner/Info.plist;
436-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
446+
LD_RUNPATH_SEARCH_PATHS = (
447+
"$(inherited)",
448+
"@executable_path/Frameworks",
449+
);
437450
PRODUCT_BUNDLE_IDENTIFIER = com.example.cookbook;
438451
PRODUCT_NAME = "$(TARGET_NAME)";
439452
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

‎cookbook/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer = "container:Runner.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
6159
ReferencedContainer = "container:Runner.xcodeproj">
6260
</BuildableReference>
6361
</BuildableProductRunnable>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Profile"

‎cookbook/ios/Runner/Info.plist

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
66
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleDisplayName</key>
8+
<string>Cookbook</string>
79
<key>CFBundleExecutable</key>
810
<string>$(EXECUTABLE_NAME)</string>
911
<key>CFBundleIdentifier</key>
@@ -40,6 +42,6 @@
4042
<string>UIInterfaceOrientationLandscapeRight</string>
4143
</array>
4244
<key>UIViewControllerBasedStatusBarAppearance</key>
43-
<false/>
45+
<true/>
4446
</dict>
4547
</plist>

‎cookbook/lib/app.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
import 'package:flutter/material.dart';
16-
import 'package:flutter_cookbook/main.dart';
16+
import 'main.dart';
1717

1818
@immutable
1919
class App extends StatelessWidget {

‎cookbook/lib/examples/cupertino_download_button.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import 'package:flutter/cupertino.dart';
66
import 'package:flutter/material.dart';
7-
import 'package:flutter_cookbook/app.dart';
7+
import '../app.dart';
88

99
void main() {
1010
runApp(const App(

‎cookbook/lib/examples/drag_and_drop.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
import 'package:flutter/material.dart';
6-
import 'package:flutter_cookbook/app.dart';
6+
import '../app.dart';
77

88
void main() {
99
runApp(

‎cookbook/lib/examples/expandable_fab.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'dart:math' as math;
66

77
import 'package:flutter/material.dart';
8-
import 'package:flutter_cookbook/app.dart';
8+
import '../app.dart';
99

1010
void main() {
1111
runApp(const App(

‎cookbook/lib/examples/gradient_bubbles.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'dart:math';
66
import 'dart:ui' as ui;
77

88
import 'package:flutter/material.dart';
9-
import 'package:flutter_cookbook/app.dart';
9+
import '../app.dart';
1010

1111
void main() {
1212
runApp(const App(

‎cookbook/lib/examples/instagram_filter.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
import 'package:flutter/material.dart';
6-
import 'package:flutter_cookbook/app.dart';
6+
import '../app.dart';
77

88
void main() {
99
runApp(

‎cookbook/lib/items.dart

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
import 'package:flutter/material.dart';
6-
import 'package:flutter_cookbook/examples/cupertino_download_button.dart';
7-
import 'package:flutter_cookbook/examples/drag_and_drop.dart';
8-
import 'package:flutter_cookbook/examples/expandable_fab.dart';
9-
import 'package:flutter_cookbook/examples/gradient_bubbles.dart';
10-
import 'package:flutter_cookbook/examples/instagram_filter.dart';
11-
import 'package:flutter_cookbook/examples/parallax.dart';
12-
import 'package:flutter_cookbook/examples/staggered_animation.dart';
13-
import 'package:flutter_cookbook/examples/typing_indicator.dart';
14-
import 'package:flutter_cookbook/examples/ui_loading_animation.dart';
6+
import 'examples/cupertino_download_button.dart';
7+
import 'examples/drag_and_drop.dart';
8+
import 'examples/expandable_fab.dart';
9+
import 'examples/gradient_bubbles.dart';
10+
import 'examples/instagram_filter.dart';
11+
import 'examples/parallax.dart';
12+
import 'examples/staggered_animation.dart';
13+
import 'examples/typing_indicator.dart';
14+
import 'examples/ui_loading_animation.dart';
1515

1616
final items = <CookbookItem>[
1717
CookbookItem(

‎cookbook/lib/main.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
// limitations under the License.
1414

1515
import 'package:flutter/material.dart';
16-
import 'package:flutter_cookbook/app.dart';
17-
import 'package:flutter_cookbook/items.dart';
16+
import 'app.dart';
17+
import 'items.dart';
1818

1919
void main() {
2020
runApp(const App());

‎cookbook/macos/Runner.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
isa = PBXProject;
183183
attributes = {
184184
LastSwiftUpdateCheck = 0920;
185-
LastUpgradeCheck = 0930;
185+
LastUpgradeCheck = 1300;
186186
ORGANIZATIONNAME = "";
187187
TargetAttributes = {
188188
33CC10EC2044A3C60003C045 = {

‎cookbook/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -36,8 +36,8 @@
3636
ReferencedContainer = "container:Runner.xcodeproj">
3737
</BuildableReference>
3838
</MacroExpansion>
39-
<AdditionalOptions>
40-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4141
</TestAction>
4242
<LaunchAction
4343
buildConfiguration = "Debug"
@@ -59,8 +59,6 @@
5959
ReferencedContainer = "container:Runner.xcodeproj">
6060
</BuildableReference>
6161
</BuildableProductRunnable>
62-
<AdditionalOptions>
63-
</AdditionalOptions>
6462
</LaunchAction>
6563
<ProfileAction
6664
buildConfiguration = "Profile"

‎cookbook/pubspec.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ packages:
8080
name: golden_toolkit
8181
url: "https://pub.dartlang.org"
8282
source: hosted
83-
version: "0.9.0"
83+
version: "0.12.0"
8484
lints:
8585
dependency: transitive
8686
description:
@@ -171,4 +171,4 @@ packages:
171171
source: hosted
172172
version: "2.1.1"
173173
sdks:
174-
dart: ">=2.14.0 <3.0.0"
174+
dart: ">=2.15.0 <3.0.0"

‎cookbook/pubspec.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
name: flutter_cookbook
1+
name: cookbook
22
description: Source project for the design examples in the Flutter cookbook.
3-
publish_to: "none" # Remove this line if you wish to publish to pub.dev
3+
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
44
version: 1.0.0+1
55

66
environment:
7-
sdk: ">=2.12.0 <3.0.0"
7+
sdk: ">=2.15.0 <3.0.0"
88

99
dependencies:
10-
cupertino_icons: ^1.0.1+1
1110
flutter:
1211
sdk: flutter
12+
cupertino_icons: ^1.0.2
1313

1414
dev_dependencies:
15-
flutter_lints: ^1.0.0
1615
flutter_test:
1716
sdk: flutter
18-
golden_toolkit: ^0.9.0
17+
flutter_lints: ^1.0.0
18+
golden_toolkit: ^0.12.0
1919

2020
flutter:
2121
uses-material-design: true

0 commit comments

Comments
 (0)
Please sign in to comment.