Skip to content

Commit 7d8e728

Browse files
authored
upgrade scala to 2.13.7 and release sequentially (#111)
* upgrade scala to 2.13.7 and release sequentially * refactor build * upgrade odb * fix build setup
1 parent da7fc2c commit 7d8e728

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
tags: ["*"]
66
jobs:
77
release:
8+
concurrency: release
89
runs-on: ubuntu-18.04
910
steps:
1011
- uses: actions/checkout@v2

codegen/src/main/scala/overflowdb/schema/Schema.scala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,11 @@ class Property[A](val name: String,
178178

179179
def default: Option[Default[A]] =
180180
_cardinality match {
181-
case c: Cardinality.One[A] => Option(c.default)
182-
case _ => None
181+
case c: Cardinality.One[_] =>
182+
// casting is safe here because only `mandatory(A)` can set the value
183+
Option(c.default).map(_.asInstanceOf[Default[A]])
184+
case _ =>
185+
None
183186
}
184187

185188
/** make this a list property, using a regular Sequence, with linear (slow) random access */

integration-tests/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ val generateDomainClasses = taskKey[Seq[File]]("generate overflowdb domain class
55
val schemas = project.in(file("schemas"))
66
.dependsOn(Projects.codegen_2_13)
77
.settings(
8-
scalaVersion := "2.13.6",
8+
scalaVersion := Versions.scala_2_13,
99
generateDomainClasses := Def.task {
1010
val outputRoot = target.value / "odb-codegen"
1111
FileUtils.deleteRecursively(outputRoot)
@@ -16,7 +16,7 @@ val schemas = project.in(file("schemas"))
1616

1717
val integrationTests = project.in(file("tests"))
1818
.settings(
19-
scalaVersion := "2.13.6",
19+
scalaVersion := Versions.scala_2_13,
2020
libraryDependencies ++= Seq(
2121
"io.shiftleft" %% "overflowdb-traversal" % Versions.overflowdb,
2222
"org.scalatest" %% "scalatest" % "3.2.9" % Test,

project/Build.scala

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
import sbt._
22
import com.lucidchart.sbtcross.BaseProject
33

4+
object Versions {
5+
val overflowdb = "1.69"
6+
val scala_2_12 = "2.12.15"
7+
val scala_2_13 = "2.13.7"
8+
}
9+
410
object Projects {
511
/** scala cross version settings for codegen:
612
* we need scala 2.12 for the sbt plugin and 2.13 for everything else */
713
lazy val codegen = BaseProject(project.in(file("codegen"))).cross
8-
lazy val codegen_2_12 = codegen("2.12.4")
9-
lazy val codegen_2_13 = codegen("2.13.6")
14+
lazy val codegen_2_12 = codegen(Versions.scala_2_12)
15+
lazy val codegen_2_13 = codegen(Versions.scala_2_13)
1016

1117
lazy val sbtPlugin = project.in(file("sbt-overflowdb"))
1218
lazy val integrationTests = project.in(file("integration-tests"))
1319
}
14-
15-
object Versions {
16-
val overflowdb = "1.62"
17-
}

0 commit comments

Comments
 (0)