Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Upgrading packages and refactoring #238

Merged
merged 3 commits into from
Dec 16, 2024
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 .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
TEST_DIR: packages/core
services:
postgres:
image: postgres:16.2
image: postgres:17.2
env:
POSTGRES_USER: conduit_test_user
POSTGRES_PASSWORD: conduit!
Expand Down
2 changes: 1 addition & 1 deletion ci/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.3"

services:
postgres:
image: postgres:16.2
image: postgres:16.6
# command: -c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key
container_name: conduit_postgres
restart: always
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/conduit-dart/conduit
issue_tracker: https://github.com/conduit-dart/conduit/issues

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
analyzer: ^6.5.0
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/templates/db/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ homepage: https://github.com/conduit-dart/conduit-codable
publish_to: none

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
conduit: ^5.1.0
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/templates/db_and_auth/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 0.0.1
publish_to: none

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
conduit: ^5.1.0
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/templates/default/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 0.0.1
publish_to: none

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
conduit: ^5.1.0
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/command_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ void main() {
predicate<FormatException>(
(e) =>
e.message ==
'"test" is not an allowed value for option "flavor".',
'"test" is not an allowed value for option "--flavor".',
),
),
);
Expand All @@ -31,7 +31,7 @@ void main() {
() => cmd.options.parse(args),
throwsA(
predicate<FormatException>(
(e) => e.message == 'Could not find an option named "bad".',
(e) => e.message == 'Could not find an option named "--bad".',
),
),
);
Expand Down
2 changes: 1 addition & 1 deletion packages/codable/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/conduit-dart/conduit
issue_tracker: https://github.com/conduit-dart/conduit/issues

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
meta: ^1.3.0
Expand Down
2 changes: 1 addition & 1 deletion packages/common/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/conduit-dart/conduit
issue_tracker: https://github.com/conduit-dart/conduit/issues

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
conduit_open_api: ^5.1.3
Expand Down
2 changes: 1 addition & 1 deletion packages/config/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/conduit-dart/conduit
issue_tracker: https://github.com/conduit-dart/conduit/issues

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
conduit_runtime: ^5.1.3
Expand Down
2 changes: 1 addition & 1 deletion packages/core/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/conduit-dart/conduit
issue_tracker: https://github.com/conduit-dart/conduit/issues

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
analyzer: ^6.5.0
Expand Down
2 changes: 1 addition & 1 deletion packages/fs_test_agent/lib/dart_project_agent.dart
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ description: desc
version: 0.0.1

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
${_asYaml(deps, indent: 1)}
Expand Down
2 changes: 1 addition & 1 deletion packages/fs_test_agent/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/conduit-dart/conduit
issue_tracker: https://github.com/conduit-dart/conduit/issues

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
path: ^1.9.0
Expand Down
2 changes: 1 addition & 1 deletion packages/isolate_exec/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/conduit-dart/conduit
issue_tracker: https://github.com/conduit-dart/conduit/issues

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
analyzer: ^6.5.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ description: test dependency
publish_to: none

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"
2 changes: 1 addition & 1 deletion packages/open_api/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/conduit-dart/conduit
issue_tracker: https://github.com/conduit-dart/conduit/issues

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
conduit_codable: ^5.1.3
Expand Down
2 changes: 1 addition & 1 deletion packages/password_hash/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/conduit-dart/conduit
issue_tracker: https://github.com/conduit-dart/conduit/issues

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
crypto: ^3.0.3
Expand Down
6 changes: 5 additions & 1 deletion packages/postgresql/lib/src/postgresql_persistent_store.dart
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,12 @@ class PostgreSQLPersistentStore extends PersistentStore
if (interpreted != null) {
throw interpreted;
}

rethrow;
} on PgException catch (e) {
throw QueryException.transport(
e.message,
underlyingException: e,
);
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/postgresql/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/conduit-dart/conduit
issue_tracker: https://github.com/conduit-dart/conduit/issues

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
collection: ^1.17.1
Expand Down
5 changes: 4 additions & 1 deletion packages/postgresql/test/transaction_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,10 @@ void main() {
});
fail('unreachable');
} on QueryException catch (e) {
expect(e.toString(), contains("timed out"));
expect(
e.toString(),
contains(
"Attempting to execute query on connection while inside a `runTx` call."));
}

final q = Query<Model>(context);
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/conduit-dart/conduit
issue_tracker: https://github.com/conduit-dart/conduit/issues

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
analyzer: ^6.5.0
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime_test_packages/application/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 1.0.0
publish_to: none

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
dependency:
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime_test_packages/dependency/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 1.0.0
publish_to: none

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
conduit_runtime:
Expand Down
2 changes: 1 addition & 1 deletion packages/test_harness/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/conduit-dart/conduit
issue_tracker: https://github.com/conduit-dart/conduit/issues

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
test: ^1.25.2
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repository: https://github.com/conduit-dart/conduit
issue_tracker: https://github.com/conduit-dart/conduit/issues

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dev_dependencies:
melos: ^6.0.0
2 changes: 1 addition & 1 deletion utils/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: utils

environment:
sdk: ">=3.4.0 <4.0.0"
sdk: ">=3.6.0 <4.0.0"

dependencies:
test: ^1.25.2
Loading