Skip to content

Adds Exclusions to dependency API #63

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.

Sign up for GitHub

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 1 commit into from
Sep 19, 2019
Merged

Adds Exclusions to dependency API #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions client/src/main/scala/org/scalaexercises/evaluator/Decoders.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package org.scalaexercises.evaluator
Expand All @@ -16,5 +18,6 @@ object Decoders {
Decoder.forProduct2("message", "pos")(CompilationInfo.apply)

implicit val decodeEvalResponse: Decoder[EvalResponse] =
Decoder.forProduct5("msg", "value", "valueType", "consoleOutput", "compilationInfos")(EvalResponse.apply)
Decoder.forProduct5("msg", "value", "valueType", "consoleOutput", "compilationInfos")(
EvalResponse.apply)
}
6 changes: 4 additions & 2 deletions client/src/main/scala/org/scalaexercises/evaluator/EvaluatorAPI.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package org.scalaexercises.evaluator
Expand Down
6 changes: 4 additions & 2 deletions client/src/main/scala/org/scalaexercises/evaluator/EvaluatorClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package org.scalaexercises.evaluator
Expand Down
6 changes: 4 additions & 2 deletions client/src/main/scala/org/scalaexercises/evaluator/EvaluatorResponses.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package org.scalaexercises.evaluator
Expand Down
6 changes: 4 additions & 2 deletions client/src/main/scala/org/scalaexercises/evaluator/api/Evaluator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package org.scalaexercises.evaluator.api
Expand Down
6 changes: 4 additions & 2 deletions client/src/main/scala/org/scalaexercises/evaluator/free/algebra/EvaluatorOps.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package org.scalaexercises.evaluator.free.algebra
Expand Down
6 changes: 4 additions & 2 deletions client/src/main/scala/org/scalaexercises/evaluator/free/interpreters/Interpreter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package org.scalaexercises.evaluator.free.interpreters
Expand Down
6 changes: 4 additions & 2 deletions client/src/main/scala/org/scalaexercises/evaluator/http/HttpClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package org.scalaexercises.evaluator.http
Expand Down
6 changes: 4 additions & 2 deletions client/src/main/scala/org/scalaexercises/evaluator/http/HttpRequestBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package org.scalaexercises.evaluator.http
Expand Down
6 changes: 4 additions & 2 deletions client/src/main/scala/org/scalaexercises/evaluator/implicits.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
* scala-exercises - evaluator-client
* Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package org.scalaexercises.evaluator
Expand Down
16 changes: 11 additions & 5 deletions server/src/main/scala/org/scalaexercises/evaluator/evaluation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,17 @@ class Evaluator[F[_]: Sync](timeout: FiniteDuration = 20.seconds)(

def remoteToRepository(remote: Remote): Repository = MavenRepository(remote)

def dependencyToModule(dependency: Dependency): coursier.Dependency =
coursier.Dependency.of(
Module(Organization(dependency.groupId), ModuleName(dependency.artifactId)),
dependency.version
)
def dependencyToModule(dependency: Dependency): coursier.Dependency = {
val exclusions = dependency.exclusions map {
case Exclusion(org, mod) => (Organization(org), ModuleName(mod))
}
coursier.Dependency
.of(
Module(Organization(dependency.groupId), ModuleName(dependency.artifactId)),
dependency.version
)
.withExclusions(exclusions)
}

val cache: FileCache[F] = FileCache[F].noCredentials

Expand Down
3 changes: 2 additions & 1 deletion server/src/main/scala/org/scalaexercises/evaluator/services.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ object services {

import EvalResponse.messages._

def evaluatorInstance[F[_]: ConcurrentEffect: ContextShift: Timer: Sync] = new Evaluator[F](20 seconds)
def evaluatorInstance[F[_]: ConcurrentEffect: ContextShift: Timer: Sync] =
new Evaluator[F](20 seconds)

val corsHeaders = Seq(
Header("Vary", "Origin,Access-Control-Request-Methods"),
Expand Down
6 changes: 4 additions & 2 deletions server/src/test/scala/org/scalaexercises/evaluator/EvalEndpointSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
* scala-exercises - evaluator-server
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
* scala-exercises - evaluator-server
* Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package org.scalaexercises.evaluator
Expand Down
6 changes: 4 additions & 2 deletions server/src/test/scala/org/scalaexercises/evaluator/EvaluatorSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
* scala-exercises - evaluator-server
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
* scala-exercises - evaluator-server
* Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package org.scalaexercises.evaluator
Expand Down
6 changes: 4 additions & 2 deletions server/src/test/scala/org/scalaexercises/evaluator/helper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
* scala-exercises - evaluator-server
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*
* scala-exercises - evaluator-server
* Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
*
*/

package org.scalaexercises.evaluator
Expand Down
7 changes: 6 additions & 1 deletion shared/src/main/scala/org/scalaexercises/evaluator/types.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@ final case class CompilationError[A](compilationInfos: CI) extends EvalResult[A]

final case class GeneralError[A](stack: Throwable) extends EvalResult[A]

final case class Dependency(groupId: String, artifactId: String, version: String)
final case class Exclusion(organization: String, moduleName: String)
final case class Dependency(
groupId: String,
artifactId: String,
version: String,
exclusions: Set[Exclusion] = Set.empty)

final case class EvalRequest(
resolvers: List[String] = Nil,
Expand Down