Merge pull request #64 from dart-lang/update_usage
update usage to 1.15.0 stable
diff --git a/.travis.yml b/.travis.yml
index 35def79..75b3aac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
language: dart
dart:
+ - stable
- dev
sudo: false
diff --git a/lib/src/usage_impl_default.dart b/lib/src/usage_impl_default.dart
index 87fa96a..6c17178 100644
--- a/lib/src/usage_impl_default.dart
+++ b/lib/src/usage_impl_default.dart
@@ -8,7 +8,11 @@
import '../usage.dart';
-Future<Analytics> createAnalytics(String trackingId, String applicationName,
- String applicationVersion, { String analyticsUrl }) {
+Future<Analytics> createAnalytics(
+ String trackingId,
+ String applicationName,
+ String applicationVersion, {
+ String analyticsUrl
+}) {
throw new UnimplementedError();
}
diff --git a/lib/src/usage_impl_flutter.dart b/lib/src/usage_impl_flutter.dart
index 12b17a6..9130555 100644
--- a/lib/src/usage_impl_flutter.dart
+++ b/lib/src/usage_impl_flutter.dart
@@ -13,11 +13,14 @@
import 'package:path/path.dart' as path;
import 'usage_impl.dart';
-import 'usage_impl_io.dart';
import '../usage.dart';
-Future<Analytics> createAnalytics(String trackingId, String applicationName,
- String applicationVersion, { String analyticsUrl }) async {
+Future<Analytics> createAnalytics(
+ String trackingId,
+ String applicationName,
+ String applicationVersion, {
+ String analyticsUrl
+}) async {
String dataPath = await getFilesDir();
String fileName = '.${applicationName.replaceAll(' ', '_')}';
diff --git a/lib/src/usage_impl_html.dart b/lib/src/usage_impl_html.dart
index f7dc9e8..8ad7a7f 100644
--- a/lib/src/usage_impl_html.dart
+++ b/lib/src/usage_impl_html.dart
@@ -11,8 +11,12 @@
import 'usage_impl.dart';
import '../usage_html.dart';
-Future<Analytics> createAnalytics(String trackingId, String applicationName,
- String applicationVersion, { String analyticsUrl }) {
+Future<Analytics> createAnalytics(
+ String trackingId,
+ String applicationName,
+ String applicationVersion, {
+ String analyticsUrl
+}) {
return new Future.value(new AnalyticsHtml(
trackingId,
applicationName,
diff --git a/lib/src/usage_impl_io.dart b/lib/src/usage_impl_io.dart
index 8f5abc9..9e45376 100644
--- a/lib/src/usage_impl_io.dart
+++ b/lib/src/usage_impl_io.dart
@@ -13,8 +13,12 @@
import 'usage_impl.dart';
import '../usage_io.dart';
-Future<Analytics> createAnalytics(String trackingId, String applicationName,
- String applicationVersion, { String analyticsUrl }) {
+Future<Analytics> createAnalytics(
+ String trackingId,
+ String applicationName,
+ String applicationVersion, {
+ String analyticsUrl
+}) {
return new Future.value(new AnalyticsIO(
trackingId,
applicationName,
diff --git a/pubspec.yaml b/pubspec.yaml
index 52c30c3..2c0a6c6 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: 1.2.0
+version: 2.0.0-dev
description: A Google Analytics wrapper for both command-line and web apps.
homepage: https://github.com/dart-lang/usage
author: Dart Team <misc@dartlang.org>
environment:
- sdk: '>=1.15.0-dev <2.0.0'
+ sdk: '>=1.15.0 <2.0.0'
dev_dependencies:
browser: ^0.10.0
diff --git a/tool/drone.sh b/tool/drone.sh
deleted file mode 100755
index ff46f4f..0000000
--- a/tool/drone.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# Fast fail the script on failures.
-set -e
-
-# Display installed versions.
-dart --version
-
-# Get our packages.
-pub get
-
-# Verify that the libraries are error free.
-dartanalyzer --fatal-warnings \
- lib/usage.dart \
- lib/usage_html.dart \
- lib/usage_io.dart \
- test/all.dart
-
-# Run the tests.
-dart test/all.dart
-
-# Measure the size of the compiled JS, for the dart:html version of the library.
-dart tool/grind.dart build
diff --git a/tool/grind.dart b/tool/grind.dart
index f1d8121..72f4393 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -12,31 +12,22 @@
main(List<String> args) => grind(args);
-@Task('Do any necessary build set up')
-void init() {
- // Verify we're running in the project root.
- if (!getDir('lib').existsSync() || !getFile('pubspec.yaml').existsSync()) {
- context.fail('This script must be run from the project root.');
- }
-
- _buildExampleDir.createSync(recursive: true);
-}
-
@Task()
-@Depends(init)
+void init() => _buildExampleDir.createSync(recursive: true);
+
+@Task() @Depends(init)
void build() {
// Compile `test/web_test.dart` to the `build/test` dir; measure its size.
File srcFile = new File('example/example.dart');
- Dart2js.compile(srcFile, outDir: _buildExampleDir, minify: true);
+ Dart2js.compile(
+ srcFile, outDir: _buildExampleDir, minify: true, extraArgs: ['--conditional-directives']
+ );
File outFile = joinFile(_buildExampleDir, ['example.dart.js']);
- context.log('${outFile.path} compiled to ${_printSize(outFile)}');
+ log('${outFile.path} compiled to ${_printSize(outFile)}');
}
-@Task('Delete all generated artifacts')
-void clean() {
- // Delete the build/ dir.
- delete(buildDir);
-}
+@Task()
+void clean() => delete(buildDir);
String _printSize(File file) => '${(file.lengthSync() + 1023) ~/ 1024}k';
diff --git a/tool/travis.sh b/tool/travis.sh
index 4e3f60f..fe23fcc 100755
--- a/tool/travis.sh
+++ b/tool/travis.sh
@@ -21,12 +21,8 @@
#pub build test
#pub run grinder:test build/test/web.html
-# Verify against DDC.
-#pub global activate dev_compiler
-#pub global run dev_compiler lib/usage_html.dart
-
# Measure the size of the compiled JS, for the dart:html version of the library.
-#dart tool/grind.dart build
+dart tool/grind.dart build
# Install dart_coveralls; gather and send coverage data.
if [ "$REPO_TOKEN" ]; then
