Skip to content

Commit 85a99b5

Browse files
Fixed publishing of JVM artifacts for scala 2.13
1 parent 1989209 commit 85a99b5

File tree

5 files changed

+6
-25
lines changed

5 files changed

+6
-25
lines changed

project/src/main/scala/definitions/ApiAdmin.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ object ApiAdmin {
2727
)
2828
).jvmSettings(
2929
// Add JVM-specific settings here
30-
JvmModule.settings: _*
3130
).jsSettings(
3231
// Add JS-specific settings here
3332
ScalaJsModule.settings: _*

project/src/main/scala/definitions/ApiCore.scala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@ object ApiCore {
2727
TestLibs.scalaMockJs.value % "test"
2828
)
2929
).jvmSettings(
30-
Seq(
31-
libraryDependencies ++= Seq(
32-
Libs.jodaTime.value
33-
)
34-
) ++ JvmModule.settings: _*
30+
libraryDependencies ++= Seq(
31+
Libs.jodaTime.value
32+
)
3533
).jsSettings(
3634
ScalaJsModule.settings: _*
3735
)

project/src/main/scala/definitions/ApiJodaTime.scala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ object ApiJodaTime {
2626
TestLibs.scalaMockJs.value % "test"
2727
)
2828
).jvmSettings(
29-
Seq(
30-
libraryDependencies ++= Seq(
31-
Libs.jodaTime.value
32-
)
33-
) ++ JvmModule.settings: _*
29+
libraryDependencies ++= Seq(
30+
Libs.jodaTime.value
31+
)
3432
).jsSettings(
3533
ScalaJsModule.settings: _*
3634
)

project/src/main/scala/definitions/ApiPlayWs.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ object ApiPlayWs extends ApiModule {
1111
override val base: File = file("play-ws")
1212

1313
override def definition: Project = super.definition
14-
.settings(JvmModule.settings: _*)
1514
.settings(
1615
description := "Common Scala ApiHttpClient implementation using play-ws library"
1716
)

project/src/main/scala/definitions/JvmModule.scala

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)