@@ -11,17 +11,9 @@ ThisBuild / githubWorkflowJavaVersions := Seq(javaDistro)
11
11
ThisBuild / githubWorkflowSbtCommand := " ./sbt"
12
12
13
13
ThisBuild / githubWorkflowBuildMatrixExclusions ++= Seq (
14
- MatrixExclude (Map (" scala" -> " 3" , " project" -> " rootJVM" )), // TODO
15
- MatrixExclude (
16
- Map (" scala" -> " 3" , " project" -> " rootNative" , " os" -> " ubuntu-latest" )
17
- ) // run on macOS instead
14
+ MatrixExclude (Map (" scala" -> " 3" , " project" -> " rootJVM" )) // TODO
18
15
)
19
16
20
- ThisBuild / githubWorkflowBuildMatrixInclusions +=
21
- MatrixInclude (Map (" scala" -> " 3" , " java" -> javaDistro.render, " project" -> " rootNative" ),
22
- Map (" os" -> " macos-latest" )
23
- )
24
-
25
17
val tzdbVersion = " 2019c"
26
18
val scalajavaLocalesVersion = " 1.5.4"
27
19
Global / onChangedBuildSource := ReloadOnSourceChanges
@@ -177,9 +169,9 @@ lazy val tzdb = crossProject(JVMPlatform, JSPlatform, NativePlatform)
177
169
.in(file(" tzdb" ))
178
170
.settings(commonSettings)
179
171
.settings(
180
- name := " scala-java-time-tzdb" ,
181
- includeTTBP := true ,
182
- dbVersion := TzdbPlugin .Version (tzdbVersion),
172
+ name := " scala-java-time-tzdb" ,
173
+ includeTTBP := true ,
174
+ dbVersion := TzdbPlugin .Version (tzdbVersion)
183
175
)
184
176
.jsSettings(
185
177
Compile / sourceGenerators += Def .task {
@@ -248,12 +240,12 @@ lazy val demo = crossProject(JSPlatform, JVMPlatform, NativePlatform)
248
240
.dependsOn(core)
249
241
.enablePlugins(TzdbPlugin , NoPublishPlugin )
250
242
.settings(
251
- name := " demo" ,
252
- Keys .`package` := file(" " ),
253
- zonesFilter := zonesFilterFn,
254
- dbVersion := TzdbPlugin .Version (tzdbVersion),
243
+ name := " demo" ,
244
+ Keys .`package` := file(" " ),
245
+ zonesFilter := zonesFilterFn,
246
+ dbVersion := TzdbPlugin .Version (tzdbVersion),
255
247
// delegate test to run, so that it is invoked during test step in ci
256
- Test / test := (Compile / run).toTask(" " ).value
248
+ Test / test := (Compile / run).toTask(" " ).value
257
249
)
258
250
.jsSettings(
259
251
scalaJSUseMainModuleInitializer := true
0 commit comments