Merge branch 'main' into update/sbt-assembly-2.2.0

apalache-mc · Aug 21, 2024 · 9d49419 · 9d49419
2 parents 3f447bd + b287556
commit 9d49419
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 28 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,8 @@
 <!-- NOTE: This file is generated. Do not write release notes here.
  Notes for unreleased changes go in the .unreleased/ directory. -->
 
+## 0.45.2 - 2024-08-19
+
 ## 0.45.1 - 2024-08-19
 
 ## 0.45.0 - 2024-08-17

diff --git a/README.md b/README.md
@@ -3,16 +3,16 @@
 src="https://raw.githubusercontent.com/informalsystems/apalache/99e58d6f5eebcc41f432a126a13a5f8d2ae7afe6/logo-apalache.svg"
 alt="Apalache Logo">
 
-<h1><a href="https://apalache.informal.systems/">APALACHE</a></h1>
+<h1><a href="https://apalache-mc.org/">APALACHE</a></h1>
 
 <p>A symbolic model checker for TLA+<p>
 
 </div>
 
 [![main badge][]][main-ci]
 
-[main badge]: https://github.com/informalsystems/apalache/workflows/build/badge.svg?branch=main
-[main-ci]: https://github.com/informalsystems/apalache/actions?query=branch%3Amain+workflow%3Abuild
+[main badge]: https://github.com/apalache-mc/apalache/workflows/build/badge.svg?branch=main
+[main-ci]: https://github.com/apalache-mc/apalache/actions?query=branch%3Amain+workflow%3Abuild
 
 Apalache translates [TLA+] into the logic supported by SMT solvers such as
 [Microsoft Z3]. Apalache can check inductive invariants (for fixed or bounded
@@ -28,7 +28,7 @@ course].
 Check the [releases page][] for our latest release.
 
 For a stable release, we recommend that you pull the latest docker image with
-`docker pull ghcr.io/informalsystems/apalache:main`, use the jar from the
+`docker pull ghcr.io/apalache-mc/apalache:main`, use the jar from the
 most recent release, or checkout the source code from the most recent release
 tag.
 
@@ -49,10 +49,10 @@ manual][user-manual-installation].
 
 ## Website
 
-Our current website is served at https://apalache.informal.systems .
+Our current website is served at https://apalache-mc.org .
 
 The site is hosted by github, and changes can be made through PRs into the
-[gh-pages](https://github.com/informalsystems/apalache/tree/gh-pages) branch of
+[gh-pages](https://github.com/apalache-mc/apalache/tree/gh-pages) branch of
 this repository. See the README.md on that branch for more information.
 
 The user documentation is automatically deployed to the website branch as per
@@ -72,11 +72,11 @@ knowing too much about the internals of Apalache. Solving these issues would
 improve usability! Please comment in the relevant issue, if you are going to
 solve it.
 
-- Writing annotations in the JSON format: [#804](https://github.com/informalsystems/apalache/issues/804)
-- Add support for VIEW in the TLC config: [#851](https://github.com/informalsystems/apalache/issues/851)
+- Writing annotations in the JSON format: [#804](https://github.com/apalache-mc/apalache/issues/804)
+- Add support for VIEW in the TLC config: [#851](https://github.com/apalache-mc/apalache/issues/851)
 - Translate `\E x \in STRING: P` and `\A x \in STRING: P`:
-    [#844](https://github.com/informalsystems/apalache/issues/844)
-- Interval analysis for `a..b`: [#446](https://github.com/informalsystems/apalache/issues/446)
+    [#844](https://github.com/apalache-mc/apalache/issues/844)
+- Interval analysis for `a..b`: [#446](https://github.com/apalache-mc/apalache/issues/446)
 
 ## Industrial examples
 
@@ -142,27 +142,27 @@ Past funding from [Der Wiener Wissenschafts-, Forschungs- und Technologiefonds](
 
 [tla+]: http://lamport.azurewebsites.net/tla/tla.html
 [microsoft z3]: https://github.com/Z3Prover/z3
-[supported features]: https://apalache.informal.systems/docs/apalache/features.html
+[supported features]: https://apalache-mc.org/docs/apalache/features.html
 [tlc]: http://lamport.azurewebsites.net/tla/tools.html
 [leslie lamport's page on tla+]: http://lamport.azurewebsites.net/tla/tla.html
 [video course]: http://lamport.azurewebsites.net/video/videos.html
-[releases page]: https://github.com/informalsystems/apalache/releases
-[master]: https://github.com/informalsystems/apalache/tree/master
-[main branch]: https://github.com/informalsystems/apalache/tree/main
+[releases page]: https://github.com/apalache-mc/apalache/releases
+[master]: https://github.com/apalache-mc/apalache/tree/master
+[main branch]: https://github.com/apalache-mc/apalache/tree/main
 [apalache zulip stream]: https://informal-systems.zulipchat.com/#narrow/stream/265309-apalache
 [tendermint specs]: https://github.com/tendermint/tendermint/tree/master/spec/light-client/accountability
 [tendermint blockchain]: https://github.com/tendermint
 [standard repository of tla+ examples]: https://github.com/tlaplus/Examples
-[apalache benchmarks]: https://github.com/informalsystems/apalache-tests
-[checking inductive invariants]: https://github.com/informalsystems/apalache-tests/blob/master/results/001indinv-report.md
-[bounded model checking]: https://github.com/informalsystems/apalache-tests/blob/master/results/002bmc-report.md
-[user-manual]: http://informalsystems.github.io/apalache/docs/index.html
-[user-manual-docker]: https://apalache.informal.systems/docs/apalache/installation/docker.html
-[user-manual-installation]: https://apalache.informal.systems/docs/apalache/installation/index.html
-[language-manual]: https://apalache.informal.systems/docs/lang/index.html
-[idioms]: https://apalache.informal.systems//docs/idiomatic/index.html
+[apalache benchmarks]: https://github.com/apalache-mc/apalache-tests
+[checking inductive invariants]: https://github.com/apalache-mc/apalache-tests/blob/master/results/001indinv-report.md
+[bounded model checking]: https://github.com/apalache-mc/apalache-tests/blob/master/results/002bmc-report.md
+[user-manual]: http://apalache-mc.org/apalache/docs/index.html
+[user-manual-docker]: https://apalache-mc.org/docs/apalache/installation/docker.html
+[user-manual-installation]: https://apalache-mc.org/docs/apalache/installation/index.html
+[language-manual]: https://apalache-mc.org/docs/lang/index.html
+[idioms]: https://apalache-mc.org/docs/idiomatic/index.html
 [light client specs]: https://github.com/tendermint/tendermint/tree/master/spec/light-client/verification
 [model-based testing]: https://github.com/informalsystems/tendermint-rs/tree/master/light-client/tests/support/model_based#light-client-model-based-testing-guide
-[apalache.informal.systems]: https://apalache.informal.systems
+[apalache-mc.org]: https://apalache-mc.org
 [TLA-Apalache workshop]: https://github.com/informalsystems/tla-apalache-workshop
-[Beginner's tutorial]: https://apalache.informal.systems/docs/tutorials/entry-tutorial.html
+[Beginner's tutorial]: https://apalache-mc.org/docs/tutorials/entry-tutorial.html
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.45.2-SNAPSHOT
+0.45.3-SNAPSHOT
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -27,7 +27,7 @@ object Dependencies {
     val logbackClassic = "ch.qos.logback" % "logback-classic" % logbackVersion
     val logbackCore = "ch.qos.logback" % "logback-core" % logbackVersion
     val logging = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"
-    val pureConfig = "com.github.pureconfig" %% "pureconfig" % "0.17.6"
+    val pureConfig = "com.github.pureconfig" %% "pureconfig" % "0.17.7"
     val scalaParserCombinators = "org.scala-lang.modules" %% "scala-parser-combinators" % "2.4.0"
     val scalaCollectionContrib = "org.scala-lang.modules" %% "scala-collection-contrib" % "0.3.0"
     val scalaz = "org.scalaz" %% "scalaz-core" % "7.3.5"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -5,7 +5,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.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.0.11")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
 // https://github.com/sbt/sbt-buildinfo
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
 // https://github.com/sbt/sbt-native-packager
@@ -21,7 +21,7 @@ addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
 val zioGrpcVersion = "0.5.3"
 libraryDependencies ++= Seq(
     "com.thesamet.scalapb.zio-grpc" %% "zio-grpc-codegen" % zioGrpcVersion,
-    "com.thesamet.scalapb" %% "compilerplugin" % "0.11.15",
+    "com.thesamet.scalapb" %% "compilerplugin" % "0.11.17",
 )
 
 // Add the locally defined plugins