Skip to content

Commit ce90db5

Browse files
committed
Updated to Scala 2.12.10
1 parent 335f694 commit ce90db5

27 files changed

Lines changed: 539 additions & 500 deletions

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
language: scala
22
scala:
3-
- 2.11.11
3+
- 2.12.10
44
jdk:
5-
- oraclejdk8
5+
- openjdk8
66
script:
77
- sbt test
88

build.sbt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
val scalaExercisesV = "0.4.0-SNAPSHOT"
1+
import ProjectPlugin.autoImport._
2+
val scalaExercisesV = "0.5.0-SNAPSHOT"
23

34
def dep(artifactId: String) = "org.scala-exercises" %% artifactId % scalaExercisesV
45

@@ -9,11 +10,13 @@ lazy val doobie = (project in file("."))
910
libraryDependencies ++= Seq(
1011
dep("exercise-compiler"),
1112
dep("definitions"),
12-
%%("doobie-core"),
13-
%%("doobie-h2"),
14-
%%("scalatest"),
15-
%%("scalacheck"),
16-
%%("scheckShapeless")
13+
%%("doobie-core", V.doobie),
14+
%%("doobie-h2", V.doobie),
15+
%%("cats-core", V.cats),
16+
%%("shapeless", V.shapeless),
17+
%%("scalatest", V.scalatest),
18+
%%("scalacheck", V.scalacheck),
19+
"com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % V.scalacheckShapeless
1720
)
1821
)
1922

project/ProjectPlugin.scala

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import de.heikoseeberger.sbtheader.HeaderPattern
1+
import de.heikoseeberger.sbtheader.License._
22
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
33
import sbt.Keys._
44
import sbt._
@@ -12,6 +12,21 @@ object ProjectPlugin extends AutoPlugin {
1212

1313
override def requires: Plugins = plugins.JvmPlugin && OrgPoliciesPlugin
1414

15+
object autoImport {
16+
17+
lazy val V = new {
18+
val scala212: String = "2.12.10"
19+
val doobie: String = "0.8.6"
20+
val cats: String = "2.0.0"
21+
val shapeless: String = "2.3.3"
22+
val scalatest: String = "3.0.8"
23+
val scalacheck: String = "1.14.2"
24+
val scalacheckShapeless: String = "1.2.3"
25+
}
26+
}
27+
28+
import autoImport._
29+
1530
override def projectSettings: Seq[Def.Setting[_]] =
1631
Seq(
1732
description := "Scala Exercises: The path to enlightenment",
@@ -25,23 +40,17 @@ object ProjectPlugin extends AutoPlugin {
2540
organizationEmail = "hello@47deg.com"
2641
),
2742
orgLicenseSetting := ApacheLicense,
28-
scalaVersion := "2.11.11",
43+
scalaVersion := V.scala212,
2944
scalaOrganization := "org.scala-lang",
30-
crossScalaVersions := Seq("2.11.11"),
3145
resolvers ++= Seq(
3246
Resolver.mavenLocal,
3347
Resolver.sonatypeRepo("snapshots"),
3448
Resolver.sonatypeRepo("releases")
3549
),
3650
scalacOptions := sbtorgpolicies.model.scalacCommonOptions,
37-
headers := Map(
38-
"scala" -> (HeaderPattern.cStyleBlockComment,
39-
s"""|/*
40-
| * scala-exercises - ${name.value}
41-
| * Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
42-
| */
43-
|
44-
|""".stripMargin)
45-
)
51+
headerLicense := Some(Custom(s"""| scala-exercises - ${name.value}
52+
| Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
53+
|
54+
|""".stripMargin))
4655
)
4756
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.13
1+
sbt.version=1.2.8

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ resolvers ++= Seq(
22
Resolver.sonatypeRepo("snapshots")
33
)
44

5-
addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.4.0-SNAPSHOT", "0.13", "2.10")
6-
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.5.13")
5+
addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.5.0-SNAPSHOT")
6+
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.12.0-M3")

src/main/scala/doobie/ConnectingToDatabaseSection.scala

Lines changed: 0 additions & 105 deletions
This file was deleted.

src/main/scala/doobie/DoobieUtils.scala

Lines changed: 0 additions & 68 deletions
This file was deleted.

src/main/scala/doobie/UpdatesSectionHelpers.scala

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)