Skip to content

Commit

Permalink
Update versions (#13)
Browse files Browse the repository at this point in the history
* - Update SBT version
- Update SBT-JavaCPP version
- Update SBT syntax

* Fix scripted.sbt syntax
  • Loading branch information
lloydmeta authored Nov 19, 2016
1 parent 3c38055 commit e153e1d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ pomIncludeRepository := { _ => false }

scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature", "-Xlint", "-Xlog-free-terms")

publishTo <<= version { v: String =>
publishTo := {
val nexus = "https://oss.sonatype.org/"
if (v.trim.endsWith("SNAPSHOT"))
if (version.value.trim.endsWith("SNAPSHOT"))
Some("snapshots" at nexus + "content/repositories/snapshots")
else
Some("releases" at nexus + "service/local/staging/deploy/maven2")
Expand Down Expand Up @@ -49,4 +49,4 @@ resolvers ++= Seq(
Resolver.sonatypeRepo("snapshots")
)

addSbtPlugin("org.bytedeco" % "sbt-javacpp" % "1.8")
addSbtPlugin("org.bytedeco" % "sbt-javacpp" % "1.9")
5 changes: 1 addition & 4 deletions project/build.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#Activator-generated Properties
#Mon Feb 22 20:41:33 JST 2016
template.uuid=e17acfbb-1ff5-41f5-b8cf-2c40be6a8340
sbt.version=0.13.12
sbt.version=0.13.13
4 changes: 2 additions & 2 deletions project/scripted.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
libraryDependencies <+= (sbtVersion) { sv =>
"org.scala-sbt" % "scripted-plugin" % sv
libraryDependencies += {
"org.scala-sbt" % "scripted-plugin" % sbtVersion.value
}
4 changes: 2 additions & 2 deletions src/main/scala/org/bytedeco/sbt/javacv/Plugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ object Plugin extends AutoPlugin {
import autoImport._
Seq(
javaCVVersion := Versions.javaCVVersion,
libraryDependencies <+= javaCVVersion { resolvedJavaCVVersion =>
"org.bytedeco" % "javacv" % resolvedJavaCVVersion excludeAll (
libraryDependencies += {
"org.bytedeco" % "javacv" % javaCVVersion.value excludeAll (
ExclusionRule(organization = "org.bytedeco.javacpp-presets"),
ExclusionRule(organization = "org.bytedeco.javacpp")
)
Expand Down

0 comments on commit e153e1d

Please sign in to comment.