Skip to content

Commit e0b6a34

Browse files
committed
Bump Scala to 2.12.13 and Z3 to 4.8.10
1 parent de9fd39 commit e0b6a34

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@ z3/*
2828
# IDEA project files
2929
.idea/*
3030
*.iml
31+
32+
# VSCode and metals
33+
.metals
34+
.vscode

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ScalaZ3 ![Build status](http://laraquad4.epfl.ch:9000/epfl-lara/ScalaZ3/status/master)
22
=======
33

4-
This is ScalaZ3 for Z3 4.7.1 and Scala 2.10, 2.11, 2.12, and 2.13.
4+
This is ScalaZ3 for Z3 4.8.10 and Scala 2.10, 2.11, 2.12, and 2.13.
55

66
[API documentation](https://epfl-lara.github.io/ScalaZ3/z3/index.html)
77
-------------------
@@ -17,9 +17,9 @@ Run
1717

1818
sbt +package
1919

20-
to compile Z3 4.7.1 and cross-compile ScalaZ3 for Scala 2.10, 2.11, 2.12 and 2.13.
20+
to compile Z3 4.8.10 and cross-compile ScalaZ3 for Scala 2.10, 2.11, 2.12 and 2.13.
2121

22-
The JAR files will be in `target/scala-2.XX/scalaz3_2.XX-4.7.1.jar`
22+
The JAR files will be in `target/scala-2.XX/scalaz3_2.XX-4.8.10.jar`
2323
and will contain the shared library dependencies.
2424

2525
For testing, run
@@ -57,7 +57,7 @@ Now navigate to the scalaz3 folder and type:
5757

5858
sbt +package
5959

60-
The JAR files will be in `target/scala-2.XX/scalaz3_2.XX-4.7.1.jar` and will contain the shared library
60+
The JAR files will be in `target/scala-2.XX/scalaz3_2.XX-4.8.10.jar` and will contain the shared library
6161
dependencies.
6262

6363
#### Test your package.
@@ -77,13 +77,13 @@ Using ScalaZ3
7777

7878
### On a single operating system / architecture
7979

80-
Create a folder named `unmanaged` at the same level as your `build.sbt` file, and copy the JAR file in `target/scala-2.XX/scalaz3_2.XX-4.7.1.jar` into it.
80+
Create a folder named `unmanaged` at the same level as your `build.sbt` file, and copy the JAR file in `target/scala-2.XX/scalaz3_2.XX-4.8.10.jar` into it.
8181

8282
Then add, the following lines to your `build.sbt` file:
8383

8484
```scala
85-
Compile / unmanagedJars += {
86-
baseDirectory.value / "unmanaged" / s"scalaz3_${scalaBinaryVersion.value}-4.7.1.jar"
85+
unmanagedJars in Compile += {
86+
baseDirectory.value / "unmanaged" / s"scalaz3_${scalaBinaryVersion.value}-4.8.10.jar"
8787
}
8888
```
8989

build.sbt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import ScalaZ3Build._
33
lazy val root = (project in file("."))
44
.settings(
55
name := "ScalaZ3",
6-
version := "4.7.1",
6+
version := "4.8.10",
77
organization := "ch.epfl.lara",
88
scalacOptions ++= Seq(
99
"-deprecation",
1010
"-unchecked",
1111
"-feature",
1212
),
13-
scalaVersion := "2.12.8",
14-
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.8", "2.13.0"),
13+
scalaVersion := "2.12.13",
14+
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.8", "2.12.13", "2.13.5"),
1515
libraryDependencies ++= Seq(
1616
"org.scalatest" %% "scalatest" % "3.0.8" % "test"
1717
),
@@ -31,6 +31,7 @@ lazy val root = (project in file("."))
3131
Compile / compile := ((Compile / compile) dependsOn checksumTask).value,
3232
Test / test := ((Test / test) dependsOn (Compile / Keys.`package`)).value,
3333
Test / compile := ((Test / compile) dependsOn (Compile / Keys.`package`)).value,
34+
Test / testOnly := ((Test / testOnly) dependsOn (Compile / Keys.`package`)).evaluated,
3435
Test / internalDependencyClasspath := testClasspath.value,
3536
Compile / packageBin / mappings := newMappingsTask.value,
3637
)

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import scala.sys.process._
66
object ScalaZ3Build {
77

88
lazy val z3SourceRepo = "https://github.com/Z3Prover/z3.git"
9-
lazy val z3SourceTag = "Z3-4.8.5"
9+
lazy val z3SourceTag = "z3-4.8.10"
1010

1111
lazy val PS = java.io.File.pathSeparator
1212
lazy val DS = java.io.File.separator

0 commit comments

Comments
 (0)