diff --git a/.gitignore b/.gitignore index ad1141e..b67986d 100644 --- a/.gitignore +++ b/.gitignore @@ -168,5 +168,7 @@ Session.vim tags # End of https://www.gitignore.io/api/git,vim,macos,emacs,intellij+all +.bsp/sbt.json + target/ **/target/ \ No newline at end of file diff --git a/README.md b/README.md index cd2344c..5518434 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Currently only SGTIN-96 and a custom Nike display tag format (XNDT) are supporte ### SBT ``` scala -resolvers in ThisBuild += "oss-nike" at "https://dl.bintray.com/nike/maven" +resolvers in ThisBuild += "nike-oss" at "https://artifactory.nike.com/artifactory/maven" libraryDependencies += "com.nike.epc" % "epc-core" % "1.0.0" ``` @@ -31,11 +31,11 @@ libraryDependencies += "com.nike.epc" % "epc-core" % "1.0.0" ``` groovy repositories { maven { - url 'https://dl.bintray.com/nike/maven' + url 'https://artifactory.nike.com/artifactory/maven' } } -compile group: 'com.nike.epc', name: 'epc-core', version: '1.0.0' +compile group: 'com.nike.epc', name: 'epc-core', version: '1.0.0', ext: 'pom' ``` ### Maven @@ -44,13 +44,14 @@ compile group: 'com.nike.epc', name: 'epc-core', version: '1.0.0' nike-oss Nike OSS - https://dl.bintray.com/nike/maven + https://artifactory.nike.com/artifactory/maven com.nike.epc epc-core 1.0.0 + pom ``` diff --git a/build.sbt b/build.sbt index 4635c5f..0a63c83 100644 --- a/build.sbt +++ b/build.sbt @@ -20,25 +20,24 @@ startYear in ThisBuild := Some(2018) description in ThisBuild := "A library for working with standards from the EPC extension to the GS1 standard" crossPaths in ThisBuild := false -bintrayOrganization in ThisBuild := Some("nike") -bintrayRepository in ThisBuild := "maven" -bintrayPackage in ThisBuild := "epc-standards" - -version in ThisBuild := sys.env.get("TRAVIS_TAG").filter(_.trim.nonEmpty).getOrElse("0-SNAPSHOT") +publishTo in ThisBuild := { + val repo = "https://artifactory.nike.com/artifactory/maven" + if (isSnapshot.value) { + Some("snapshots" at s"$repo-snapshots") + } else { + Some("releases" at repo) + } +} +credentials in ThisBuild += Credentials(Path.userHome / ".ivy2" / ".credentials") lazy val ci = TaskKey[Unit]("ci") lazy val `epc-standards` = (project in file(".")) .settings( + publishArtifact := false, ci := Def.taskDyn { - if (version.value.endsWith("-SNAPSHOT")) { - Def.task { - (`epc-core` / (jacoco in Test)).value - } - } else { - Def.task { - (`epc-core` / publish).dependsOn((`epc-core` / (jacoco in Test))).value - } + Def.task { + (`epc-core` / publish).dependsOn((`epc-core` / (jacoco in Test))).value } }.value ) diff --git a/project/build.properties b/project/build.properties index 7c58a83..0b2e09c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.6 +sbt.version=1.4.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index 887ef85..87ab690 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ resolvers += Resolver.jcenterRepo -addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.0.3") +addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.3.0") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15") addSbtPlugin("net.aichler" % "sbt-jupiter-interface" % "0.7.0") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.4.1") -addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4") diff --git a/version.sbt b/version.sbt new file mode 100644 index 0000000..2d362f1 --- /dev/null +++ b/version.sbt @@ -0,0 +1 @@ +ThisBuild / version := "1.0.2-SNAPSHOT"