Skip to content

Commit

Permalink
Merge pull request X-Wei#56 from X-Wei/dev
Browse files Browse the repository at this point in the history
v2.5.6+61
  • Loading branch information
X-Wei authored Oct 18, 2020
2 parents 44089d6 + 8ccded8 commit 90fa5b4
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 24 deletions.
2 changes: 2 additions & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ if (keystorePropertiesFile.exists()) {

android {
compileSdkVersion 29
// Cf. https://github.com/flutter/flutter/issues/53657#issuecomment-642236438
ndkVersion '21.3.6528147'

lintOptions {
disable 'InvalidPackage'
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.0-rc03'
classpath 'com.android.tools.build:gradle:4.1.0'
classpath 'com.google.gms:google-services:4.3.3'
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/constants.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
// ignore_for_file: constant_identifier_names

// *Note*: when APP_VERSION is changed, remember to also update pubspec.yaml.
const APP_VERSION = 'v2.5.5';
const APP_VERSION = 'v2.5.6';
const APP_NAME = 'Flutter Catalog';
final kAppIcon =
Image.asset('res/images/launcher_icon.png', height: 64.0, width: 64.0);
Expand Down
1 change: 1 addition & 0 deletions lib/my_main_app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class _MyMainAppState extends State<MyMainApp> {
future: this._initAppFuture,
builder:
(BuildContext context, AsyncSnapshot<SharedPreferences> snapshot) {
print('snapshot=$snapshot');
if (!snapshot.hasData) {
return const _MySplashScreen();
}
Expand Down
44 changes: 22 additions & 22 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: flutter_catalog
description: An app showcasing Flutter components, with side-by-side source code view.

# *Note*: when version change, remember to also update constants.dart.
version: 2.5.5+58
version: 2.5.6+61

environment:
sdk: ">=2.7.0 <3.0.0"
Expand All @@ -14,50 +14,50 @@ dependencies:
animations: 1.1.2
async: ^2.4.0
backdrop: 0.4.6
cached_network_image: 2.3.2+1
cached_network_image: 2.3.3
charts_flutter: 0.9.0
cloud_firestore: 0.14.0+2
cloud_firestore: 0.14.1+3
english_words: 3.1.5
extended_image: 1.1.2
firebase_analytics: 6.0.0
firebase_auth: 0.18.0+1
firebase_core: 0.5.0
extended_image: 1.3.0
firebase_analytics: 6.0.2
firebase_auth: 0.18.1+2
firebase_core: 0.5.0+1
firebase_database: 4.0.0
firebase_ml_vision: 0.9.6+2
firebase_storage: 4.0.0
flutter_bloc: 6.0.5
firebase_ml_vision: 0.9.7
firebase_storage: 4.0.1
flutter_bloc: 6.0.6
flutter_gallery_assets: 0.1.9+2
flutter_markdown: 0.4.4
flutter_webview_plugin: 0.3.11
fluttertoast: 7.1.1
google_fonts: 1.1.0
google_sign_in: 4.5.4
google_fonts: 1.1.1
google_sign_in: 4.5.5
hive_flutter: 0.3.1
hive: 1.4.4
hive: 1.4.4+1
http: 0.12.2
image_picker: 0.6.7+11
local_auth: 0.6.3+2
image_picker: 0.6.7+12
local_auth: 0.6.3+3
lottie: 0.6.0
package_info: 0.4.3
path_provider: 1.6.18
path_provider: 1.6.21
path: 1.7.0
provider: 4.3.2+2
scoped_model: 1.0.1
sembast: 2.4.7
shared_preferences: 0.5.12
sembast: 2.4.7+7
shared_preferences: 0.5.12+2
sqflite: 1.3.1+1
substring_highlight: 0.1.2
syntax_highlighter: 0.1.1
transparent_image: 1.0.0
url_launcher: 5.7.2
video_player: 0.11.0
url_launcher: 5.7.5
video_player: 0.11.1+2
widget_with_codeview: 1.0.3

dev_dependencies:
flutter_test:
sdk: flutter
hive_generator: 0.7.2+1
build_runner: 1.10.0
hive_generator: 0.8.1
build_runner: 1.10.3

dependency_overrides:
dartx: ^0.5.0
Expand Down

0 comments on commit 90fa5b4

Please sign in to comment.