Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 672cebb

Browse files
committed
migration to flutter 2.5.3
1 parent d9036a7 commit 672cebb

File tree

18 files changed

+308
-333
lines changed

18 files changed

+308
-333
lines changed

‎ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>8.0</string>
24+
<string>9.0</string>
2525
</dict>
2626
</plist>

‎ios/Flutter/Debug.xcconfig

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

‎ios/Flutter/Release.xcconfig

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

‎ios/Runner.xcodeproj/project.pbxproj

Lines changed: 72 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12+
5C4E4A9529FB495628BE0A52 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A0BAD2471F7AF3D972CCF011 /* Pods_Runner.framework */; };
1213
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
1314
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1415
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -31,7 +32,9 @@
3132
/* Begin PBXFileReference section */
3233
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3334
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
35+
27949AAD2E3A6380BC558800 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
3436
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
37+
4988A1024EE7D9A2BEDA6B48 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
3538
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
3639
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3740
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -42,19 +45,30 @@
4245
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4346
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4447
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
48+
A0BAD2471F7AF3D972CCF011 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
49+
A688FEF12B6E7D1C0A9D77C7 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
4550
/* End PBXFileReference section */
4651

4752
/* Begin PBXFrameworksBuildPhase section */
4853
97C146EB1CF9000F007C117D /* Frameworks */ = {
4954
isa = PBXFrameworksBuildPhase;
5055
buildActionMask = 2147483647;
5156
files = (
57+
5C4E4A9529FB495628BE0A52 /* Pods_Runner.framework in Frameworks */,
5258
);
5359
runOnlyForDeploymentPostprocessing = 0;
5460
};
5561
/* End PBXFrameworksBuildPhase section */
5662

5763
/* Begin PBXGroup section */
64+
87A09D3CC200B8B1F5C7DBA4 /* Frameworks */ = {
65+
isa = PBXGroup;
66+
children = (
67+
A0BAD2471F7AF3D972CCF011 /* Pods_Runner.framework */,
68+
);
69+
name = Frameworks;
70+
sourceTree = "<group>";
71+
};
5872
9740EEB11CF90186004384FC /* Flutter */ = {
5973
isa = PBXGroup;
6074
children = (
@@ -72,6 +86,8 @@
7286
9740EEB11CF90186004384FC /* Flutter */,
7387
97C146F01CF9000F007C117D /* Runner */,
7488
97C146EF1CF9000F007C117D /* Products */,
89+
CA5D4F72E797B7877C3D8BC8 /* Pods */,
90+
87A09D3CC200B8B1F5C7DBA4 /* Frameworks */,
7591
);
7692
sourceTree = "<group>";
7793
};
@@ -106,19 +122,32 @@
106122
name = "Supporting Files";
107123
sourceTree = "<group>";
108124
};
125+
CA5D4F72E797B7877C3D8BC8 /* Pods */ = {
126+
isa = PBXGroup;
127+
children = (
128+
A688FEF12B6E7D1C0A9D77C7 /* Pods-Runner.debug.xcconfig */,
129+
4988A1024EE7D9A2BEDA6B48 /* Pods-Runner.release.xcconfig */,
130+
27949AAD2E3A6380BC558800 /* Pods-Runner.profile.xcconfig */,
131+
);
132+
name = Pods;
133+
path = Pods;
134+
sourceTree = "<group>";
135+
};
109136
/* End PBXGroup section */
110137

111138
/* Begin PBXNativeTarget section */
112139
97C146ED1CF9000F007C117D /* Runner */ = {
113140
isa = PBXNativeTarget;
114141
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
115142
buildPhases = (
143+
F121F1FBDC83888888124946 /* [CP] Check Pods Manifest.lock */,
116144
9740EEB61CF901F6004384FC /* Run Script */,
117145
97C146EA1CF9000F007C117D /* Sources */,
118146
97C146EB1CF9000F007C117D /* Frameworks */,
119147
97C146EC1CF9000F007C117D /* Resources */,
120148
9705A1C41CF9048500538489 /* Embed Frameworks */,
121149
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
150+
19C664C09B692F9E83446F14 /* [CP] Embed Pods Frameworks */,
122151
);
123152
buildRules = (
124153
);
@@ -177,6 +206,24 @@
177206
/* End PBXResourcesBuildPhase section */
178207

179208
/* Begin PBXShellScriptBuildPhase section */
209+
19C664C09B692F9E83446F14 /* [CP] Embed Pods Frameworks */ = {
210+
isa = PBXShellScriptBuildPhase;
211+
buildActionMask = 2147483647;
212+
files = (
213+
);
214+
inputPaths = (
215+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
216+
"${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework",
217+
);
218+
name = "[CP] Embed Pods Frameworks";
219+
outputPaths = (
220+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework",
221+
);
222+
runOnlyForDeploymentPostprocessing = 0;
223+
shellPath = /bin/sh;
224+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
225+
showEnvVarsInLog = 0;
226+
};
180227
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
181228
isa = PBXShellScriptBuildPhase;
182229
buildActionMask = 2147483647;
@@ -205,6 +252,28 @@
205252
shellPath = /bin/sh;
206253
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
207254
};
255+
F121F1FBDC83888888124946 /* [CP] Check Pods Manifest.lock */ = {
256+
isa = PBXShellScriptBuildPhase;
257+
buildActionMask = 2147483647;
258+
files = (
259+
);
260+
inputFileListPaths = (
261+
);
262+
inputPaths = (
263+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
264+
"${PODS_ROOT}/Manifest.lock",
265+
);
266+
name = "[CP] Check Pods Manifest.lock";
267+
outputFileListPaths = (
268+
);
269+
outputPaths = (
270+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
271+
);
272+
runOnlyForDeploymentPostprocessing = 0;
273+
shellPath = /bin/sh;
274+
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";
275+
showEnvVarsInLog = 0;
276+
};
208277
/* End PBXShellScriptBuildPhase section */
209278

210279
/* Begin PBXSourcesBuildPhase section */
@@ -241,7 +310,6 @@
241310
/* Begin XCBuildConfiguration section */
242311
249021D3217E4FDB00AE95B9 /* Profile */ = {
243312
isa = XCBuildConfiguration;
244-
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
245313
buildSettings = {
246314
ALWAYS_SEARCH_USER_PATHS = NO;
247315
CLANG_ANALYZER_NONNULL = YES;
@@ -281,7 +349,7 @@
281349
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
282350
GCC_WARN_UNUSED_FUNCTION = YES;
283351
GCC_WARN_UNUSED_VARIABLE = YES;
284-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
352+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
285353
MTL_ENABLE_DEBUG_INFO = NO;
286354
SDKROOT = iphoneos;
287355
SUPPORTED_PLATFORMS = iphoneos;
@@ -318,7 +386,6 @@
318386
};
319387
97C147031CF9000F007C117D /* Debug */ = {
320388
isa = XCBuildConfiguration;
321-
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
322389
buildSettings = {
323390
ALWAYS_SEARCH_USER_PATHS = NO;
324391
CLANG_ANALYZER_NONNULL = YES;
@@ -364,7 +431,7 @@
364431
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
365432
GCC_WARN_UNUSED_FUNCTION = YES;
366433
GCC_WARN_UNUSED_VARIABLE = YES;
367-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
434+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
368435
MTL_ENABLE_DEBUG_INFO = YES;
369436
ONLY_ACTIVE_ARCH = YES;
370437
SDKROOT = iphoneos;
@@ -374,7 +441,6 @@
374441
};
375442
97C147041CF9000F007C117D /* Release */ = {
376443
isa = XCBuildConfiguration;
377-
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
378444
buildSettings = {
379445
ALWAYS_SEARCH_USER_PATHS = NO;
380446
CLANG_ANALYZER_NONNULL = YES;
@@ -414,7 +480,7 @@
414480
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
415481
GCC_WARN_UNUSED_FUNCTION = YES;
416482
GCC_WARN_UNUSED_VARIABLE = YES;
417-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
483+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
418484
MTL_ENABLE_DEBUG_INFO = NO;
419485
SDKROOT = iphoneos;
420486
SUPPORTED_PLATFORMS = iphoneos;

‎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.

‎ios/Runner.xcworkspace/contents.xcworkspacedata

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/src/app.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ class MyApp extends StatelessWidget {
1212
title: 'MoviesDB for Testing',
1313
theme: ThemeData(primarySwatch: Colors.blue),
1414
home: BlocProvider(
15-
builder: (context) => AppBloc(
15+
create: (context) => AppBloc(
1616
service: Provider.of<AppService>(
1717
context,
1818
listen: false,
1919
),
20+
initWithState: AppEmpty(),
2021
),
2122
child: MyHomePage(title: 'Flutter Testing Tutorial'),
2223
),

‎lib/src/blocs/app_bloc.dart

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
import 'package:bloc/bloc.dart';
2-
import 'package:meta/meta.dart';
32
import 'package:flutter_movie_deep_dive_test/src/blocs/blocs.dart';
43
import 'package:flutter_movie_deep_dive_test/src/services/services.dart';
54

65
class AppBloc extends Bloc<AppEvent, AppState> {
76
final AppService service;
87
final AppState initWithState;
98

10-
AppBloc({@required this.service, this.initWithState});
11-
12-
@override
13-
AppState get initialState =>
14-
initWithState == null ? AppEmpty() : initWithState;
9+
AppBloc({
10+
required this.service,
11+
required this.initWithState,
12+
}) : super(initWithState);
1513

1614
@override
1715
Stream<AppState> mapEventToState(AppEvent event) async* {

‎lib/src/blocs/app_state.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:equatable/equatable.dart';
2-
import 'package:flutter/material.dart';
32
import 'package:flutter_movie_deep_dive_test/src/models/models.dart';
43

54
abstract class AppState extends Equatable {
@@ -16,5 +15,5 @@ class AppLoading extends AppState {}
1615
class AppLoaded extends AppState {
1716
final MoviesResponse response;
1817

19-
AppLoaded({@required this.response});
18+
AppLoaded({required this.response});
2019
}

‎lib/src/models/movies.dart

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ class MoviesResponse extends Equatable {
1313
@JsonKey(name: 'total_pages')
1414
final int totalPages;
1515

16-
@JsonKey(nullable:false, name: 'results')
16+
@JsonKey(name: 'results')
1717
final List<Movie> movies;
1818

1919
MoviesResponse({
20-
this.page,
21-
this.totalPages,
22-
this.totalResults,
23-
this.movies,
20+
requiredthis.page,
21+
requiredthis.totalPages,
22+
requiredthis.totalResults,
23+
requiredthis.movies,
2424
});
2525

2626
factory MoviesResponse.fromJson(Map<String, dynamic> json) =>
@@ -77,20 +77,20 @@ class Movie extends Equatable {
7777
final bool favorite;
7878

7979
Movie({
80-
this.id,
81-
this.video,
82-
this.voteCount,
83-
this.voteAverage,
84-
this.title,
85-
this.posterPath,
86-
this.originalLanguage,
87-
this.originalTitle,
88-
this.adult,
89-
this.overview,
90-
this.backdropPath,
91-
this.popularity,
92-
this.releaseDate,
93-
this.favorite,
80+
requiredthis.id,
81+
requiredthis.video,
82+
requiredthis.voteCount,
83+
requiredthis.voteAverage,
84+
requiredthis.title,
85+
requiredthis.posterPath,
86+
requiredthis.originalLanguage,
87+
requiredthis.originalTitle,
88+
requiredthis.adult,
89+
requiredthis.overview,
90+
requiredthis.backdropPath,
91+
requiredthis.popularity,
92+
requiredthis.releaseDate,
93+
requiredthis.favorite,
9494
});
9595

9696
factory Movie.fromJson(Map<String, dynamic> json) => _$MovieFromJson(json);

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /