From 422c1853e5cd5b79ccced6c26aab663ba0a1efa0 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 26 Sep 2024 15:27:06 +0000 Subject: [PATCH 1/9] Update sbt-scoverage to 2.2.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c348f5f10a..30c2b2389b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,7 +5,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0") // https://github.com/marcuslonnberg/sbt-docker addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.11.0") // https://github.com/scoverage/sbt-scoverage -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1") // https://github.com/sbt/sbt-buildinfo addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") // https://github.com/sbt/sbt-native-packager From 62767a5359486e9aee746e9b4e57bd6cc64d9343 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 28 Sep 2024 17:47:36 +0000 Subject: [PATCH 2/9] Update sbt-scalafix to 0.13.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c348f5f10a..dc9e6d8642 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -11,7 +11,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") // https://github.com/sbt/sbt-native-packager addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4") // https://scalacenter.github.io/scalafix/docs/users/installation.html -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0") // https://scalapb.github.io/zio-grpc/docs/installation addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6") // https://github.com/sbt/sbt-unidoc From 11de4fe4846dd6c54b28d7632caa513119ce749a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 28 Sep 2024 17:47:43 +0000 Subject: [PATCH 3/9] Update ujson, upickle to 4.0.2 --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 574ff2cc52..0d9002c354 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -34,8 +34,8 @@ object Dependencies { val slf4j = "org.slf4j" % "slf4j-api" % "2.0.16" val shapeless = "com.chuusai" %% "shapeless" % "2.3.12" val tla2tools = "org.lamport" % "tla2tools" % "1.7.0-SNAPSHOT" - val ujson = "com.lihaoyi" %% "ujson" % "4.0.1" - val upickle = "com.lihaoyi" %% "upickle" % "4.0.1" + val ujson = "com.lihaoyi" %% "ujson" % "4.0.2" + val upickle = "com.lihaoyi" %% "upickle" % "4.0.2" val z3 = "tools.aqua" % "z3-turnkey" % "4.13.0" val zio = "dev.zio" %% "zio" % zioVersion // Keep up to sync with version in plugins.sbt From b3ee88a1915c4c96142f50064dc1bc341b3aaa1c Mon Sep 17 00:00:00 2001 From: konnov Date: Wed, 2 Oct 2024 12:21:02 +0000 Subject: [PATCH 4/9] [release] 0.46.2 --- RELEASE.md | 6 ++++++ VERSION | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 RELEASE.md diff --git a/RELEASE.md b/RELEASE.md new file mode 100644 index 0000000000..671c7f5c22 --- /dev/null +++ b/RELEASE.md @@ -0,0 +1,6 @@ +## 0.46.2 - 2024-10-02 + +### Bug fixes + +- Do not produce `(distinct ...)` for singletons, see #3005 +- Show note that expression is unsupported instead of reporting a counterexample claiming that e.g. `{42} \in SUBSET Nat` is false, see #2690 diff --git a/VERSION b/VERSION index 288d429fd9..43c125a0bb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.46.2-SNAPSHOT +0.46.2 From c83d8db45a73e8a45d36f458b7db1ebebe05e498 Mon Sep 17 00:00:00 2001 From: konnov Date: Wed, 2 Oct 2024 12:21:11 +0000 Subject: [PATCH 5/9] Bump version to 0.46.3-SNAPSHOT --- .unreleased/bug-fixes/BogusSafetyViolationSubsetNat.md | 1 - .unreleased/bug-fixes/distinct-on-singleton.md | 1 - CHANGES.md | 7 +++++++ RELEASE.md | 6 ------ VERSION | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 .unreleased/bug-fixes/BogusSafetyViolationSubsetNat.md delete mode 100644 .unreleased/bug-fixes/distinct-on-singleton.md delete mode 100644 RELEASE.md diff --git a/.unreleased/bug-fixes/BogusSafetyViolationSubsetNat.md b/.unreleased/bug-fixes/BogusSafetyViolationSubsetNat.md deleted file mode 100644 index 365cee9f7f..0000000000 --- a/.unreleased/bug-fixes/BogusSafetyViolationSubsetNat.md +++ /dev/null @@ -1 +0,0 @@ -Show note that expression is unsupported instead of reporting a counterexample claiming that e.g. `{42} \in SUBSET Nat` is false, see #2690 diff --git a/.unreleased/bug-fixes/distinct-on-singleton.md b/.unreleased/bug-fixes/distinct-on-singleton.md deleted file mode 100644 index e1aded6fdf..0000000000 --- a/.unreleased/bug-fixes/distinct-on-singleton.md +++ /dev/null @@ -1 +0,0 @@ -Do not produce `(distinct ...)` for singletons, see #3005 diff --git a/CHANGES.md b/CHANGES.md index 10b4117c8f..4eb4cc93b2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,13 @@ +## 0.46.2 - 2024-10-02 + +### Bug fixes + +- Do not produce `(distinct ...)` for singletons, see #3005 +- Show note that expression is unsupported instead of reporting a counterexample claiming that e.g. `{42} \in SUBSET Nat` is false, see #2690 + ## 0.46.1 - 2024-09-24 ### Features diff --git a/RELEASE.md b/RELEASE.md deleted file mode 100644 index 671c7f5c22..0000000000 --- a/RELEASE.md +++ /dev/null @@ -1,6 +0,0 @@ -## 0.46.2 - 2024-10-02 - -### Bug fixes - -- Do not produce `(distinct ...)` for singletons, see #3005 -- Show note that expression is unsupported instead of reporting a counterexample claiming that e.g. `{42} \in SUBSET Nat` is false, see #2690 diff --git a/VERSION b/VERSION index 43c125a0bb..43c513c63b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.46.2 +0.46.3-SNAPSHOT From 3da74cf6b9c5ce90ea5da7f7508b559252affa73 Mon Sep 17 00:00:00 2001 From: Igor Konnov Date: Wed, 2 Oct 2024 15:05:50 +0200 Subject: [PATCH 6/9] downgrade z3 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 0d9002c354..5b6df9e64d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -36,7 +36,7 @@ object Dependencies { val tla2tools = "org.lamport" % "tla2tools" % "1.7.0-SNAPSHOT" val ujson = "com.lihaoyi" %% "ujson" % "4.0.2" val upickle = "com.lihaoyi" %% "upickle" % "4.0.2" - val z3 = "tools.aqua" % "z3-turnkey" % "4.13.0" + val z3 = "tools.aqua" % "z3-turnkey" % "4.12.6" val zio = "dev.zio" %% "zio" % zioVersion // Keep up to sync with version in plugins.sbt val zioGrpcCodgen = "com.thesamet.scalapb.zio-grpc" %% "zio-grpc-codegen" % "0.6.0-test3" % "provided" From 32ee0bd1bc4c5a61e2c62ac85923424b5ed50a7b Mon Sep 17 00:00:00 2001 From: Igor Konnov Date: Wed, 2 Oct 2024 15:06:49 +0200 Subject: [PATCH 7/9] add release notes --- .unreleased/breaking-changes/downgrade-z3.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 .unreleased/breaking-changes/downgrade-z3.md diff --git a/.unreleased/breaking-changes/downgrade-z3.md b/.unreleased/breaking-changes/downgrade-z3.md new file mode 100644 index 0000000000..c2d58933fc --- /dev/null +++ b/.unreleased/breaking-changes/downgrade-z3.md @@ -0,0 +1 @@ +Downgrade z3 to 4.12.6, due to instability of 4.13.0 From 2c576d8a885ec4e9a3de0865e71b89a89beea1f7 Mon Sep 17 00:00:00 2001 From: konnov Date: Wed, 2 Oct 2024 16:25:07 +0000 Subject: [PATCH 8/9] [release] 0.47.0 --- RELEASE.md | 5 +++++ VERSION | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 RELEASE.md diff --git a/RELEASE.md b/RELEASE.md new file mode 100644 index 0000000000..3b3dbac7b0 --- /dev/null +++ b/RELEASE.md @@ -0,0 +1,5 @@ +## 0.47.0 - 2024-10-02 + +### Breaking changes + +- Downgrade z3 to 4.12.6, due to instability of 4.13.0 diff --git a/VERSION b/VERSION index 43c513c63b..421ab545d9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.46.3-SNAPSHOT +0.47.0 From 6dca654e3b9972a5f39750878a8431a73c502a81 Mon Sep 17 00:00:00 2001 From: konnov Date: Wed, 2 Oct 2024 16:25:15 +0000 Subject: [PATCH 9/9] Bump version to 0.47.1-SNAPSHOT --- .unreleased/breaking-changes/downgrade-z3.md | 1 - CHANGES.md | 6 ++++++ RELEASE.md | 5 ----- VERSION | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 .unreleased/breaking-changes/downgrade-z3.md delete mode 100644 RELEASE.md diff --git a/.unreleased/breaking-changes/downgrade-z3.md b/.unreleased/breaking-changes/downgrade-z3.md deleted file mode 100644 index c2d58933fc..0000000000 --- a/.unreleased/breaking-changes/downgrade-z3.md +++ /dev/null @@ -1 +0,0 @@ -Downgrade z3 to 4.12.6, due to instability of 4.13.0 diff --git a/CHANGES.md b/CHANGES.md index 4eb4cc93b2..8c5b563969 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,12 @@ +## 0.47.0 - 2024-10-02 + +### Breaking changes + +- Downgrade z3 to 4.12.6, due to instability of 4.13.0 + ## 0.46.2 - 2024-10-02 ### Bug fixes diff --git a/RELEASE.md b/RELEASE.md deleted file mode 100644 index 3b3dbac7b0..0000000000 --- a/RELEASE.md +++ /dev/null @@ -1,5 +0,0 @@ -## 0.47.0 - 2024-10-02 - -### Breaking changes - -- Downgrade z3 to 4.12.6, due to instability of 4.13.0 diff --git a/VERSION b/VERSION index 421ab545d9..3e9b4751ef 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.47.0 +0.47.1-SNAPSHOT