diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 81b783438..3fa2884ca 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -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! diff --git a/ci/docker-compose.yaml b/ci/docker-compose.yaml index 501bae224..1c86a768f 100644 --- a/ci/docker-compose.yaml +++ b/ci/docker-compose.yaml @@ -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 diff --git a/packages/cli/pubspec.yaml b/packages/cli/pubspec.yaml index d95c2a45b..2227bdde6 100644 --- a/packages/cli/pubspec.yaml +++ b/packages/cli/pubspec.yaml @@ -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 diff --git a/packages/cli/templates/db/pubspec.yaml b/packages/cli/templates/db/pubspec.yaml index 583a41934..d2b7af986 100644 --- a/packages/cli/templates/db/pubspec.yaml +++ b/packages/cli/templates/db/pubspec.yaml @@ -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 diff --git a/packages/cli/templates/db_and_auth/pubspec.yaml b/packages/cli/templates/db_and_auth/pubspec.yaml index 1b21f3abe..35f72a939 100644 --- a/packages/cli/templates/db_and_auth/pubspec.yaml +++ b/packages/cli/templates/db_and_auth/pubspec.yaml @@ -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 diff --git a/packages/cli/templates/default/pubspec.yaml b/packages/cli/templates/default/pubspec.yaml index 33022919a..8e9a0725a 100644 --- a/packages/cli/templates/default/pubspec.yaml +++ b/packages/cli/templates/default/pubspec.yaml @@ -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 diff --git a/packages/cli/test/command_test.dart b/packages/cli/test/command_test.dart index b6f33df30..26ec76f6b 100644 --- a/packages/cli/test/command_test.dart +++ b/packages/cli/test/command_test.dart @@ -16,7 +16,7 @@ void main() { predicate( (e) => e.message == - '"test" is not an allowed value for option "flavor".', + '"test" is not an allowed value for option "--flavor".', ), ), ); @@ -31,7 +31,7 @@ void main() { () => cmd.options.parse(args), throwsA( predicate( - (e) => e.message == 'Could not find an option named "bad".', + (e) => e.message == 'Could not find an option named "--bad".', ), ), ); diff --git a/packages/codable/pubspec.yaml b/packages/codable/pubspec.yaml index 452be187b..6abb57ecb 100644 --- a/packages/codable/pubspec.yaml +++ b/packages/codable/pubspec.yaml @@ -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 diff --git a/packages/common/pubspec.yaml b/packages/common/pubspec.yaml index 3a2b1ee8f..422e9a526 100644 --- a/packages/common/pubspec.yaml +++ b/packages/common/pubspec.yaml @@ -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 diff --git a/packages/config/pubspec.yaml b/packages/config/pubspec.yaml index db0a75891..546e75beb 100644 --- a/packages/config/pubspec.yaml +++ b/packages/config/pubspec.yaml @@ -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 diff --git a/packages/core/pubspec.yaml b/packages/core/pubspec.yaml index 1f0381195..630c1e7cd 100644 --- a/packages/core/pubspec.yaml +++ b/packages/core/pubspec.yaml @@ -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 diff --git a/packages/fs_test_agent/lib/dart_project_agent.dart b/packages/fs_test_agent/lib/dart_project_agent.dart index 8ae807cee..1eacc3989 100644 --- a/packages/fs_test_agent/lib/dart_project_agent.dart +++ b/packages/fs_test_agent/lib/dart_project_agent.dart @@ -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)} diff --git a/packages/fs_test_agent/pubspec.yaml b/packages/fs_test_agent/pubspec.yaml index d998d1e85..3c697855b 100644 --- a/packages/fs_test_agent/pubspec.yaml +++ b/packages/fs_test_agent/pubspec.yaml @@ -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 diff --git a/packages/isolate_exec/pubspec.yaml b/packages/isolate_exec/pubspec.yaml index 200445847..86cefc566 100644 --- a/packages/isolate_exec/pubspec.yaml +++ b/packages/isolate_exec/pubspec.yaml @@ -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 diff --git a/packages/isolate_exec_test_packages/test_package/pubspec.yaml b/packages/isolate_exec_test_packages/test_package/pubspec.yaml index a85cd89a9..afeede0db 100644 --- a/packages/isolate_exec_test_packages/test_package/pubspec.yaml +++ b/packages/isolate_exec_test_packages/test_package/pubspec.yaml @@ -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" diff --git a/packages/open_api/pubspec.yaml b/packages/open_api/pubspec.yaml index bfdb3239c..ea38a6c60 100644 --- a/packages/open_api/pubspec.yaml +++ b/packages/open_api/pubspec.yaml @@ -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 diff --git a/packages/password_hash/pubspec.yaml b/packages/password_hash/pubspec.yaml index fc98ddb6f..1442d1c11 100644 --- a/packages/password_hash/pubspec.yaml +++ b/packages/password_hash/pubspec.yaml @@ -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 diff --git a/packages/postgresql/lib/src/postgresql_persistent_store.dart b/packages/postgresql/lib/src/postgresql_persistent_store.dart index 78dfaa6a0..085da01e3 100644 --- a/packages/postgresql/lib/src/postgresql_persistent_store.dart +++ b/packages/postgresql/lib/src/postgresql_persistent_store.dart @@ -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, + ); } } diff --git a/packages/postgresql/pubspec.yaml b/packages/postgresql/pubspec.yaml index f57265608..a0037f3db 100644 --- a/packages/postgresql/pubspec.yaml +++ b/packages/postgresql/pubspec.yaml @@ -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 diff --git a/packages/postgresql/test/transaction_test.dart b/packages/postgresql/test/transaction_test.dart index df6d12403..84ffedb4d 100644 --- a/packages/postgresql/test/transaction_test.dart +++ b/packages/postgresql/test/transaction_test.dart @@ -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(context); diff --git a/packages/runtime/pubspec.yaml b/packages/runtime/pubspec.yaml index 0ff68bfdb..5973e889e 100644 --- a/packages/runtime/pubspec.yaml +++ b/packages/runtime/pubspec.yaml @@ -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 diff --git a/packages/runtime_test_packages/application/pubspec.yaml b/packages/runtime_test_packages/application/pubspec.yaml index 34cec9b0d..f73098362 100644 --- a/packages/runtime_test_packages/application/pubspec.yaml +++ b/packages/runtime_test_packages/application/pubspec.yaml @@ -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: diff --git a/packages/runtime_test_packages/dependency/pubspec.yaml b/packages/runtime_test_packages/dependency/pubspec.yaml index aef5fefc9..a7e931f69 100644 --- a/packages/runtime_test_packages/dependency/pubspec.yaml +++ b/packages/runtime_test_packages/dependency/pubspec.yaml @@ -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: diff --git a/packages/test_harness/pubspec.yaml b/packages/test_harness/pubspec.yaml index 70cd8b1cc..838fdffe4 100644 --- a/packages/test_harness/pubspec.yaml +++ b/packages/test_harness/pubspec.yaml @@ -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 diff --git a/pubspec.yaml b/pubspec.yaml index 8c0da8c7d..f6f137338 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -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 diff --git a/utils/pubspec.yaml b/utils/pubspec.yaml index 92234a641..013c79771 100644 --- a/utils/pubspec.yaml +++ b/utils/pubspec.yaml @@ -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