From f49b9b2e24e64a0dba0e43a92033d4160f6445e0 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Fri, 13 Dec 2019 00:45:53 +0900 Subject: [PATCH] upgraded flutter v1.12.13+hotfix.5 + gradle + packages + gitignore --- .gitignore | 43 ++------------------------ android/.gitignore | 7 +++++ android/app/build.gradle | 4 +-- android/build.gradle | 2 +- ios/.gitignore | 32 +++++++++++++++++++ pubspec.lock | 66 ++++++++++++++++++++++++++++++++-------- 6 files changed, 98 insertions(+), 56 deletions(-) create mode 100644 android/.gitignore create mode 100644 ios/.gitignore diff --git a/.gitignore b/.gitignore index 47ed833c4..ae1f1838e 100644 --- a/.gitignore +++ b/.gitignore @@ -24,51 +24,14 @@ **/doc/api/ .dart_tool/ .flutter-plugins +.flutter-plugins-dependencies .packages .pub-cache/ .pub/ /build/ -# Android related -**/android/**/gradle-wrapper.jar -**/android/.gradle -**/android/captures/ -**/android/gradlew -**/android/gradlew.bat -**/android/local.properties -**/android/**/GeneratedPluginRegistrant.java -.gradle - -# iOS/XCode related -**/ios/**/*.mode1v3 -**/ios/**/*.mode2v3 -**/ios/**/*.moved-aside -**/ios/**/*.pbxuser -**/ios/**/*.perspectivev3 -**/ios/**/*sync/ -**/ios/**/.sconsign.dblite -**/ios/**/.tags* -**/ios/**/.vagrant/ -**/ios/**/DerivedData/ -**/ios/**/Icon? -**/ios/**/Pods/ -**/ios/**/.symlinks/ -**/ios/**/profile -**/ios/**/xcuserdata -**/ios/.generated/ -**/ios/Flutter/App.framework -**/ios/Flutter/Flutter.framework -**/ios/Flutter/Generated.xcconfig -**/ios/Flutter/app.flx -**/ios/Flutter/app.zip -**/ios/Flutter/flutter_assets/ -**/ios/ServiceDefinitions.json -**/ios/Runner/GeneratedPluginRegistrant.* +# Web related +lib/generated_plugin_registrant.dart # Exceptions to above rules. -!**/ios/**/default.mode1v3 -!**/ios/**/default.mode2v3 -!**/ios/**/default.pbxuser -!**/ios/**/default.perspectivev3 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages -ios/Flutter/flutter_export_environment.sh diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 000000000..bc2100d8f --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,7 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java diff --git a/android/app/build.gradle b/android/app/build.gradle index 1b2f60e06..a5d587069 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -61,6 +61,6 @@ dependencies { implementation 'com.google.guava:guava:28.0-android' implementation 'com.karumi:dexter:5.0.0' testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' } diff --git a/android/build.gradle b/android/build.gradle index e0d7ae2c1..6de372893 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.5.3' } } diff --git a/ios/.gitignore b/ios/.gitignore new file mode 100644 index 000000000..e96ef602b --- /dev/null +++ b/ios/.gitignore @@ -0,0 +1,32 @@ +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/pubspec.lock b/pubspec.lock index ab6277eb7..104788c29 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: archive url: "https://pub.dartlang.org" source: hosted - version: "2.0.10" + version: "2.0.11" args: dependency: transitive description: @@ -21,7 +21,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.4.0" boolean_selector: dependency: transitive description: @@ -106,6 +106,11 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" geocoder: dependency: "direct main" description: @@ -119,7 +124,7 @@ packages: name: google_maps_flutter url: "https://pub.dartlang.org" source: hosted - version: "0.5.21+12" + version: "0.5.21+15" image: dependency: transitive description: @@ -140,14 +145,14 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.5" + version: "0.12.6" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.1.8" path: dependency: "direct main" description: @@ -175,7 +180,7 @@ packages: name: pdf url: "https://pub.dartlang.org" source: hosted - version: "1.3.24" + version: "1.3.25" pedantic: dependency: transitive description: @@ -210,7 +215,7 @@ packages: name: printing url: "https://pub.dartlang.org" source: hosted - version: "2.1.8" + version: "3.0.0" quiver: dependency: transitive description: @@ -231,7 +236,28 @@ packages: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "0.5.4+5" + version: "0.5.6" + shared_preferences_macos: + dependency: transitive + description: + name: shared_preferences_macos + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.1" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.2" sky_engine: dependency: transitive description: flutter @@ -250,7 +276,7 @@ packages: name: sqflite url: "https://pub.dartlang.org" source: hosted - version: "1.1.7+2" + version: "1.1.8" stack_trace: dependency: transitive description: @@ -278,7 +304,7 @@ packages: name: synchronized url: "https://pub.dartlang.org" source: hosted - version: "2.1.0+2" + version: "2.1.1" term_glyph: dependency: transitive description: @@ -292,7 +318,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.5" + version: "0.2.11" transparent_image: dependency: "direct main" description: @@ -334,7 +360,21 @@ packages: name: video_player url: "https://pub.dartlang.org" source: hosted - version: "0.10.3+1" + version: "0.10.5" + video_player_platform_interface: + dependency: transitive + description: + name: video_player_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" + video_player_web: + dependency: transitive + description: + name: video_player_web + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.1" xml: dependency: transitive description: @@ -344,4 +384,4 @@ packages: version: "3.5.0" sdks: dart: ">=2.5.0 <3.0.0" - flutter: ">=1.9.1+hotfix.5 <2.0.0" + flutter: ">=1.12.13+hotfix.4 <2.0.0"