From 13faf2912f2aa0c9d7539d1fd2b788872c98d2f1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 4 Jun 2024 15:16:03 +0000 Subject: [PATCH 1/9] Update compilerplugin, scalapb-runtime, ... to 0.11.17 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index b82576ce65..7a9174512e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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 From f0330714ea921fa1c2112860f0b25973d12c7ce7 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 13 Aug 2024 20:56:42 +0000 Subject: [PATCH 2/9] Update shapeless to 2.3.12 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 329101cd8f..4489e41096 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -32,7 +32,7 @@ object Dependencies { 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.16" - val shapeless = "com.chuusai" %% "shapeless" % "2.3.10" + val shapeless = "com.chuusai" %% "shapeless" % "2.3.12" val tla2tools = "org.lamport" % "tla2tools" % "1.7.0-SNAPSHOT" val ujson = "com.lihaoyi" %% "ujson" % "3.2.0" val upickle = "com.lihaoyi" %% "upickle" % "3.2.0" From a2bfb42e9e2c1d0d5316495237b1a84942c002d1 Mon Sep 17 00:00:00 2001 From: Igor Konnov Date: Thu, 15 Aug 2024 11:45:51 +0200 Subject: [PATCH 3/9] bump scala to 2.13.14 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 83145fae79..ae0af55d5d 100644 --- a/build.sbt +++ b/build.sbt @@ -20,7 +20,7 @@ ThisBuild / versionFile := (ThisBuild / baseDirectory).value / "VERSION" ThisBuild / version := scala.io.Source.fromFile(versionFile.value).mkString.trim ThisBuild / organization := "at.forsyte" -ThisBuild / scalaVersion := "2.13.13" +ThisBuild / scalaVersion := "2.13.14" // Add resolver for Sonatype OSS Snapshots and Releases Maven repository ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots") From 9ab5a6b4e1aee072274cd61ca796deec1f938f76 Mon Sep 17 00:00:00 2001 From: Igor Konnov Date: Thu, 15 Aug 2024 12:03:05 +0200 Subject: [PATCH 4/9] use test instead of test-coverage --- .github/workflows/main.yml | 7 +------ Makefile | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5a95199b64..20b48cdeb6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -101,12 +101,7 @@ jobs: # See https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#setting-an-environment-variable run: echo "APALACHE_HOME=$GITHUB_WORKSPACE" >> $GITHUB_ENV - name: Build and Unit Test - run: make test-coverage - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v2 - with: - # See https://app.codecov.io/gh/informalsystems/apalache/ - token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos + run: make test - name: Cleanup before cache # See https://www.scala-sbt.org/1.x/docs/GitHub-Actions-with-sbt.html#Caching shell: bash diff --git a/Makefile b/Makefile index 0058403306..16ed465722 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,8 @@ compile-strict: export APALACHE_FATAL_WARNINGS=true compile-strict: sbt Test/compile compile -# Run tests with scoverage report +# Run tests with scoverage report. +# This target is not used in the CI anymore. It needs additional devops work to re-enable it. test-coverage: sbt coverage test coverageAggregate From 1a4229a4c22aff04b1cf3d7dc75f5c374ea3dbd8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 17 Aug 2024 14:14:55 +0000 Subject: [PATCH 5/9] Update logback-classic, logback-core to 1.5.7 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8014769576..ed98809c61 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,7 +12,7 @@ object Dependencies { object Deps { // Versions - lazy val logbackVersion = "1.5.6" + lazy val logbackVersion = "1.5.7" lazy val clistVersion = "3.5.1" // Libraries From 13c39f5ef9fde86277635a8fae1fc394313c26f6 Mon Sep 17 00:00:00 2001 From: konnov Date: Sat, 17 Aug 2024 15:52:48 +0000 Subject: [PATCH 6/9] [release] 0.45.0 --- RELEASE.md | 7 +++++++ VERSION | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 RELEASE.md diff --git a/RELEASE.md b/RELEASE.md new file mode 100644 index 0000000000..f5d281c853 --- /dev/null +++ b/RELEASE.md @@ -0,0 +1,7 @@ +## 0.45.0 - 2024-08-17 + +### Features + +- Handle expressions such as S \in SUBSET [ a : Int ] by rewriting the expression into \A r \in S: DOMAIN r = {"a"} /\ r.a \in Int +- Translate Quint's generate into `Apalache!Gen` (#2916) +- Add `--timeout-smt` to limit SMT queries (#2936) diff --git a/VERSION b/VERSION index 93722f80fa..bcce5d06b8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.44.12-SNAPSHOT +0.45.0 From 553ff28f7c5a5072f35127cda4a83696f1d03db9 Mon Sep 17 00:00:00 2001 From: konnov Date: Sat, 17 Aug 2024 15:52:56 +0000 Subject: [PATCH 7/9] Bump version to 0.45.1-SNAPSHOT --- .unreleased/features/rewrite.md | 1 - .unreleased/features/timeout-smt.md | 1 - .unreleased/features/translate-generate.md | 1 - CHANGES.md | 8 ++++++++ RELEASE.md | 7 ------- VERSION | 2 +- 6 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 .unreleased/features/rewrite.md delete mode 100644 .unreleased/features/timeout-smt.md delete mode 100644 .unreleased/features/translate-generate.md delete mode 100644 RELEASE.md diff --git a/.unreleased/features/rewrite.md b/.unreleased/features/rewrite.md deleted file mode 100644 index 00fb95d91b..0000000000 --- a/.unreleased/features/rewrite.md +++ /dev/null @@ -1 +0,0 @@ -Handle expressions such as S \in SUBSET [ a : Int ] by rewriting the expression into \A r \in S: DOMAIN r = {"a"} /\ r.a \in Int \ No newline at end of file diff --git a/.unreleased/features/timeout-smt.md b/.unreleased/features/timeout-smt.md deleted file mode 100644 index dd27979cfb..0000000000 --- a/.unreleased/features/timeout-smt.md +++ /dev/null @@ -1 +0,0 @@ -Add `--timeout-smt` to limit SMT queries (#2936) diff --git a/.unreleased/features/translate-generate.md b/.unreleased/features/translate-generate.md deleted file mode 100644 index 326f24450d..0000000000 --- a/.unreleased/features/translate-generate.md +++ /dev/null @@ -1 +0,0 @@ -Translate Quint's generate into `Apalache!Gen` (#2916) diff --git a/CHANGES.md b/CHANGES.md index e370b63d49..e523bc2b40 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,14 @@ +## 0.45.0 - 2024-08-17 + +### Features + +- Handle expressions such as S \in SUBSET [ a : Int ] by rewriting the expression into \A r \in S: DOMAIN r = {"a"} /\ r.a \in Int +- Translate Quint's generate into `Apalache!Gen` (#2916) +- Add `--timeout-smt` to limit SMT queries (#2936) + ## 0.44.11 - 2024-05-06 ### Features diff --git a/RELEASE.md b/RELEASE.md deleted file mode 100644 index f5d281c853..0000000000 --- a/RELEASE.md +++ /dev/null @@ -1,7 +0,0 @@ -## 0.45.0 - 2024-08-17 - -### Features - -- Handle expressions such as S \in SUBSET [ a : Int ] by rewriting the expression into \A r \in S: DOMAIN r = {"a"} /\ r.a \in Int -- Translate Quint's generate into `Apalache!Gen` (#2916) -- Add `--timeout-smt` to limit SMT queries (#2936) diff --git a/VERSION b/VERSION index bcce5d06b8..630d1052de 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.45.0 +0.45.1-SNAPSHOT From fb281ea125ad4778b56d5269991e3fd59698817c Mon Sep 17 00:00:00 2001 From: konnov Date: Mon, 19 Aug 2024 10:24:13 +0000 Subject: [PATCH 8/9] [release] 0.45.1 --- RELEASE.md | 1 + VERSION | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 RELEASE.md diff --git a/RELEASE.md b/RELEASE.md new file mode 100644 index 0000000000..0415601620 --- /dev/null +++ b/RELEASE.md @@ -0,0 +1 @@ +## 0.45.1 - 2024-08-19 diff --git a/VERSION b/VERSION index 630d1052de..ff12df2fbb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.45.1-SNAPSHOT +0.45.1 From 1f125e1927a3ca664bc70924d7d725382cc431df Mon Sep 17 00:00:00 2001 From: konnov Date: Mon, 19 Aug 2024 10:24:21 +0000 Subject: [PATCH 9/9] Bump version to 0.45.2-SNAPSHOT --- CHANGES.md | 2 ++ RELEASE.md | 1 - VERSION | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 RELEASE.md diff --git a/CHANGES.md b/CHANGES.md index e523bc2b40..a02649ecfd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,8 @@ +## 0.45.1 - 2024-08-19 + ## 0.45.0 - 2024-08-17 ### Features diff --git a/RELEASE.md b/RELEASE.md deleted file mode 100644 index 0415601620..0000000000 --- a/RELEASE.md +++ /dev/null @@ -1 +0,0 @@ -## 0.45.1 - 2024-08-19 diff --git a/VERSION b/VERSION index ff12df2fbb..4ac1163a8c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.45.1 +0.45.2-SNAPSHOT