File tree Expand file tree Collapse file tree 4 files changed +16
-10
lines changed
codegen/src/main/scala/overflowdb/schema Expand file tree Collapse file tree 4 files changed +16
-10
lines changed Original file line number Diff line number Diff line change 5
5
tags : ["*"]
6
6
jobs :
7
7
release :
8
+ concurrency : release
8
9
runs-on : ubuntu-18.04
9
10
steps :
10
11
- uses : actions/checkout@v2
Original file line number Diff line number Diff line change @@ -178,8 +178,11 @@ class Property[A](val name: String,
178
178
179
179
def default : Option [Default [A ]] =
180
180
_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
183
186
}
184
187
185
188
/** make this a list property, using a regular Sequence, with linear (slow) random access */
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ val generateDomainClasses = taskKey[Seq[File]]("generate overflowdb domain class
5
5
val schemas = project.in(file(" schemas" ))
6
6
.dependsOn(Projects .codegen_2_13)
7
7
.settings(
8
- scalaVersion := " 2.13.6 " ,
8
+ scalaVersion := Versions .scala_2_13 ,
9
9
generateDomainClasses := Def .task {
10
10
val outputRoot = target.value / " odb-codegen"
11
11
FileUtils .deleteRecursively(outputRoot)
@@ -16,7 +16,7 @@ val schemas = project.in(file("schemas"))
16
16
17
17
val integrationTests = project.in(file(" tests" ))
18
18
.settings(
19
- scalaVersion := " 2.13.6 " ,
19
+ scalaVersion := Versions .scala_2_13 ,
20
20
libraryDependencies ++= Seq (
21
21
" io.shiftleft" %% " overflowdb-traversal" % Versions .overflowdb,
22
22
" org.scalatest" %% " scalatest" % " 3.2.9" % Test ,
Original file line number Diff line number Diff line change 1
1
import sbt ._
2
2
import com .lucidchart .sbtcross .BaseProject
3
3
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
+
4
10
object Projects {
5
11
/** scala cross version settings for codegen:
6
12
* we need scala 2.12 for the sbt plugin and 2.13 for everything else */
7
13
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 )
10
16
11
17
lazy val sbtPlugin = project.in(file(" sbt-overflowdb" ))
12
18
lazy val integrationTests = project.in(file(" integration-tests" ))
13
19
}
14
-
15
- object Versions {
16
- val overflowdb = " 1.62"
17
- }
You can’t perform that action at this time.
0 commit comments