From 3baa946f9463f980bed7e0cf89afc9e8bfc8bd61 Mon Sep 17 00:00:00 2001 From: scalahub <23208922+scalahub@users.noreply.github.com> Date: Fri, 27 May 2022 22:41:01 +0530 Subject: [PATCH] Update version to 1.0 for release --- build.sbt | 37 +++++++++++++++++++++++-------------- publish.sbt | 4 +++- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/build.sbt b/build.sbt index b3b5d36..3322d3b 100644 --- a/build.sbt +++ b/build.sbt @@ -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" @@ -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" + ) +} diff --git a/publish.sbt b/publish.sbt index 5e207dc..f5d6071 100644 --- a/publish.sbt +++ b/publish.sbt @@ -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