Skip to content

Commit 7351792

Browse files
committed
Setup sbt-bintray
1 parent 6bbc4d1 commit 7351792

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

build.sbt

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ git.useGitDescribe := true
44

55
scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
66

7-
scalacOptions ++= {
8-
val Seq(_, major, minor) = (scalaVersion in ThisBuild).value.split("\\.").toSeq.map(_.toInt)
9-
if (major <= 10 || (major == 11 && minor < 5)) Seq.empty
10-
else Seq("-Ypatmat-exhaust-depth", "40")
11-
}
12-
137
javaOptions in IntegrationTest ++= Seq("-Xss128M")
148

159
fork in IntegrationTest := true
@@ -27,32 +21,30 @@ lazy val commonSettings = Seq(
2721
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.8", "2.13.0")
2822
)
2923

24+
lazy val publishSettings = Seq(
25+
bintrayOrganization := Some("epfl-lara"),
26+
bintrayRepository := "maven",
27+
)
28+
3029
lazy val root = (project in file(".")).
3130
configs(IntegrationTest).
3231
settings(commonSettings: _*).
32+
settings(publishSettings: _*).
3333
settings(Defaults.itSettings: _*)
3434

3535
publishMavenStyle := true
3636

3737
publishArtifact in Test := false
3838

39-
publishTo := {
40-
val nexus = "https://oss.sonatype.org/"
41-
if(version.value.trim.endsWith("SNAPSHOT"))
42-
Some("snapshots" at nexus + "content/repositories/snapshots")
43-
else
44-
Some("releases" at nexus + "service/local/staging/deploy/maven2")
45-
}
46-
4739
pomIncludeRepository := { _ => false }
4840

4941
licenses := Seq("MIT-style" -> url("https://opensource.org/licenses/MIT"))
5042

5143
pomExtra := (
52-
<url>https://github.com/regb/scala-smtlib</url>
44+
<url>https://github.com/epfl-lara/scala-smtlib</url>
5345
<scm>
54-
<url>git@github.com:regb/scala-smtlib.git</url>
55-
<connection>scm:git:git@github.com:regb/scala-smtlib.git</connection>
46+
<url>git@github.com:epfl-lara/scala-smtlib.git</url>
47+
<connection>scm:git:git@github.com:epfl-lara/scala-smtlib.git</connection>
5648
</scm>
5749
<developers>
5850
<developer>

project/plugins.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
22

33
// avoids warning from sbt-git, see https://github.com/sbt/sbt-git#known-issues
44
libraryDependencies += "org.slf4j" % "slf4j-nop" % "1.7.21"
5+
6+
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4")

src/it/scala/smtlib/it/TestHelpers.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ trait TestHelpers {
2626
private val resourceDirHard = "src/it/resources/"
2727

2828
def filesInResourceDir(dir : String, filter : String=>Boolean = all) : Iterable[File] = {
29-
import scala.collection.JavaConversions._
3029
val d = this.getClass.getClassLoader.getResource(dir)
3130

3231
val asFile = if(d == null || d.getProtocol != "file") {

0 commit comments

Comments
 (0)