Skip to content

Commit 36198df

Browse files
authored
Support latest dependencies (#171)
1 parent 047ba86 commit 36198df

File tree

12 files changed

+43
-17
lines changed

12 files changed

+43
-17
lines changed

functions_framework/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## 0.3.2-dev
4+
5+
- Allow the latest versions of `args`, `http`, `http_parser`, and `shelf`
6+
packages.
7+
38
## 0.3.1
49

510
- `functions_framework.dart`

functions_framework/pubspec.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: functions_framework
2-
version: 0.3.1
2+
version: 0.3.2-dev
33
description: >-
44
FaaS (Function as a service) framework for writing portable Dart functions
55
repository: https://github.com/GoogleCloudPlatform/functions-framework-dart
@@ -8,13 +8,13 @@ environment:
88
sdk: '>=2.10.0 <3.0.0'
99

1010
dependencies:
11-
args: ^1.6.0
12-
http: ^0.12.2
13-
http_parser: ^3.1.4
11+
args: '>=1.6.0 <3.0.0'
12+
http: '>=0.12.2 <0.14.0'
13+
http_parser: '>=3.1.4 <5.0.0'
1414
io: ^0.3.4
1515
json_annotation: ^3.1.1
1616
meta: ^1.2.3
17-
shelf: ^0.7.9
17+
shelf: '>=0.7.9 <2.0.0'
1818
stack_trace: ^1.9.6
1919

2020
dev_dependencies:

functions_framework_builder/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## 0.3.2-dev
44

5+
- Allow the latest version `package:shelf`.
6+
57
## 0.3.1
68

79
- Support the latest `package:functions_framework` version.

functions_framework_builder/pubspec.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,20 @@ dependencies:
1414
# There is a tight version constraint because the builder has a strict
1515
# dependency on all features exposed.
1616
functions_framework: '>=0.3.0 <0.3.2'
17+
# waiting on build_test to bump to support latest glob before we can update
1718
glob: ^1.2.0
1819
meta: ^1.2.4
1920
path: ^1.7.0
20-
shelf: ^0.7.9
21+
shelf: '>=0.7.9 <2.0.0'
2122
source_gen: ^0.9.8
2223

2324
dev_dependencies:
24-
build_test: ^1.3.3
25+
build_test: ^1.3.6
26+
# waiting on analyzer to support latest package_config before we can update
2527
package_config: ^1.9.3
26-
stream_transform: ^1.2.0
28+
stream_transform: '>=1.2.0 <3.0.0'
2729
test: ^1.15.7
30+
31+
dependency_overrides:
32+
functions_framework:
33+
path: ../functions_framework

test/hello/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ dependencies:
88
functions_framework: any
99
json_annotation: ^3.1.1
1010
pedantic: ^1.9.2
11-
shelf: ^0.7.9
11+
shelf: '>=0.7.9 <2.0.0'
1212

1313
dev_dependencies:
1414
build_runner: ^1.10.2
1515
build_verify: ^1.1.1
1616
functions_framework_builder: any
17-
http: ^0.12.0
18-
http_parser: ^3.1.4
17+
http: '>=0.12.0 <0.14.0'
18+
http_parser: '>=3.1.4 <5.0.0'
1919
io: ^0.3.4
2020
json_serializable: ^3.5.1
2121
# Because we use the ignore_for_file build.yaml config

test/hello/test/cli_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import 'dart:convert';
1717
import 'dart:io';
1818

19-
import 'package:http/http.dart';
2019
import 'package:io/io.dart';
2120
import 'package:test/test.dart';
2221

test/hello/test/cloud_behavior_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ import 'package:functions_framework/src/constants.dart';
2222
import 'package:functions_framework/src/logging.dart';
2323
import 'package:functions_framework/src/run.dart';
2424
import 'package:hello_world_function_test/functions.dart';
25-
import 'package:http/http.dart';
2625
import 'package:test/test.dart';
2726

27+
import 'src/test_utils.dart';
28+
2829
const _projectId = 'test_project_id';
2930

3031
void main() {

test/hello/test/cloud_event_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@Timeout(Duration(seconds: 3))
1616
import 'dart:convert';
1717

18-
import 'package:http/http.dart';
18+
import 'package:http/http.dart' show Response;
1919
import 'package:test/test.dart';
2020
import 'package:test_process/test_process.dart';
2121

test/hello/test/custom_type_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import 'dart:convert';
1717

1818
import 'package:hello_world_function_test/functions.dart';
19-
import 'package:http/http.dart';
19+
import 'package:http/http.dart' show Response;
2020
import 'package:test/test.dart';
2121
import 'package:test_process/test_process.dart';
2222

test/hello/test/function_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
@Timeout(Duration(seconds: 3))
1616
import 'dart:convert';
1717

18-
import 'package:http/http.dart';
1918
import 'package:test/test.dart';
2019
import 'package:test_process/test_process.dart';
2120

0 commit comments

Comments
 (0)