Skip to content

Commit e197c33

Browse files
kiroco12kiroco12
authored
Merge pull request #151 from scala-exercises/enrique-2-12-10-update
Updated dependencies and Scala version
2 parents 13dacab + 6103324 commit e197c33

File tree

82 files changed

+260
-196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+260
-196
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dist: xenial
22
language: scala
33
scala:
4-
- 2.11.12
4+
- 2.12.10
55
jdk:
66
- openjdk8
77
script:

‎build.sbt‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1-
val scalaExercisesV = "0.4.0-SNAPSHOT"
1+
val scalaExercisesV = "0.5.0-SNAPSHOT"
22

3-
def dep(artifactId: String) = "org.scala-exercises" %% artifactId % scalaExercisesV excludeAll(ExclusionRule("io.monix"))
3+
def dep(artifactId: String) =
4+
"org.scala-exercises" %% artifactId % scalaExercisesV excludeAll (ExclusionRule("io.monix"))
45

56
lazy val stdlib = (project in file("."))
6-
.enablePlugins(ExerciseCompilerPlugin)
7-
.settings(
8-
name := "exercises-stdlib",
9-
libraryDependencies ++= Seq(
10-
dep("exercise-compiler"),
11-
dep("definitions"),
12-
%%("shapeless"),
13-
%%("scalatest"),
14-
%%("scalacheck"),
15-
%%("scheckShapeless")
7+
.enablePlugins(ExerciseCompilerPlugin)
8+
.settings(
9+
name := "exercises-stdlib",
10+
libraryDependencies ++= Seq(
11+
dep("exercise-compiler"),
12+
dep("definitions"),
13+
%%("shapeless"),
14+
%%("scalatest"),
15+
%%("scalacheck"),
16+
%%("scheckShapeless")
17+
)
1618
)
17-
)
1819

1920
// Distribution
2021

2122
pgpPassphrase := Some(getEnvVar("PGP_PASSPHRASE").getOrElse("").toCharArray)
2223
pgpPublicRing := file(s"$gpgFolder/pubring.gpg")
23-
pgpSecretRing := file(s"$gpgFolder/secring.gpg")
24+
pgpSecretRing := file(s"$gpgFolder/secring.gpg")

‎project/ProjectPlugin.scala‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import de.heikoseeberger.sbtheader.HeaderPattern
1+
//import de.heikoseeberger.sbtheader.HeaderPattern
22
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
3+
import de.heikoseeberger.sbtheader.License._
34
import sbt.Keys._
45
import sbt._
56
import sbtorgpolicies._
@@ -15,13 +16,12 @@ object ProjectPlugin extends AutoPlugin {
1516
object autoImport {
1617

1718
lazy val V = new {
18-
val scala211: String = "2.11.12"
19+
val scala212: String = "2.12.10"
1920
}
2021
}
2122

2223
import autoImport._
2324

24-
2525
override def projectSettings: Seq[Def.Setting[_]] =
2626
Seq(
2727
description := "Scala Exercises: The path to enlightenment",
@@ -35,23 +35,17 @@ object ProjectPlugin extends AutoPlugin {
3535
organizationEmail = "[email protected]"
3636
),
3737
orgLicenseSetting := ApacheLicense,
38-
scalaVersion := V.scala211,
38+
scalaVersion := V.scala212,
3939
scalaOrganization := "org.scala-lang",
40-
crossScalaVersions := Seq(V.scala211),
4140
resolvers ++= Seq(
4241
Resolver.mavenLocal,
4342
Resolver.sonatypeRepo("snapshots"),
4443
Resolver.sonatypeRepo("releases")
4544
),
4645
scalacOptions := sbtorgpolicies.model.scalacCommonOptions,
47-
headers := Map(
48-
"scala" -> (HeaderPattern.cStyleBlockComment,
49-
s"""|/*
50-
| * scala-exercises - ${name.value}
51-
| * Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
52-
| */
53-
|
54-
|""".stripMargin)
55-
)
46+
headerLicense := Some(Custom(s"""| scala-exercises - ${name.value}
47+
| Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
48+
|
49+
|""".stripMargin))
5650
)
5751
}

‎project/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.15
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/stdlib/Asserts.scala‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*
2-
* scala-exercises - exercises-stdlib
3-
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
2+
* scala-exercises - exercises-stdlib
3+
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
4+
*
45
*/
56

67
package stdlib

‎src/main/scala/stdlib/ByNameParameter.scala‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*
2-
* scala-exercises - exercises-stdlib
3-
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
2+
* scala-exercises - exercises-stdlib
3+
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
4+
*
45
*/
56

67
package stdlib

‎src/main/scala/stdlib/CaseClasses.scala‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*
2-
* scala-exercises - exercises-stdlib
3-
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
2+
* scala-exercises - exercises-stdlib
3+
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
4+
*
45
*/
56

67
package stdlib

‎src/main/scala/stdlib/Classes.scala‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*
2-
* scala-exercises - exercises-stdlib
3-
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
2+
* scala-exercises - exercises-stdlib
3+
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
4+
*
45
*/
56

67
package stdlib

‎src/main/scala/stdlib/EmptyValues.scala‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*
2-
* scala-exercises - exercises-stdlib
3-
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
2+
* scala-exercises - exercises-stdlib
3+
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
4+
*
45
*/
56

67
package stdlib

0 commit comments

Comments
 (0)