diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4407f47abba2fa473ccd01c25183c35c8e2e52bb..77bdae4f61bc7d2e3e804667706d6096ab6f5ff8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ build_sbt_tapasco_ubuntu_16_04: - apt-get -y update && apt-get -y install unzip git zip findutils curl - curl -s "https://get.sdkman.io" | bash - source "/root/.sdkman/bin/sdkman-init.sh" - - sdk install java 9.0.7-zulu + - sdk install java - sdk install sbt - sbt version - source setup.sh @@ -33,7 +33,7 @@ build_sbt_tapasco_ubuntu_18_04: - apt-get -y update && apt-get -y install unzip git zip findutils curl - curl -s "https://get.sdkman.io" | bash - source "/root/.sdkman/bin/sdkman-init.sh" - - sdk install java 9.0.7-zulu + - sdk install java - sdk install sbt - sbt version - source setup.sh @@ -49,7 +49,7 @@ build_sbt_tapasco_fedora_27: - dnf -y install which unzip git zip findutils - curl -s "https://get.sdkman.io" | bash - source "/root/.sdkman/bin/sdkman-init.sh" - - sdk install java 9.0.7-zulu + - sdk install java - sdk install sbt - sbt version - source setup.sh @@ -65,7 +65,7 @@ build_sbt_tapasco_fedora_28: - dnf -y install which unzip git zip findutils - curl -s "https://get.sdkman.io" | bash - source "/root/.sdkman/bin/sdkman-init.sh" - - sdk install java 9.0.7-zulu + - sdk install java - sdk install sbt - sbt version - source setup.sh diff --git a/build.sbt b/build.sbt index b662aca124213147c44b2b935cf7c056b8bb458b..ad62d7bb4d0c66a3469fdd353d06abcb4db548d8 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ version := tapascoVersion name := "Tapasco" -scalaVersion := "2.12.4" +scalaVersion := "2.12.7" libraryDependencies ++= Seq( "org.scala-lang" % "scala-compiler" % scalaVersion.value,