File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 2828 - 'project/build.properties'
2929 - 'msgpack-core/**'
3030 - 'msgpack-jackson/**'
31+ - 'msgpack-jackson3/**'
3132 docs:
3233 - '**.md'
3334 - '**.txt'
6566 key : ${{ runner.os }}-jdk${{ matrix.java }}-${{ hashFiles('**/*.sbt') }}
6667 restore-keys : ${{ runner.os }}-jdk${{ matrix.java }}-
6768 - name : Test
68- run : ./sbt test
69+ run : |
70+ if [[ ${{ matrix.java }} -lt 17 ]]; then
71+ ./sbt msgpack-core/test msgpack-jackson/test
72+ else
73+ ./sbt test
74+ fi
6975 - name : Universal Buffer Test
70- run : ./sbt test -J-Dmsgpack.universal-buffer=true
76+ run : |
77+ if [[ ${{ matrix.java }} -lt 17 ]]; then
78+ ./sbt msgpack-core/test msgpack-jackson/test -J-Dmsgpack.universal-buffer=true
79+ else
80+ ./sbt test -J-Dmsgpack.universal-buffer=true
81+ fi
Original file line number Diff line number Diff line change @@ -101,6 +101,11 @@ val junitVintage = "org.junit.vintage" % "junit-vintage-engine" % "5.14.4" % "
101101val junitInterface = " com.github.sbt" % " junit-interface" % " 0.13.3" % " test"
102102
103103// Project settings
104+ val isJava17Plus : Boolean = {
105+ val v = sys.props.getOrElse(" java.specification.version" , " 1.8" )
106+ if (v.startsWith(" 1." )) false else scala.util.Try (v.toInt >= 17 ).getOrElse(false )
107+ }
108+
104109lazy val root = Project (id = " msgpack-java" , base = file(" ." ))
105110 .settings(
106111 buildSettings,
@@ -109,7 +114,10 @@ lazy val root = Project(id = "msgpack-java", base = file("."))
109114 publish := {},
110115 publishLocal := {}
111116 )
112- .aggregate(msgpackCore, msgpackJackson, msgpackJackson3)
117+ .aggregate(
118+ Seq [ProjectReference ](msgpackCore, msgpackJackson) ++
119+ (if (isJava17Plus) Seq [ProjectReference ](msgpackJackson3) else Nil ): _*
120+ )
113121
114122lazy val msgpackCore = Project (id = " msgpack-core" , base = file(" msgpack-core" ))
115123 .enablePlugins(SbtOsgi )
You can’t perform that action at this time.
0 commit comments