Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating psql/scala 2.12 support #53

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: scala
scala:
- 2.10.0
- 2.12.8

#once develop is fixed we can turn this on
branches:
Expand Down
44 changes: 7 additions & 37 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,27 @@ name := "dataexpress"

homepage := Some(url("http://dataexpress.research.chop.edu/"))

val v = "0.9.2"
val v = "0.9.3"

version := v

organization := "edu.chop.research"
scalaVersion := "2.12.8"

scalaVersion := "2.11.7"
useGpg := true

licenses := Seq("BSD-style" -> url("http://www.opensource.org/licenses/bsd-license.php"))

assemblyJarName in assembly := s"DataExpress_${v}_standalone.jar"

test in assembly := {}

assembleArtifact in packageScala := false
assembleArtifact in assemblyPackageScala := false

//compile dependencies------------------------------

libraryDependencies ++= Seq(
"org.xerial" % "sqlite-jdbc" % "3.7.2",
"postgresql" % "postgresql" % "9.0-801.jdbc4",
"mysql" % "mysql-connector-java" % "5.1.21"
"org.xerial" % "sqlite-jdbc" % "3.28.0",
"mysql" % "mysql-connector-java" % "8.0.16"
)


Expand All @@ -39,7 +38,7 @@ parallelExecution in Test := false

libraryDependencies ++= {
val deps = Seq(
"org.scalatest" %% "scalatest" % "2.2.4",
"org.scalatest" %% "scalatest" % "3.0.8",
"junit" % "junit" % "4.8.1"
)
deps map {v => v % "test"}
Expand All @@ -49,35 +48,6 @@ libraryDependencies ++= {

scalacOptions +="-language:dynamics"


//Publishing options---------------------------

publishMavenStyle := true

publishTo <<= version { (v: String) =>
val nexus = "https://oss.sonatype.org/"
if (v.trim.endsWith("SNAPSHOT"))
Some("snapshots" at nexus + "content/repositories/snapshots")
else
Some("releases" at nexus + "service/local/staging/deploy/maven2")
}

publishArtifact in Test := false

pomIncludeRepository := { _ => false }

pomExtra := (
<scm>
<url>[email protected]:cbmi/dataexpress.git</url>
<connection>scm:git:[email protected]:cbmi/dataexpress.git</connection>
</scm>
<developers>
<developer>
<id>mitalia</id>
<name>Michael Italia</name>
</developer>
</developers>)

//console imports------------------------------

initialCommands in console := """import edu.chop.cbmi.dataExpress.dsl.ETL
Expand Down
3 changes: 2 additions & 1 deletion project/assembly.sbt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.7")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
1 change: 1 addition & 0 deletions project/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sbt.version=1.2.8
38 changes: 38 additions & 0 deletions publish.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
ThisBuild / organization := "edu.chop.research.dbhi"
ThisBuild / organizationName := "chop"
ThisBuild / organizationHomepage := Some(url("https://www.chop.edu/"))

ThisBuild / scmInfo := Some(
ScmInfo(
url("https://github.com/chop-dbhi/dataexpress"),
"scm:[email protected]:chop-dbhi/dataexpress.git"
)
)
ThisBuild / developers := List(
Developer(
id = "masinoa",
name = "Aaron Masino",
email = "[email protected]",
url = url("https://www.chop.edu/")

),
Developer(
id = "dcam2015",
name = "Diego Campos",
email = "[email protected]",
url = url("https://www.chop.edu/")
)
)

ThisBuild / description := "DataExpress is a simple, Scala-based cross database ETL toolkit supporting Postgres, MySql, Oracle, SQLServer, and Sqlite."
ThisBuild / licenses := Seq("BSD-style" -> new URL("http://www.opensource.org/licenses/bsd-license.php"))
ThisBuild / homepage := Some(url("http://dataexpress.research.chop.edu/"))

// Remove all additional repository other than Maven Central from POM
ThisBuild / pomIncludeRepository := { _ => false }
ThisBuild / publishTo := {
val nexus = "https://oss.sonatype.org/"
if (isSnapshot.value) Some("snapshots" at nexus + "content/repositories/snapshots")
else Some("releases" at nexus + "service/local/staging/deploy/maven2")
}
ThisBuild / publishMavenStyle := true