Skip to content

Commit

Permalink
Merge branch 'main' into mku-gh2948
Browse files Browse the repository at this point in the history
  • Loading branch information
konnov authored Sep 18, 2024
2 parents a4437c5 + dcc9564 commit 1af7b48
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Also, check the [standard repository of TLA+ examples][].

## Community

- Join the chat in the [Apalache zulip stream].
- Discuss the use of Apalache and R&D on the [Apalache Forum][].
- [Contribute](./CONTRIBUTING.md) to the development of Apalache.

## Funding and Sponsorship
Expand Down Expand Up @@ -163,6 +163,7 @@ Related reports and publications can be found at the
[TLA-Apalache workshop]: https://github.com/informalsystems/tla-apalache-workshop
[Beginner's tutorial]: https://apalache-mc.org/docs/tutorials/entry-tutorial.html
[Apalache examples]: https://github.com/konnov/apalache-examples
[Apalache Forum]: https://apalache.discourse.group/
[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
Expand All @@ -172,4 +173,4 @@ Related reports and publications can be found at the
[Vienna Business Agency]: https://viennabusinessagency.at/
[Igor Konnov]: https://github.com/konnov
[Jure Kukovec]: https://github.com/kukovec
[Thomas Pani]: https://github.com/thpani
[Thomas Pani]: https://github.com/thpani
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ object Dependencies {

object Deps {
// Versions
lazy val logbackVersion = "1.5.7"
lazy val logbackVersion = "1.5.8"
lazy val clistVersion = "3.5.1"

// Libraries
Expand Down Expand Up @@ -53,7 +53,7 @@ object Dependencies {
object TestDeps {
// Libraries
val junit = "junit" % "junit" % "4.13.2" % Test
val scalacheck = "org.scalacheck" %% "scalacheck" % "1.18.0" % Test
val scalacheck = "org.scalacheck" %% "scalacheck" % "1.18.1" % Test
val easymock = "org.easymock" % "easymock" % "5.4.0" % Test

val scalaTestVersion = "3.2.15"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.1
sbt.version=1.10.2
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.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.1.1")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.0")
// https://github.com/sbt/sbt-buildinfo
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
// https://github.com/sbt/sbt-native-packager
Expand Down
2 changes: 1 addition & 1 deletion project/sbt-changeling/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ThisBuild / version := "0.1.0-SNAPSHOT"
ThisBuild / organization := "systems.informal"

libraryDependencies ++= Seq(
"org.scala-sbt" % "sbt" % "1.10.1"
"org.scala-sbt" % "sbt" % "1.10.2"
)

lazy val sbt_changeling = (project in file("."))
Expand Down
2 changes: 1 addition & 1 deletion project/sbt-changeling/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.1
sbt.version=1.10.2

0 comments on commit 1af7b48

Please sign in to comment.