Skip to content

Commit 03b1820

Browse files
committed
Deployment configuration cleanup
1 parent 8a1d6dd commit 03b1820

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

build.sbt

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
name := "udash-jquery"
22

33
inThisBuild(Seq(
4-
version := sys.env.get("TRAVIS_TAG").filter(_.startsWith("v")).map(_.drop(1)).getOrElse("3.0.0-SNAPSHOT"),
4+
version := "3.1.0-SNAPSHOT",
55
organization := "io.udash",
6-
cancelable := true,
76
))
87

98
val commonSettings = Seq(
@@ -25,8 +24,22 @@ val commonSettings = Seq(
2524
"-Ycache-plugin-class-loader:last-modified",
2625
"-Ycache-macro-class-loader:last-modified",
2726
),
28-
autoAPIMappings := true,
27+
)
28+
29+
val commonJSSettings = Seq(
30+
Test / scalaJSStage := FastOptStage,
31+
Test / requireJsDomEnv := true,
32+
npmExtraArgs += "--silent",
33+
scalacOptions += {
34+
val localDir = (ThisBuild / baseDirectory).value.toURI.toString
35+
val githubDir = "https://raw.githubusercontent.com/UdashFramework/scala-js-jquery"
36+
s"-P:scalajs:mapSourceURI:$localDir->$githubDir/v${version.value}/"
37+
},
38+
)
39+
40+
val deploymentConfiguration = Seq(
2941
publishMavenStyle := true,
42+
Test / publishArtifact := false,
3043
pomIncludeRepository := { _ => false },
3144

3245
publishTo := sonatypePublishToBundle.value,
@@ -61,22 +74,12 @@ val commonSettings = Seq(
6174
}
6275
)
6376

64-
val commonJSSettings = Seq(
65-
Test / scalaJSStage := FastOptStage,
66-
Test / requireJsDomEnv := true,
67-
npmExtraArgs += "--silent",
68-
scalacOptions += {
69-
val localDir = (ThisBuild / baseDirectory).value.toURI.toString
70-
val githubDir = "https://raw.githubusercontent.com/UdashFramework/scala-js-jquery"
71-
s"-P:scalajs:mapSourceURI:$localDir->$githubDir/v${version.value}/"
72-
},
73-
)
74-
7577
lazy val root = project.in(file("."))
7678
.enablePlugins(ScalaJSBundlerPlugin, JSDependenciesPlugin)
7779
.settings(
7880
commonSettings,
7981
commonJSSettings,
82+
deploymentConfiguration,
8083

8184
libraryDependencies ++= Seq(
8285
"org.scala-js" %%% "scalajs-dom" % "1.2.0",

travis/travis.gpg.enc

-3.63 KB
Binary file not shown.

0 commit comments

Comments
 (0)