Fixed publishing of JVM artifacts for scala 2.13

viktor-podzigun · viktor-podzigun · commit 85a99b535699 · 2022-01-31T16:39:48.000+01:00
diff --git a/project/src/main/scala/definitions/ApiAdmin.scala b/project/src/main/scala/definitions/ApiAdmin.scala
@@ -27,7 +27,6 @@ object ApiAdmin {
       )
     ).jvmSettings(
       // Add JVM-specific settings here
-      JvmModule.settings: _*
     ).jsSettings(
       // Add JS-specific settings here
       ScalaJsModule.settings: _*
diff --git a/project/src/main/scala/definitions/ApiCore.scala b/project/src/main/scala/definitions/ApiCore.scala
@@ -27,11 +27,9 @@ object ApiCore {
         TestLibs.scalaMockJs.value % "test"
       )
     ).jvmSettings(
-      Seq(
-        libraryDependencies ++= Seq(
-          Libs.jodaTime.value
-        )
-      ) ++ JvmModule.settings: _*
+      libraryDependencies ++= Seq(
+        Libs.jodaTime.value
+      )
     ).jsSettings(
       ScalaJsModule.settings: _*
     )
diff --git a/project/src/main/scala/definitions/ApiJodaTime.scala b/project/src/main/scala/definitions/ApiJodaTime.scala
@@ -26,11 +26,9 @@ object ApiJodaTime {
         TestLibs.scalaMockJs.value % "test"
       )
     ).jvmSettings(
-      Seq(
-        libraryDependencies ++= Seq(
-          Libs.jodaTime.value
-        )
-      ) ++ JvmModule.settings: _*
+      libraryDependencies ++= Seq(
+        Libs.jodaTime.value
+      )
     ).jsSettings(
       ScalaJsModule.settings: _*
     )
diff --git a/project/src/main/scala/definitions/ApiPlayWs.scala b/project/src/main/scala/definitions/ApiPlayWs.scala
@@ -11,7 +11,6 @@ object ApiPlayWs extends ApiModule {
   override val base: File = file("play-ws")
 
   override def definition: Project = super.definition
-    .settings(JvmModule.settings: _*)
     .settings(
       description := "Common Scala ApiHttpClient implementation using play-ws library"
     )
diff --git a/project/src/main/scala/definitions/JvmModule.scala b/project/src/main/scala/definitions/JvmModule.scala

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ object ApiAdmin {`
`27`	`27`	`)`
`28`	`28`	`).jvmSettings(`
`29`	`29`	`// Add JVM-specific settings here`
`30`		`- JvmModule.settings: _*`
`31`	`30`	`).jsSettings(`
`32`	`31`	`// Add JS-specific settings here`
`33`	`32`	`ScalaJsModule.settings: _*`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ object ApiPlayWs extends ApiModule {`
`11`	`11`	`override val base: File = file("play-ws")`
`12`	`12`
`13`	`13`	`override def definition: Project = super.definition`
`14`		`- .settings(JvmModule.settings: _*)`
`15`	`14`	`.settings(`
`16`	`15`	`description := "Common Scala ApiHttpClient implementation using play-ws library"`
`17`	`16`	`)`