Skip to content

Updated dependencies and Scala version #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dist: xenial
language: scala
scala:
- 2.11.12
- 2.12.10
jdk:
- openjdk8
script:
Expand Down
29 changes: 15 additions & 14 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
val scalaExercisesV = "0.4.0-SNAPSHOT"
val scalaExercisesV = "0.5.0-SNAPSHOT"

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

lazy val stdlib = (project in file("."))
.enablePlugins(ExerciseCompilerPlugin)
.settings(
name := "exercises-stdlib",
libraryDependencies ++= Seq(
dep("exercise-compiler"),
dep("definitions"),
%%("shapeless"),
%%("scalatest"),
%%("scalacheck"),
%%("scheckShapeless")
.enablePlugins(ExerciseCompilerPlugin)
.settings(
name := "exercises-stdlib",
libraryDependencies ++= Seq(
dep("exercise-compiler"),
dep("definitions"),
%%("shapeless"),
%%("scalatest"),
%%("scalacheck"),
%%("scheckShapeless")
)
)
)

// Distribution

pgpPassphrase := Some(getEnvVar("PGP_PASSPHRASE").getOrElse("").toCharArray)
pgpPublicRing := file(s"$gpgFolder/pubring.gpg")
pgpSecretRing := file(s"$gpgFolder/secring.gpg")
pgpSecretRing := file(s"$gpgFolder/secring.gpg")
22 changes: 8 additions & 14 deletions project/ProjectPlugin.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import de.heikoseeberger.sbtheader.HeaderPattern
//import de.heikoseeberger.sbtheader.HeaderPattern
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
import de.heikoseeberger.sbtheader.License._
import sbt.Keys._
import sbt._
import sbtorgpolicies._
Expand All @@ -15,13 +16,12 @@ object ProjectPlugin extends AutoPlugin {
object autoImport {

lazy val V = new {
val scala211: String = "2.11.12"
val scala212: String = "2.12.10"
}
}

import autoImport._


override def projectSettings: Seq[Def.Setting[_]] =
Seq(
description := "Scala Exercises: The path to enlightenment",
Expand All @@ -35,23 +35,17 @@ object ProjectPlugin extends AutoPlugin {
organizationEmail = "hello@47deg.com"
),
orgLicenseSetting := ApacheLicense,
scalaVersion := V.scala211,
scalaVersion := V.scala212,
scalaOrganization := "org.scala-lang",
crossScalaVersions := Seq(V.scala211),
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-2016 47 Degrees, LLC. <http://www.47deg.com>
|
|""".stripMargin))
)
}
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.15
sbt.version=1.2.8
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/Asserts.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/ByNameParameter.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/CaseClasses.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/Classes.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/EmptyValues.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/Enumerations.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/Extractors.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/ForExpressions.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/Formatting.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/HigherOrderFunctions.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/Implicits.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/InfixPrefixandPostfixOperators.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/InfixTypes.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/Iterables.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/Lists.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/LiteralBooleans.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/LiteralNumbers.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/LiteralStrings.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/Maps.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/NamedandDefaultArguments.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/NamedandDefaultArgumentsHelper.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/Objects.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/Options.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/OptionsHelper.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/stdlib/ParentClasses.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand Down
10 changes: 4 additions & 6 deletions src/main/scala/stdlib/PartialFunctions.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
* scala-exercises - exercises-stdlib
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package stdlib
Expand All @@ -10,10 +11,7 @@ import org.scalatest._
/** @param name partial_functions
*
*/
object PartialFunctions
extends FlatSpec
with Matchers
with org.scalaexercises.definitions.Section {
object PartialFunctions extends FlatSpec with Matchers with org.scalaexercises.definitions.Section {

/** A partial function is a `trait` that when implemented can be used as building blocks to determine a solution. The trait `PartialFunction` requires that the method `isDefinedAt` and `apply` be implemented:
*/
Expand Down
Loading