Skip to content
Permalink
Browse files

Updated dependencies and Scala version

  • Loading branch information
kiroco12 committed Oct 29, 2019
1 parent 13dacab commit 244651858edf9128353bd22262ec07c2d8354149
Showing with 259 additions and 195 deletions.
  1. +15 −14 build.sbt
  2. +8 −14 project/ProjectPlugin.scala
  3. +1 −1 project/build.properties
  4. +2 −2 project/plugins.sbt
  5. +3 −2 src/main/scala/stdlib/Asserts.scala
  6. +3 −2 src/main/scala/stdlib/ByNameParameter.scala
  7. +3 −2 src/main/scala/stdlib/CaseClasses.scala
  8. +3 −2 src/main/scala/stdlib/Classes.scala
  9. +3 −2 src/main/scala/stdlib/EmptyValues.scala
  10. +3 −2 src/main/scala/stdlib/Enumerations.scala
  11. +3 −2 src/main/scala/stdlib/Extractors.scala
  12. +3 −2 src/main/scala/stdlib/ForExpressions.scala
  13. +3 −2 src/main/scala/stdlib/Formatting.scala
  14. +3 −2 src/main/scala/stdlib/HigherOrderFunctions.scala
  15. +3 −2 src/main/scala/stdlib/Implicits.scala
  16. +3 −2 src/main/scala/stdlib/InfixPrefixandPostfixOperators.scala
  17. +3 −2 src/main/scala/stdlib/InfixTypes.scala
  18. +3 −2 src/main/scala/stdlib/Iterables.scala
  19. +3 −2 src/main/scala/stdlib/Lists.scala
  20. +3 −2 src/main/scala/stdlib/LiteralBooleans.scala
  21. +3 −2 src/main/scala/stdlib/LiteralNumbers.scala
  22. +3 −2 src/main/scala/stdlib/LiteralStrings.scala
  23. +3 −2 src/main/scala/stdlib/Maps.scala
  24. +3 −2 src/main/scala/stdlib/NamedandDefaultArguments.scala
  25. +3 −2 src/main/scala/stdlib/NamedandDefaultArgumentsHelper.scala
  26. +3 −2 src/main/scala/stdlib/Objects.scala
  27. +3 −2 src/main/scala/stdlib/Options.scala
  28. +3 −2 src/main/scala/stdlib/OptionsHelper.scala
  29. +3 −2 src/main/scala/stdlib/ParentClasses.scala
  30. +4 −6 src/main/scala/stdlib/PartialFunctions.scala
  31. +4 −8 src/main/scala/stdlib/PartiallyAppliedFunctions.scala
  32. +3 −2 src/main/scala/stdlib/PatternMatching.scala
  33. +3 −2 src/main/scala/stdlib/Ranges.scala
  34. +3 −2 src/main/scala/stdlib/RepeatedParameters.scala
  35. +3 −2 src/main/scala/stdlib/RepeatedParametersHelper.scala
  36. +3 −2 src/main/scala/stdlib/SequencesandArrays.scala
  37. +3 −2 src/main/scala/stdlib/Sets.scala
  38. +3 −2 src/main/scala/stdlib/StdLib.scala
  39. +3 −2 src/main/scala/stdlib/Traits.scala
  40. +3 −2 src/main/scala/stdlib/Traversables.scala
  41. +3 −2 src/main/scala/stdlib/Tuples.scala
  42. +3 −2 src/main/scala/stdlib/TypeSignatures.scala
  43. +3 −2 src/main/scala/stdlib/TypeVariance.scala
  44. +3 −2 src/main/scala/stdlib/TypeVarianceHelper.scala
  45. +3 −2 src/main/scala/stdlib/UniformAccessPrinciple.scala
  46. +3 −2 src/test/scala/stdlib/AssertsSpec.scala
  47. +3 −2 src/test/scala/stdlib/ByNameParameterSpec.scala
  48. +3 −2 src/test/scala/stdlib/CaseClassesSpec.scala
  49. +3 −2 src/test/scala/stdlib/ClassesSpec.scala
  50. +3 −2 src/test/scala/stdlib/EmptyValuesSpec.scala
  51. +3 −2 src/test/scala/stdlib/EnumerationsSpec.scala
  52. +3 −2 src/test/scala/stdlib/ExtractorsSpec.scala
  53. +3 −2 src/test/scala/stdlib/ForExpressionsSpec.scala
  54. +3 −2 src/test/scala/stdlib/FormattingSpec.scala
  55. +3 −2 src/test/scala/stdlib/HigherOrderFunctionsSpec.scala
  56. +3 −2 src/test/scala/stdlib/ImplicitsSpec.scala
  57. +3 −2 src/test/scala/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala
  58. +3 −2 src/test/scala/stdlib/InfixTypesSpec.scala
  59. +3 −2 src/test/scala/stdlib/IterablesSpec.scala
  60. +3 −2 src/test/scala/stdlib/ListsSpec.scala
  61. +3 −2 src/test/scala/stdlib/LiteralBooleansSpec.scala
  62. +3 −2 src/test/scala/stdlib/LiteralNumbersSpec.scala
  63. +3 −2 src/test/scala/stdlib/LiteralStringsSpec.scala
  64. +3 −2 src/test/scala/stdlib/MapsSpec.scala
  65. +3 −2 src/test/scala/stdlib/NamedAndDefaultArgumentsSpec.scala
  66. +3 −2 src/test/scala/stdlib/ObjectsSpec.scala
  67. +3 −2 src/test/scala/stdlib/OptionsSpec.scala
  68. +3 −2 src/test/scala/stdlib/ParentClassesSpec.scala
  69. +3 −2 src/test/scala/stdlib/PartialFunctionsSpec.scala
  70. +3 −2 src/test/scala/stdlib/PartiallyAppliedFunctionsSpec.scala
  71. +3 −2 src/test/scala/stdlib/PatternMatchingSpec.scala
  72. +3 −2 src/test/scala/stdlib/RangesSpec.scala
  73. +3 −2 src/test/scala/stdlib/RepeatedParametersSpec.scala
  74. +3 −2 src/test/scala/stdlib/SequencesAndArraysSpec.scala
  75. +3 −2 src/test/scala/stdlib/SetsSpec.scala
  76. +3 −2 src/test/scala/stdlib/TraitsSpec.scala
  77. +3 −2 src/test/scala/stdlib/TraversablesSpec.scala
  78. +3 −2 src/test/scala/stdlib/TuplesSpec.scala
  79. +3 −2 src/test/scala/stdlib/TypeSignaturesSpec.scala
  80. +3 −2 src/test/scala/stdlib/TypeVarianceSpec.scala
  81. +3 −2 src/test/scala/stdlib/UniformAccessPrincipleSpec.scala
@@ -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")
@@ -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._
@@ -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",
@@ -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))
)
}
@@ -1 +1 @@
sbt.version=0.13.15
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")
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:
*/

0 comments on commit 2446518

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