Skip to content

Commit

Permalink
Fixed publish configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
gakuzzzz committed Jan 23, 2017
1 parent 176f90f commit 2c6b9ee
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
15 changes: 13 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import scala.xml.NodeSeq

val commonSettings = Seq(
version := "5.0",
organization := "jp.t2v",
Expand Down Expand Up @@ -41,9 +43,12 @@ val commonSettings = Seq(

lazy val root = (project in file(".")).aggregate(core, joda).settings(
crossScalaVersions := Seq("2.12.1"),
publishMavenStyle := true,
publish := { },
publishArtifact := false,
packagedArtifacts := Map.empty
packagedArtifacts := Map.empty,
publishTo := Some("snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"),
pomExtra := NodeSeq.Empty
)

lazy val core = (project in file("core")).settings(commonSettings).settings(
Expand All @@ -57,7 +62,13 @@ lazy val joda = (project in file("joda")).settings(commonSettings).settings(
name := "holidays-joda",
libraryDependencies ++= Seq(
"joda-time" % "joda-time" % "2.9.7"
)
),
publishMavenStyle := true,
publish := { },
publishArtifact := false,
packagedArtifacts := Map.empty,
publishTo := Some("snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"),
pomExtra := NodeSeq.Empty
).dependsOn(core)


Expand Down
3 changes: 1 addition & 2 deletions core/src/main/scala/jp/t2v/util/locale/Holidays.scala
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,7 @@ object Holidays extends (LocalDate => Option[String]) {
}
}
def substitute(d: LocalDate): Option[String] = {
if ((d is MONDAY) && (d >= 振替休日施行) && holidayName(d.minusDays(1)).isDefined) Some("振替休日")
else None
((d is MONDAY) && (d >= 振替休日施行) && holidayName(d.minusDays(1)).isDefined) opt "振替休日"
}
holidayName(target) orElse substitute(target)
}
Expand Down

0 comments on commit 2c6b9ee

Please sign in to comment.