Skip to content

Commit

Permalink
Update version to 1.0 for release
Browse files Browse the repository at this point in the history
  • Loading branch information
scalahub committed May 27, 2022
1 parent b9a2ed1 commit 3baa946
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 15 deletions.
37 changes: 23 additions & 14 deletions build.sbt
Expand Up @@ -2,9 +2,10 @@ name := "ScalaDB"

scalaVersion := "2.12.10"

resolvers += "SonaType Snapshots s01" at "https://s01.oss.sonatype.org/content/repositories/snapshots/"
//resolvers += "SonaType Snapshots s01" at "https://s01.oss.sonatype.org/content/repositories/snapshots/"
resolvers += "SonaType" at "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"

libraryDependencies += "io.github.scalahub" %% "scalautils" % "0.1.0-SNAPSHOT"
libraryDependencies += "io.github.scalahub" %% "scalautils" % "1.0"

libraryDependencies += "net.snaq" % "dbpool" % "7.0.1"

Expand All @@ -13,16 +14,24 @@ libraryDependencies += "org.bouncycastle" % "bcprov-jdk15on" % "1.61"
libraryDependencies += "com.h2database" % "h2" % "1.4.199"

initialize := {
/** Java specification version compatibility rule. */
object CompatibleJavaVersion extends VersionNumberCompatibility {
def name = "Java specification compatibility"
def isCompatible(current: VersionNumber, required: VersionNumber) =
current.numbers.zip(required.numbers).foldRight(required.numbers.size<=current.numbers.size)((a,b) => (a._1 > a._2) || (a._1==a._2 && b))
def apply(current: VersionNumber, required: VersionNumber) = isCompatible(current, required)
}
val _ = initialize.value // run the previous initialization
val required = VersionNumber("1.8")
val curr = VersionNumber(sys.props("java.specification.version"))
assert(CompatibleJavaVersion(curr, required), s"Java $required or above required. Currently $curr")
}

/** Java specification version compatibility rule. */
object CompatibleJavaVersion extends VersionNumberCompatibility {
def name = "Java specification compatibility"
def isCompatible(current: VersionNumber, required: VersionNumber) =
current.numbers
.zip(required.numbers)
.foldRight(required.numbers.size <= current.numbers.size)((a, b) =>
(a._1 > a._2) || (a._1 == a._2 && b)
)
def apply(current: VersionNumber, required: VersionNumber) =
isCompatible(current, required)
}
val _ = initialize.value // run the previous initialization
val required = VersionNumber("1.8")
val curr = VersionNumber(sys.props("java.specification.version"))
assert(
CompatibleJavaVersion(curr, required),
s"Java $required or above required. Currently $curr"
)
}
4 changes: 3 additions & 1 deletion publish.sbt
Expand Up @@ -29,7 +29,9 @@ ThisBuild / pomIncludeRepository := { _ => false }

ThisBuild / publishTo := {
val nexus = "https://s01.oss.sonatype.org/"
Some("snapshots" at nexus + "content/repositories/snapshots")
if (isSnapshot.value)
Some("snapshots" at nexus + "content/repositories/snapshots")
else Some("releases" at nexus + "service/local/staging/deploy/maven2")
}

ThisBuild / publishMavenStyle := true
Expand Down

0 comments on commit 3baa946

Please sign in to comment.