Merge branch 'main' into update/sbt-1.10.1

.git-blame-ignore-revs

@@ -6,3 +6,6 @@
 
 # Scala Steward: Reformat with scalafmt 3.7.6
 1b2091c13571348b534076f2183ced2cd2ff67a9
+
+# Scala Steward: Reformat with scalafmt 3.8.3
+60dd752b3c25a2b578b9f0a967878904d6941982

.github/workflows/main.yml

@@ -166,6 +166,8 @@ jobs:
           TEST_FILTER: ${{ matrix.smt-encoding == 'arrays' && 'array-encoding' || '' }}
 
   docker-tests:
+    # provisionally disable docker tests until we repair them
+    if: false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.8.0"
+version = "3.8.3"
 
 runner.dialect = scala213
 fileOverride {

CONTRIBUTORS.md

@@ -0,0 +1,29 @@
+The following people have made core contributions to Apalache:
+
+  * Igor Konnov:
+    - Informal Systems (Austria) 2020-2023,
+    - Interchain Foundation (Switzerland) 2019,
+    - INRIA Nancy (France) 2018-2019,
+    - TU Wien (Austria) 2016-2018.
+  * Jure Kukovec:
+    - Informal Systems (Austria) 2021-2023,
+    - TU Wien (Austria), 2016-2021.
+  * Shon Feder: Informal Systems (Canada), 2020-2023.
+  * Gabriela Moreira: Informal Systems (Brazil), 2021-2023.
+  * Thomas Pani: Informal Systems (Austria), 2022-2023.
+  * Rodrigo Otoni:
+    USI Università della Svizzera italiana (Switzerland), 2021-2022.
+  * Philip Offtermatt: Informal Systems, 2022.
+  * Andrey Kuprianov: Informal Systems (Austria) 2020.
+  * Thanh Hai Tran: TU Wien (Austria), 2016-2020.
+  * Viktor Sergeev: Univ. of Lorraine (France), 2019.
+
+Further, we appreciate code and documentation contributions by:
+
+  * @BGR360 Ben Reeves, 2022-2023.
+  * @Alexander-N Alexander Niederbühl, 2021.
+  * @rnbguy Rano, 2021-2022.
+  * @klinvill Kirby Linvill, 2021.
+  * @JonathanLorimer Jonathan Lorimer, 2021.
+  * @danwt Daniel T, 2021.
+  * @jlu015 Jørgen Lund, 2019.

FUNDING.md

@@ -0,0 +1,19 @@
+## Apalache Funding
+
+We are grateful to the following organizations for financially supporting
+the project Apalache for significant duration of time in the past:
+
+- [Informal Systems][]: 2020-2024
+- [Vienna Business Agency][]: 2021-2023
+- [Interchain Foundation][]: 2019-2023
+- [WWTF][] (Austria): Vienna Science and Technology Fund 2016-2020
+- [Inria Nancy][] and [LORIA][] (France): 2018-2019
+- [TU Wien][] (Austria): 2016-2020
+
+[WWTF]: https://wwtf.at/index.php?lang=EN
+[TU Wien]: https://www.tuwien.at/
+[Inria Nancy]: https://www.inria.fr/en/inria-centre-universite-lorraine
+[LORIA]: https://loria.fr
+[Interchain Foundation]: https://interchain.io/
+[Informal Systems]: https://informal.systems/
+[Vienna Business Agency]: https://viennabusinessagency.at/

project/Dependencies.scala

@@ -31,7 +31,7 @@ object Dependencies {
     val scalaParserCombinators = "org.scala-lang.modules" %% "scala-parser-combinators" % "2.3.0"
     val scalaCollectionContrib = "org.scala-lang.modules" %% "scala-collection-contrib" % "0.3.0"
     val scalaz = "org.scalaz" %% "scalaz-core" % "7.3.5"
-    val slf4j = "org.slf4j" % "slf4j-api" % "2.0.12"
+    val slf4j = "org.slf4j" % "slf4j-api" % "2.0.16"
     val shapeless = "com.chuusai" %% "shapeless" % "2.3.10"
     val tla2tools = "org.lamport" % "tla2tools" % "1.7.0-SNAPSHOT"
     val ujson = "com.lihaoyi" %% "ujson" % "3.2.0"
@@ -40,7 +40,7 @@ object Dependencies {
     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"
-    val grpcNetty = "io.grpc" % "grpc-netty" % "1.62.2"
+    val grpcNetty = "io.grpc" % "grpc-netty" % "1.66.0"
     val scalapbRuntimGrpc =
       "com.thesamet.scalapb" %% "scalapb-runtime-grpc" % scalapb.compiler.Version.scalapbVersion
     // Ensures we have access to commonly used protocol buffers (e.g., google.protobuf.Struct)
@@ -54,7 +54,7 @@ object Dependencies {
     // Libraries
     val junit = "junit" % "junit" % "4.13.2" % Test
     val scalacheck = "org.scalacheck" %% "scalacheck" % "1.17.0" % Test
-    val easymock = "org.easymock" % "easymock" % "5.2.0" % Test
+    val easymock = "org.easymock" % "easymock" % "5.4.0" % Test
 
     val scalaTestVersion = "3.2.15"
     val scalatest = "org.scalatest" %% "scalatest" % scalaTestVersion % Test

tlair/src/test/scala/at/forsyte/apalache/tla/typecomp/TestSetBuilder.scala

@@ -292,7 +292,7 @@ class TestSetBuilder extends BuilderTest {
                   builder.name(s"x$i", ti),
                   builder.name(s"S$i", InvalidTypeMethods.notSet),
               )
-            }
+            },
         )
 
     }
@@ -441,7 +441,7 @@ class TestSetBuilder extends BuilderTest {
           ts.zipWithIndex.map { case ((ti, _), i) =>
             builder.name(s"x$i", ti) ->
               builder.name(s"S$i", InvalidTypeMethods.notSet)
-          }
+          },
       )
     }