Skip to content

Commit

Permalink
fix: compatible with latest dart version (#151)
Browse files Browse the repository at this point in the history
* chore: `intl` package is not required, the API doesn't require `_dateFormatter`

* fix: ubuntu image

* chore: the pubspec.lock should not be in repo because it is determining libraries versions => different dart version in CI can't have different version of deps

* chore: `pub` ecosystem is no-longer in beta status

https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#pub

* docs: update CHANGELOG.md

* chore: remove useless comment
  • Loading branch information
bednar authored Nov 20, 2024
1 parent 12fd973 commit 46a2ffd
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 631 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ commands:
- checkout
- restore_cache:
keys:
- v1.5-dependencies-{{ arch }}-{{ checksum "pubspec.lock" }}
- v1.5-dependencies-{{ arch }}-
- v1.6-dependencies-{{ arch }}-{{ checksum "pubspec.yaml" }}
- v1.6-dependencies-{{ arch }}-
- run:
name: Download deps
shell: << parameters.shell >>
Expand All @@ -43,7 +43,7 @@ commands:
shell: << parameters.shell >>
command: dart pub global activate junitreport
- save_cache:
key: v1.5-dependencies-{{ arch }}-{{ checksum "pubspec.lock" }}
key: v1.6-dependencies-{{ arch }}-{{ checksum "pubspec.yaml" }}
paths:
- .dart_tool
- << parameters.pub-cache >>
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:

build-linux:
machine:
image: ubuntu-2004:202201-02
image: ubuntu-2204:current
steps:
- run:
name: Install Dart SDK
Expand Down
1 change: 0 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
version: 2
enable-beta-ecosystems: true
updates:
- package-ecosystem: "pub"
directory: "/"
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
.dart_tool/
.packages
build/
# If you're building an application, you may want to check-in your pubspec.lock
#pubspec.lock
pubspec.lock

# Directory created by dartdoc
# If you don't generate documentation locally you can remove this line.
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
## 2.11.0 [unreleased]

### Dependencies
1. [#151](https://github.com/influxdata/influxdb-client-dart/pull/151): `intl` package isn't required

### CI
1. [#151](https://github.com/influxdata/influxdb-client-dart/pull/151): CI pipeline supports Dart 2 and 3

## 2.10.0 [2024-06-24]

Explicitly set supported platforms to `android`, `ios`, `linux`, `macos`, `windows`, and `web` to avoid issues with unsupported platforms.
Expand Down
2 changes: 0 additions & 2 deletions lib/api.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import 'dart:math' as math;
import 'package:archive/archive.dart';
import 'package:csv/csv.dart';
import 'package:http/http.dart';
import 'package:intl/intl.dart';
import 'package:meta/meta.dart';
import 'package:universal_io/io.dart';

Expand Down Expand Up @@ -171,7 +170,6 @@ part 'client/retry.dart';

const _delimiters = {'csv': ',', 'ssv': ' ', 'tsv': '\t', 'pipes': '|'};
const _dateEpochMarker = 'epoch';
final _dateFormatter = DateFormat('yyyy-MM-dd');
final _regList = RegExp(r'^List<(.*)>$');
final _regSet = RegExp(r'^Set<(.*)>$');
final _regMap = RegExp(r'^Map<String,(.*)>$');
Expand Down
Loading

0 comments on commit 46a2ffd

Please sign in to comment.