Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ language: dart

dart:
# Keep version in-sync with Dockerfile and app/lib/shared/versions.dart
- 2.0.0-dev.40.0
- 2.0.0-dev.46.0

env:
- PKG=app TASK=dartanalyzer
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Keep version in-sync with .travis.yml and app/lib/shared/versions.dart
FROM google/dart-runtime-base:2.0.0-dev.40.0
FROM google/dart-runtime-base:2.0.0-dev.46.0

# `apt-mark hold dart` ensures that Dart is not upgraded with the other packages
# We want to make sure SDK upgrades are explicit.
Expand Down
2 changes: 1 addition & 1 deletion app/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: dart

dart:
# Keep version in-sync with Dockerfile
- 2.0.0-dev.40.0
- 2.0.0-dev.46.0

dart_task:
- test
Expand Down
12 changes: 6 additions & 6 deletions app/lib/shared/versions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@ import 'package:pub_semver/pub_semver.dart';
import 'utils.dart' show isNewer;

// update this whenever one of the other versions change
final String runtimeVersion = '2018.3.23';
final String runtimeVersion = '2018.4.7';
final Version semanticRuntimeVersion = new Version.parse(runtimeVersion);

// keep in-sync with SDK version in .travis.yml and Dockerfile
final String sdkVersion = '2.0.0-dev.40.0';
final String sdkVersion = '2.0.0-dev.46.0';
final Version semanticSdkVersion = new Version.parse(sdkVersion);

// keep in-sync with app/pubspec.yaml
final String panaVersion = '0.10.5';
final String panaVersion = '0.10.6';
final Version semanticPanaVersion = new Version.parse(panaVersion);

// keep in-sync with app/script/setup-flutter.sh
final String flutterVersion = '0.2.4';
final String flutterVersion = '0.2.9';
final Version semanticFlutterVersion = new Version.parse(flutterVersion);

// keep in-sync with SDK version in .travis.yml and Dockerfile
final String dartdocVersion = '0.17.1+1';
final String dartdocVersion = '0.18.1';
final Version semanticDartdocVersion = new Version.parse(dartdocVersion);

/// The version of our customization going into the output of the dartdoc static
Expand All @@ -33,7 +33,7 @@ final Version semanticCustomizationVersion =
new Version.parse(customizationVersion);

// Version that control the dartdoc serving.
final dartdocServingRuntime = new Version.parse('2018.3.23');
final dartdocServingRuntime = new Version.parse('2018.4.7');

// Version that marks the default runtime version for analyzer entries created
// before the runtime version was tracked.
Expand Down
4 changes: 2 additions & 2 deletions app/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ packages:
name: pana
url: "https://pub.dartlang.org"
source: hosted
version: "0.10.5"
version: "0.10.6"
path:
dependency: "direct main"
description:
Expand Down Expand Up @@ -583,4 +583,4 @@ packages:
source: hosted
version: "2.1.13"
sdks:
dart: ">=2.0.0-dev.23.0 <=2.0.0-dev.40.0"
dart: ">=2.0.0-dev.40.0 <=2.0.0-dev.46.0"
2 changes: 1 addition & 1 deletion app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies:
yaml: '^2.1.12'
# pana version to be pinned
# keep in-sync with app/lib/shared/versions.dart
pana: '0.10.5'
pana: '0.10.6'
# 3rd-party packages with pinned versions
archive: '1.0.33'
uuid: '0.5.3'
Expand Down
2 changes: 1 addition & 1 deletion app/script/setup-flutter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ then
exit 1
fi

git clone -b v0.2.4 --single-branch https://github.com/flutter/flutter.git $FLUTTER_SDK
git clone -b v0.2.9 --single-branch https://github.com/flutter/flutter.git $FLUTTER_SDK

# Keep in-sync with app/lib/shared/versions.dart
cd $FLUTTER_SDK
Expand Down
2 changes: 1 addition & 1 deletion app/test/shared/versions_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ void main() {
dartdocVersion,
customizationVersion,
].join('//').hashCode;
expect(hash, 610463204);
expect(hash, 927882828);
});

test('sdk version should match travis and dockerfile', () async {
Expand Down