diff options
| author | Rob Becker <rob.becker@workiva.com> | 2019-01-21 20:24:01 -0700 |
|---|---|---|
| committer | James E. King III <jking@apache.org> | 2019-01-21 22:24:01 -0500 |
| commit | f1eadad76edb3c680b9b964601d440ea05df02ca (patch) | |
| tree | fb943b184b25d584dae228228410b2b0fef9caf5 /tutorial | |
| parent | ef32bc10b70aa2926957fd8f35691563234f08b6 (diff) | |
| download | thrift-f1eadad76edb3c680b9b964601d440ea05df02ca.tar.gz | |
THRIFT-4654 Minor fixes for dart 1 & 2 compatibility (backwards compatible) (#1617)
* THRIFT-4654 Minor fixes for dart 1 & 2 compatibility
* update dockerfiles for CI to test dart 2
* THRIFT-4654 update pubspec for tests
* THRIFT-4654 update dart test generator and readme to 1.24.3
* THRIFT-4654 update generated dart sdk to a range
* fix the dart tutorials
* Add .dart_tool directories to .gitignore
* THRIFT-4654: use dart 2.1.0 and fix cross test dart client timeout
Diffstat (limited to 'tutorial')
| -rw-r--r-- | tutorial/dart/client/pubspec.yaml | 3 | ||||
| -rw-r--r-- | tutorial/dart/client/web/index.html | 3 | ||||
| -rw-r--r-- | tutorial/dart/console_client/pubspec.yaml | 4 | ||||
| -rw-r--r-- | tutorial/dart/server/pubspec.yaml | 4 |
4 files changed, 6 insertions, 8 deletions
diff --git a/tutorial/dart/client/pubspec.yaml b/tutorial/dart/client/pubspec.yaml index d8ede1440..109db0f65 100644 --- a/tutorial/dart/client/pubspec.yaml +++ b/tutorial/dart/client/pubspec.yaml @@ -22,10 +22,9 @@ author: Apache Thrift Developers <dev@thrift.apache.org> homepage: http://thrift.apache.org environment: - sdk: ">=1.13.0 <2.0.0" + sdk: ">=1.13.0 <3.0.0" dependencies: - browser: ^0.10.0 shared: path: ../gen-dart/shared thrift: diff --git a/tutorial/dart/client/web/index.html b/tutorial/dart/client/web/index.html index 64b184e55..9d36b4388 100644 --- a/tutorial/dart/client/web/index.html +++ b/tutorial/dart/client/web/index.html @@ -24,8 +24,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>Thrift Tutorial</title> <link rel="stylesheet" href="styles.css"> - <script async src="client.dart" type="application/dart"></script> - <script async src="packages/browser/dart.js"></script> + <script async src="client.dart.js"></script> </head> <body> diff --git a/tutorial/dart/console_client/pubspec.yaml b/tutorial/dart/console_client/pubspec.yaml index a34e26f60..602bb5e10 100644 --- a/tutorial/dart/console_client/pubspec.yaml +++ b/tutorial/dart/console_client/pubspec.yaml @@ -23,10 +23,10 @@ author: Apache Thrift Developers <dev@thrift.apache.org> homepage: http://thrift.apache.org environment: - sdk: ">=1.13.0 <2.0.0" + sdk: ">=1.13.0 <3.0.0" dependencies: - args: ^0.13.0 + args: ">=0.13.0 <2.0.0" collection: ^1.1.0 shared: path: ../gen-dart/shared diff --git a/tutorial/dart/server/pubspec.yaml b/tutorial/dart/server/pubspec.yaml index 18d0737f3..b0b012d09 100644 --- a/tutorial/dart/server/pubspec.yaml +++ b/tutorial/dart/server/pubspec.yaml @@ -22,10 +22,10 @@ author: Apache Thrift Developers <dev@thrift.apache.org> homepage: http://thrift.apache.org environment: - sdk: ">=1.13.0 <2.0.0" + sdk: ">=1.13.0 <3.0.0" dependencies: - args: ^0.13.0 + args: ">=0.13.0 <2.0.0" shared: path: ../gen-dart/shared thrift: |