Merge branch 'main' into update/ujson-3.3.1

apalache-mc · Aug 19, 2024 · 5aec7b0 · 5aec7b0
2 parents c3be302 + 5b0e11c
commit 5aec7b0
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 15 deletions.
diff --git 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/.unreleased/features/rewrite.md b/.unreleased/features/rewrite.md
diff --git a/.unreleased/features/timeout-smt.md b/.unreleased/features/timeout-smt.md
diff --git a/.unreleased/features/translate-generate.md b/.unreleased/features/translate-generate.md
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,16 @@
 <!-- NOTE: This file is generated. Do not write release notes here.
  Notes for unreleased changes go in the .unreleased/ directory. -->
 
+## 0.45.1 - 2024-08-19
+
+## 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/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
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.44.12-SNAPSHOT
+0.45.2-SNAPSHOT
diff --git 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")

diff --git 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
@@ -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.3.1"
     val upickle = "com.lihaoyi" %% "upickle" % "3.3.1"

diff --git 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