From eceff0ae6282f8a63b3ae347427d27da6cdd5f80 Mon Sep 17 00:00:00 2001
From: Pierre-Louis <guidezpl@users.noreply.github.com>
Date: Tue, 4 Feb 2020 12:02:44 +0100
Subject: [PATCH] [Gallery] Disallow GoogleFonts http loading (#307)

* Update pubspec and pubspec.lock

Upgrade packages to latest allowable version
Specify ^ for packages missing it

* Disallow GoogleFonts http loading
---
 gallery/gallery/lib/main.dart |  2 ++
 gallery/gallery/pubspec.lock  | 16 ++++++++--------
 gallery/gallery/pubspec.yaml  |  6 +++---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/gallery/gallery/lib/main.dart b/gallery/gallery/lib/main.dart
index aa9752c32..3f8f7be05 100644
--- a/gallery/gallery/lib/main.dart
+++ b/gallery/gallery/lib/main.dart
@@ -8,6 +8,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart' show timeDilation;
 import 'package:flutter_localized_locales/flutter_localized_locales.dart';
+import 'package:google_fonts/google_fonts.dart';
 import 'package:gallery/constants.dart';
 import 'package:gallery/data/gallery_options.dart';
 import 'package:gallery/l10n/gallery_localizations.dart';
@@ -29,6 +30,7 @@ void setOverrideForDesktop() {
 
 void main() {
   setOverrideForDesktop();
+  GoogleFonts.config.allowHttp = false;
   runApp(GalleryApp());
 }
 
diff --git a/gallery/gallery/pubspec.lock b/gallery/gallery/pubspec.lock
index 2d468f79c..18570d3b4 100644
--- a/gallery/gallery/pubspec.lock
+++ b/gallery/gallery/pubspec.lock
@@ -105,7 +105,7 @@ packages:
       name: flare_dart
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.3"
   flare_flutter:
     dependency: "direct main"
     description:
@@ -136,7 +136,7 @@ packages:
       name: flutter_localized_locales
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -160,7 +160,7 @@ packages:
       name: google_fonts
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.5"
+    version: "0.3.7"
   grinder:
     dependency: "direct dev"
     description:
@@ -202,7 +202,7 @@ packages:
       name: intl
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.16.0"
+    version: "0.16.1"
   intl_translation:
     dependency: "direct main"
     description:
@@ -272,7 +272,7 @@ packages:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.1"
+    version: "1.6.0"
   pedantic:
     dependency: transitive
     description:
@@ -335,14 +335,14 @@ packages:
       name: shared_preferences
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.6"
+    version: "0.5.6+1"
   shared_preferences_macos:
     dependency: transitive
     description:
       name: shared_preferences_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.1+3"
+    version: "0.0.1+4"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
@@ -356,7 +356,7 @@ packages:
       name: shared_preferences_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.2+2"
+    version: "0.1.2+3"
   shrine_images:
     dependency: "direct main"
     description:
diff --git a/gallery/gallery/pubspec.yaml b/gallery/gallery/pubspec.yaml
index 78af378ac..dde53dda0 100644
--- a/gallery/gallery/pubspec.yaml
+++ b/gallery/gallery/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
   intl_translation:
   flutter_localized_locales:
   cupertino_icons: ^0.1.2
-  rally_assets: 1.0.0
+  rally_assets: ^1.0.0
   meta:
   scoped_model:
   shrine_images: ^1.1.2
@@ -23,7 +23,7 @@ dependencies:
   url_launcher: ^5.1.6
   shared_preferences: ^0.5.4+8
   collection: ^1.14.0
-  flutter_gallery_assets: 0.1.9+2
+  flutter_gallery_assets: ^0.1.9+2
   package_info: ^0.4.0+13
   google_fonts: ^0.3.5
 
@@ -31,7 +31,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   grinder: ^0.8.0
-  string_scanner: 1.0.5
+  string_scanner: ^1.0.5
 
 flutter:
   assets: