From ffe8ffa004c4da862468b45f9573d7cd32a701d6 Mon Sep 17 00:00:00 2001 From: Igor Konnov Date: Tue, 23 Jul 2024 16:55:32 +0200 Subject: [PATCH 01/10] Create CONTRIBUTORS.md --- CONTRIBUTORS.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 CONTRIBUTORS.md diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 0000000000..83967b1a12 --- /dev/null +++ b/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. From c89de58ed83bb2d3ad85d0d96f4056d585beca45 Mon Sep 17 00:00:00 2001 From: Igor Konnov Date: Tue, 23 Jul 2024 16:56:50 +0200 Subject: [PATCH 02/10] Create FUNDING.md --- FUNDING.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 FUNDING.md diff --git a/FUNDING.md b/FUNDING.md new file mode 100644 index 0000000000..95e1d0943f --- /dev/null +++ b/FUNDING.md @@ -0,0 +1,20 @@ +## 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/ +[Igor Konnov]: https://konnov.phd/ From 465b6a96a731a595e18c478c8df22457e6025abf Mon Sep 17 00:00:00 2001 From: Igor Konnov Date: Tue, 23 Jul 2024 17:40:16 +0200 Subject: [PATCH 03/10] Update FUNDING.md Co-authored-by: Gabriela Moreira --- FUNDING.md | 1 - 1 file changed, 1 deletion(-) diff --git a/FUNDING.md b/FUNDING.md index 95e1d0943f..7d6cffe670 100644 --- a/FUNDING.md +++ b/FUNDING.md @@ -17,4 +17,3 @@ the project Apalache for significant duration of time in the past: [Interchain Foundation]: https://interchain.io/ [Informal Systems]: https://informal.systems/ [Vienna Business Agency]: https://viennabusinessagency.at/ -[Igor Konnov]: https://konnov.phd/ From d707272ea466852ce81853197aad72bedc81dc7e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 29 Jul 2024 16:14:34 +0000 Subject: [PATCH 04/10] Update scalafmt-core to 3.8.3 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 11af66aa14..2f274e9290 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.8.0" +version = "3.8.3" runner.dialect = scala213 fileOverride { From 60dd752b3c25a2b578b9f0a967878904d6941982 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 29 Jul 2024 16:15:48 +0000 Subject: [PATCH 05/10] Reformat with scalafmt 3.8.3 Executed command: scalafmt --non-interactive --- .../at/forsyte/apalache/tla/typecomp/TestSetBuilder.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tlair/src/test/scala/at/forsyte/apalache/tla/typecomp/TestSetBuilder.scala b/tlair/src/test/scala/at/forsyte/apalache/tla/typecomp/TestSetBuilder.scala index 2fee63793c..6ebb57ec76 100644 --- a/tlair/src/test/scala/at/forsyte/apalache/tla/typecomp/TestSetBuilder.scala +++ b/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) - } + }, ) } From b03767c8c14d5008db0721279cc338968ea94f3c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 29 Jul 2024 16:15:48 +0000 Subject: [PATCH 06/10] Add 'Reformat with scalafmt 3.8.3' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 05d4c13a59..71e9c75789 100644 --- a/.git-blame-ignore-revs +++ b/.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 From f624624baf1291b59fa6db5f8a929bc7870138a1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 5 Aug 2024 19:30:55 +0000 Subject: [PATCH 07/10] Update easymock to 5.4.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5c0269f1ce..b1562a259b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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 From d1f04b510bc86c3e8b7318a3a41542ce8227db68 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 12 Aug 2024 21:29:54 +0000 Subject: [PATCH 08/10] Update grpc-netty to 1.66.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5c0269f1ce..0bc3782dcb 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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) From 64d8becac7e2a978ceafc615367c4f8c460e25a5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 12 Aug 2024 21:30:18 +0000 Subject: [PATCH 09/10] Update slf4j-api to 2.0.16 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5c0269f1ce..c263e2acdd 100644 --- a/project/Dependencies.scala +++ b/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" From 2c7a7e6cdd3f8d8f3c79d69245dc2b1ef75e1725 Mon Sep 17 00:00:00 2001 From: Igor Konnov Date: Tue, 13 Aug 2024 16:40:33 +0200 Subject: [PATCH 10/10] disable docker-tests --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 43f314e500..5a95199b64 100644 --- a/.github/workflows/main.yml +++ b/.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