Skip to content

Commit 1227348

Browse files
albertmiroalbertmiro
authored
Merge pull request #1 from albertmiro/feature/update_versions
Update versions
2 parents 8fd0b7d + b702225 commit 1227348

File tree

7 files changed

+120
-99
lines changed

7 files changed

+120
-99
lines changed

‎android/gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
org.gradle.jvmargs=-Xmx1536M
2+
android.enableR8=true

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
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-
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
13-
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
14-
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
15-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1612
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
1713
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
1814
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
@@ -28,8 +24,6 @@
2824
dstPath = "";
2925
dstSubfolderSpec = 10;
3026
files = (
31-
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
32-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
3327
);
3428
name = "Embed Frameworks";
3529
runOnlyForDeploymentPostprocessing = 0;
@@ -40,13 +34,11 @@
4034
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4135
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
4236
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
43-
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
4437
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4538
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
4639
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
4740
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
4841
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
49-
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
5042
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
5143
97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
5244
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -60,8 +52,6 @@
6052
isa = PBXFrameworksBuildPhase;
6153
buildActionMask = 2147483647;
6254
files = (
63-
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
64-
3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
6555
);
6656
runOnlyForDeploymentPostprocessing = 0;
6757
};
@@ -71,9 +61,7 @@
7161
9740EEB11CF90186004384FC /* Flutter */ = {
7262
isa = PBXGroup;
7363
children = (
74-
3B80C3931E831B6300D905FE /* App.framework */,
7564
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
76-
9740EEBA1CF902C7004384FC /* Flutter.framework */,
7765
9740EEB21CF90195004384FC /* Debug.xcconfig */,
7866
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
7967
9740EEB31CF90195004384FC /* Generated.xcconfig */,
@@ -206,7 +194,7 @@
206194
);
207195
runOnlyForDeploymentPostprocessing = 0;
208196
shellPath = /bin/sh;
209-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
197+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
210198
};
211199
9740EEB61CF901F6004384FC /* Run Script */ = {
212200
isa = PBXShellScriptBuildPhase;
@@ -259,7 +247,6 @@
259247
/* Begin XCBuildConfiguration section */
260248
249021D3217E4FDB00AE95B9 /* Profile */ = {
261249
isa = XCBuildConfiguration;
262-
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
263250
buildSettings = {
264251
ALWAYS_SEARCH_USER_PATHS = NO;
265252
CLANG_ANALYZER_NONNULL = YES;
@@ -331,7 +318,6 @@
331318
};
332319
97C147031CF9000F007C117D /* Debug */ = {
333320
isa = XCBuildConfiguration;
334-
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
335321
buildSettings = {
336322
ALWAYS_SEARCH_USER_PATHS = NO;
337323
CLANG_ANALYZER_NONNULL = YES;
@@ -385,7 +371,6 @@
385371
};
386372
97C147041CF9000F007C117D /* Release */ = {
387373
isa = XCBuildConfiguration;
388-
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
389374
buildSettings = {
390375
ALWAYS_SEARCH_USER_PATHS = NO;
391376
CLANG_ANALYZER_NONNULL = YES;

‎lib/blocs/movie_detail_bloc.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class MovieDetailBloc {
1111

1212
Function(int) get fetchTrailersById => _movieId.sink.add;
1313

14-
Observable<Future<Trailers>> get movieTrailers => _trailers.stream;
14+
Stream<Future<Trailers>> get movieTrailers => _trailers.stream;
1515

1616
MovieDetailBloc() {
1717
_movieId.stream.transform(_itemTransformer()).pipe(_trailers);

‎lib/blocs/movies_bloc.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class MoviesBloc {
77
final _repository = Repository();
88
final _moviesFetcher = PublishSubject<Movies>();
99

10-
Observable<Movies> get allMovies => _moviesFetcher.stream;
10+
Stream<Movies> get allMovies => _moviesFetcher.stream;
1111

1212
fetchAllMovies() async {
1313
Movies itemModel = await _repository.fetchAllMovies();

‎lib/ui/movie_detail.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ class MovieDetailState extends State<MovieDetail> {
197197
}
198198
}
199199

200-
trailerItem(Trailers data, int index) {
200+
Widget trailerItem(Trailers data, int index) {
201201
return Expanded(
202202
child: Column(
203203
children: <Widget>[

0 commit comments

Comments
 (0)