Skip to content

Commit 26854b2

Browse files
committed
1. Renamed npm/cassandra to npm/cassandra-driver
2. Updated build.sbt 3. Fixed issues preventing Sonatype release
1 parent 55692dc commit 26854b2

23 files changed

+145
-15
lines changed

build.sbt

+106-14
Large diffs are not rendered by default.

core/util/src/main/scala/org/scalajs/sjs/OptionHelper.scala

+6
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ object OptionHelper {
2626

2727
@inline def ??(optB: => Option[T]): Option[T] = if (valueA.isDefined) valueA else optB
2828

29+
@inline def flat = valueA.flatMap(Option(_))
30+
31+
@inline def isAssigned = valueA.flat.nonEmpty
32+
33+
@inline def nonAssigned = valueA.flat.isEmpty
34+
2935
@inline def orDie(message: String): T = valueA getOrElse (throw new IllegalStateException(message))
3036

3137
}

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.11" )
88

99
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
1010

11-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
11+
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
1212

1313
// Resolvers
1414

sonatype.sbt

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Your profile name of the sonatype account. The default is the same with the organization value
2+
sonatypeProfileName := "ldaniels528"
3+
4+
// To sync with Maven central, you need to supply the following information:
5+
pomExtra in Global := {
6+
<url>https://github.com/ldaniels528/scalajs-nodejs</url>
7+
<licenses>
8+
<license>
9+
<name>MIT License</name>
10+
<url>http://www.opensource.org/licenses/mit-license.php</url>
11+
</license>
12+
</licenses>
13+
<scm>
14+
<connection>scm:git:github.com/ldaniels528/scalajs-nodejs.git</connection>
15+
<developerConnection>scm:git:git@github.com:ldaniels528/scalajs-nodejs.git</developerConnection>
16+
<url>github.com/ldaniels528/scalajs-nodejs.git</url>
17+
</scm>
18+
<developers>
19+
<developer>
20+
<id>ldaniels528</id>
21+
<name>Lawrence Daniels</name>
22+
<email>lawrence.daniels@gmail.com</email>
23+
<organization>com.github.ldaniels528</organization>
24+
<organizationUrl>https://github.com/ldaniels528</organizationUrl>
25+
<roles>
26+
<role>Project-Administrator</role>
27+
<role>Developer</role>
28+
</roles>
29+
<timezone>+7</timezone>
30+
</developer>
31+
</developers>
32+
}

0 commit comments

Comments
 (0)