use the newer Flutter sdk reference style
diff --git a/.analysis_options b/.analysis_options
index c702eea..19c7129 100644
--- a/.analysis_options
+++ b/.analysis_options
@@ -1,7 +1,4 @@
analyzer:
strong-mode: true
- language:
- enableConditionalDirectives: true
exclude:
- - example/flutter_example/**
- lib/src/usage_impl_flutter.dart
diff --git a/changelog.md b/changelog.md
index 0d5a5d7..4379c44 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,8 @@
# Changelog
+## unreleased
+- updated the Flutter example pubspec to use the newer Flutter sdk reference style
+
## 2.2.2
- adjust the Flutter usage client to Flutter API changes
diff --git a/example/flutter_example/lib/main.dart b/example/flutter_example/lib/main.dart
index ff2d78d..eceae54 100644
--- a/example/flutter_example/lib/main.dart
+++ b/example/flutter_example/lib/main.dart
@@ -15,7 +15,7 @@
theme: new ThemeData.dark(),
routes: <String, WidgetBuilder>{
'/': (BuildContext context) => new FlutterDemo(ga)
- }
+ },
));
}
@@ -46,28 +46,28 @@
Widget build(BuildContext context) {
return new Scaffold(
appBar: new AppBar(
- title: new Text('Usage Example')
+ title: new Text('Usage Example'),
),
body: new Column(
children: <Widget>[
new Center(
- child: new Text("Button pressed $_times times.")
+ child: new Text("Button pressed $_times times."),
),
new ListItem(
onTap: () => _handleOptIn(!config.ga.enabled),
leading: new Checkbox(
value: config.ga.enabled,
- onChanged: _handleOptIn
+ onChanged: _handleOptIn,
),
- title: new Text("Opt in to analytics")
- )
+ title: new Text("Opt in to analytics"),
+ ),
],
- mainAxisAlignment: MainAxisAlignment.spaceAround
+ mainAxisAlignment: MainAxisAlignment.spaceAround,
),
floatingActionButton: new FloatingActionButton(
- child: new Icon(icon: Icons.add),
- onPressed: _handleButtonPressed
- )
+ child: new Icon(Icons.add),
+ onPressed: _handleButtonPressed,
+ ),
);
}
}
diff --git a/example/flutter_example/pubspec.yaml b/example/flutter_example/pubspec.yaml
index e95d585..52d5cb7 100644
--- a/example/flutter_example/pubspec.yaml
+++ b/example/flutter_example/pubspec.yaml
@@ -1,7 +1,12 @@
name: flutter_example
description: Create a new Flutter project.
+
+environment:
+ sdk: ">=1.19.0 <2.0.0"
+ flutter: ^0.0.1
+
dependencies:
usage:
path: ../..
flutter:
- path: ../../../flutter/packages/flutter
+ sdk: flutter
diff --git a/pubspec.yaml b/pubspec.yaml
index 74705d9..1584380 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,13 +3,13 @@
# BSD-style license that can be found in the LICENSE file.
name: usage
-version: 2.2.2
+version: 3.0.0-dev.1
description: A Google Analytics wrapper for both command-line, web, and Flutter apps.
homepage: https://github.com/dart-lang/usage
author: Dart Team <misc@dartlang.org>
environment:
- sdk: '>=1.15.0 <2.0.0'
+ sdk: '>=1.19.0 <2.0.0'
dev_dependencies:
browser: ^0.10.0