Skip to content

Commit cf82028

Browse files
committed
updates version, adds travis build configuration
1 parent 7f80b90 commit cf82028

File tree

3 files changed

+49
-2
lines changed

3 files changed

+49
-2
lines changed

.travis.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
language: scala
2+
dist: trusty
3+
sudo: false
4+
scala:
5+
- 2.12.4
6+
jdk:
7+
- openjdk8
8+
9+
cache:
10+
directories:
11+
- $HOME/.ivy2/cache
12+
- $HOME/.sbt/boot/scala-$TRAVIS_SCALA_VERSION
13+
14+
branches:
15+
only:
16+
- master
17+
- testing
18+
- dev
19+
20+
env:
21+
global:
22+
- AWS_DEFAULT_REGION=eu-west-1
23+
24+
install:
25+
- pip install --user awscli
26+
- export PATH=$PATH:$HOME/.local/bin
27+
28+
script:
29+
- sbt clean
30+
- sbt ++$TRAVIS_SCALA_VERSION compile
31+
- sbt ++$TRAVIS_SCALA_VERSION test:compile
32+
- sbt ++$TRAVIS_SCALA_VERSION "project hat" coverage test -Dconfig.file=hat/conf/application.test.conf
33+
34+
after_success:
35+
- find $HOME/.sbt -name "*.lock" | xargs rm
36+
- find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm
37+
- |
38+
if [[ "$TRAVIS_PULL_REQUEST" = "false" || -z "$RUMPEL" ]]; then
39+
sbt coverageReport
40+
fi
41+
42+
deploy:
43+
- provider: script
44+
script:
45+
- sbt publish
46+
skip_cleanup: true

project/BuildSettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ object BasicSettings extends AutoPlugin {
1818

1919
override def projectSettings = Seq(
2020
organization := "org.hatdex",
21-
version := "0.0.5-SNAPSHOT",
21+
version := "0.0.7",
2222
resolvers ++= Dependencies.resolvers,
2323
scalaVersion := Dependencies.Versions.scalaVersion,
2424
crossScalaVersions := Dependencies.Versions.crossScala,

sbt-slick-postgres-generator/src/main/scala/org/hatdex/libs/dal/SlickCodeGeneratorPlugin.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ object SlickCodeGeneratorPlugin extends AutoPlugin {
3232
val codegenClassName = settingKey[String]("Class name for the generated DAL file")
3333
val codegenExcludedTables = settingKey[Seq[String]]("List of tables excluded from generating code for")
3434
val codegenDatabase = settingKey[String]("Live database from which structures are retrieved")
35+
val codegenConfig = settingKey[String]("Configuration to use for the code generator")
3536

3637
// default values for the tasks and settings
3738
lazy val codegenSettings: Seq[Def.Setting[_]] = Seq(
3839
gentables := {
3940
Generator(
40-
ConfigFactory.load(ConfigFactory.parseFile((resourceDirectory in Compile).value / "application.conf")), // puts reference.conf underneath,
41+
ConfigFactory.load(ConfigFactory.parseFile((resourceDirectory in Compile).value / (codegenConfig in gentables).value)), // puts reference.conf underneath,
4142
(codegenOutputDir in gentables).value,
4243
(codegenPackageName in gentables).value,
4344
(codegenClassName in gentables).value,

0 commit comments

Comments
 (0)