Update dependencies (#689)

- Update dependencies by deleting lock files and regenerating them with `gw updateDependencyLocks`.
  Deleting lock files avoids strange `some.library:some.older.version=default` entries.
  Most updated dependencies are test dependencies.
- Handle breaking changes in library commonmark.
- Fix test to close PackageServer exactly once.
  This problem surfaced because JUnit 5.11 changed override rules for lifecycle methods,
  resulting in too many instead of too few close() calls.
- Bump msgpack version
- Bump clikt version
- Bump Gradle plugin versions
This commit is contained in:
translatenix
2024-10-17 09:12:07 -07:00
committed by GitHub
parent 62c796a257
commit d271b62543
20 changed files with 360 additions and 385 deletions

View File

@@ -35,28 +35,27 @@ import org.pkl.core.http.HttpClient
import org.pkl.core.module.PathElement
class PackageResolversTest {
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
abstract class AbstractPackageResolverTest {
abstract val resolver: PackageResolver
private val packageRoot =
FileTestUtils.rootProjectDir.resolve("pkl-commons-test/src/main/files/packages")
companion object {
private val packageServer = PackageServer()
// Each subclass gets its own PackageServer instance (instance property, Lifecycle.PER_CLASS).
// This is important because closePackageServer() is called once per subclass.
private val packageServer = PackageServer()
@JvmStatic
@AfterAll
fun afterAll() {
packageServer.close()
}
val httpClient: HttpClient by lazy {
HttpClient.builder()
.addCertificates(FileTestUtils.selfSignedCertificate)
.setTestPort(packageServer.port)
.build()
}
val httpClient: HttpClient by lazy {
HttpClient.builder()
.addCertificates(FileTestUtils.selfSignedCertificate)
.setTestPort(packageServer.port)
.build()
}
@AfterAll
fun closePackageServer() {
packageServer.close()
}
// execute test 3 times to check concurrent writes
@@ -217,21 +216,17 @@ class PackageResolversTest {
}
class DiskCachedPackageResolverTest : AbstractPackageResolverTest() {
companion object {
private val cacheDir = FileTestUtils.rootProjectDir.resolve("pkl-core/build/test-cache")
private val cacheDir = FileTestUtils.rootProjectDir.resolve("pkl-core/build/test-cache")
@JvmStatic
@AfterAll
fun afterAll() {
assertThat(cacheDir.exists())
assertThat(cacheDir.listFilesRecursively()).isNotEmpty
}
@BeforeAll
fun deleteCacheDir() {
cacheDir.deleteRecursively()
}
@BeforeAll
@JvmStatic
fun beforeAll() {
cacheDir.deleteRecursively()
}
@AfterAll
fun checkCacheDir() {
assertThat(cacheDir.exists())
assertThat(cacheDir.listFilesRecursively()).isNotEmpty
}
override val resolver: PackageResolver =