Skip to content
Permalink
Browse files

Updated to Scala 2.12.10

  • Loading branch information
kiroco12 committed Nov 25, 2019
1 parent 335f694 commit ce90db584c610fb74d265185809aa5e72094f8e1
Showing with 539 additions and 500 deletions.
  1. +2 −2 .travis.yml
  2. +9 −6 build.sbt
  3. +21 −12 project/ProjectPlugin.scala
  4. +1 −1 project/build.properties
  5. +2 −2 project/plugins.sbt
  6. +0 −105 src/main/scala/doobie/ConnectingToDatabaseSection.scala
  7. +0 −68 src/main/scala/doobie/DoobieUtils.scala
  8. +0 −24 src/main/scala/doobie/UpdatesSectionHelpers.scala
  9. +143 −0 src/main/scala/doobie_lib/ConnectingToDatabaseSection.scala
  10. +4 −3 src/main/scala/{doobie → doobie_lib}/DoobieLibrary.scala
  11. +72 −0 src/main/scala/doobie_lib/DoobieUtils.scala
  12. +60 −49 src/main/scala/{doobie → doobie_lib}/ErrorHandlingSection.scala
  13. +6 −5 src/main/scala/{doobie → doobie_lib}/ErrorHandlingSectionHelpers.scala
  14. +4 −3 src/main/scala/{doobie → doobie_lib}/Model.scala
  15. +39 −38 src/main/scala/{doobie → doobie_lib}/MultiColumnQueriesSection.scala
  16. +26 −37 src/main/scala/{doobie → doobie_lib}/ParameterizedQueriesSection.scala
  17. +8 −6 src/main/scala/{doobie → doobie_lib}/ParameterizedQueryHelpers.scala
  18. +34 −48 src/main/scala/{doobie → doobie_lib}/SelectingDataSection.scala
  19. +34 −42 src/main/scala/{doobie → doobie_lib}/UpdatesSection.scala
  20. +20 −0 src/main/scala/doobie_lib/UpdatesSectionHelpers.scala
  21. +8 −7 src/test/scala/{doobie → doobie_lib}/ConnectingToDatabaseSectionSpec.scala
  22. +11 −12 src/test/scala/{doobie → doobie_lib}/ErrorHandlingSectionSpec.scala
  23. +9 −8 src/test/scala/{doobie → doobie_lib}/MultiColumnQueriesSectionSpec.scala
  24. +8 −7 src/test/scala/{doobie → doobie_lib}/ParameterizedQueriesSectionSpec.scala
  25. +9 −7 src/test/scala/{doobie → doobie_lib}/SelectingDataSectionSpec.scala
  26. +8 −7 src/test/scala/{doobie → doobie_lib}/UpdatesSectionSpec.scala
  27. +1 −1 version.sbt
@@ -1,8 +1,8 @@
language: scala
scala:
- 2.11.11
- 2.12.10
jdk:
- oraclejdk8
- openjdk8
script:
- sbt test

@@ -1,4 +1,5 @@
val scalaExercisesV = "0.4.0-SNAPSHOT"
import ProjectPlugin.autoImport._
val scalaExercisesV = "0.5.0-SNAPSHOT"

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

@@ -9,11 +10,13 @@ lazy val doobie = (project in file("."))
libraryDependencies ++= Seq(
dep("exercise-compiler"),
dep("definitions"),
%%("doobie-core"),
%%("doobie-h2"),
%%("scalatest"),
%%("scalacheck"),
%%("scheckShapeless")
%%("doobie-core", V.doobie),
%%("doobie-h2", V.doobie),
%%("cats-core", V.cats),
%%("shapeless", V.shapeless),
%%("scalatest", V.scalatest),
%%("scalacheck", V.scalacheck),
"com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % V.scalacheckShapeless
)
)

@@ -1,4 +1,4 @@
import de.heikoseeberger.sbtheader.HeaderPattern
import de.heikoseeberger.sbtheader.License._
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
import sbt.Keys._
import sbt._
@@ -12,6 +12,21 @@ object ProjectPlugin extends AutoPlugin {

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

object autoImport {

lazy val V = new {
val scala212: String = "2.12.10"
val doobie: String = "0.8.6"
val cats: String = "2.0.0"
val shapeless: String = "2.3.3"
val scalatest: String = "3.0.8"
val scalacheck: String = "1.14.2"
val scalacheckShapeless: String = "1.2.3"
}
}

import autoImport._

override def projectSettings: Seq[Def.Setting[_]] =
Seq(
description := "Scala Exercises: The path to enlightenment",
@@ -25,23 +40,17 @@ object ProjectPlugin extends AutoPlugin {
organizationEmail = "hello@47deg.com"
),
orgLicenseSetting := ApacheLicense,
scalaVersion := "2.11.11",
scalaVersion := V.scala212,
scalaOrganization := "org.scala-lang",
crossScalaVersions := Seq("2.11.11"),
resolvers ++= Seq(
Resolver.mavenLocal,
Resolver.sonatypeRepo("snapshots"),
Resolver.sonatypeRepo("releases")
),
scalacOptions := sbtorgpolicies.model.scalacCommonOptions,
headers := Map(
"scala" -> (HeaderPattern.cStyleBlockComment,
s"""|/*
| * scala-exercises - ${name.value}
| * Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
| */
|
|""".stripMargin)
)
headerLicense := Some(Custom(s"""| scala-exercises - ${name.value}
| Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
|
|""".stripMargin))
)
}
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=1.2.8
@@ -2,5 +2,5 @@ resolvers ++= Seq(
Resolver.sonatypeRepo("snapshots")
)

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

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit ce90db5

Please sign in to comment.
You can’t perform that action at this time.