Skip to content

Commit

Permalink
run update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
oyvindberg committed Jul 3, 2022
1 parent 0d1afd6 commit a3d06eb
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 13 deletions.
2 changes: 0 additions & 2 deletions bleep-core/src/main/scala/bleep/BuildPaths.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package bleep

import bleep.internal.Replacements

import java.nio.file.Path

case class BuildPaths(cwd: Path, bleepYamlFile: Path, mode: BuildPaths.Mode) {
Expand Down
2 changes: 1 addition & 1 deletion bleep-core/src/main/scala/bleep/CoursierResolver.scala
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ object CoursierResolver {
Codec.forProduct4[Publication, String, Type, Extension, Classifier]("name", "type", "ext", "classifier")(Publication.apply)(mod => (mod.name, mod.`type`, mod.ext, mod.classifier))

implicit val codecDependency: Codec[Dependency] =
Codec.forProduct7[Dependency, Module, String, Configuration, Set[(Organization, ModuleName)], Publication, Boolean, Boolean]("module", "version", "configuration", "exclusions", "publication", "optional", "transitive")(Dependency.apply)(x => (x.module, x.version, x.configuration, x.exclusions, x.publication, x.optional, x.transitive))
Codec.forProduct7[Dependency, Module, String, Configuration, Set[(Organization, ModuleName)], Publication, Boolean, Boolean]("module", "version", "configuration", "exclusions", "publication", "optional", "transitive")(Dependency.apply)(x => (x.module, x.version, x.configuration, x.minimizedExclusions.toSet(), x.publication, x.optional, x.transitive))

implicit val codecAuthentication: Codec[Authentication] =
Codec.forProduct7[Authentication, String, Option[String], Seq[(String, String)], Boolean, Option[String], Boolean, Boolean]("user", "passwordOpt", "httpHeaders", "optional", "realmOpt", "httpsOnly", "passOnRedirect")(Authentication.apply)(x => (x.user, x.passwordOpt, x.httpHeaders, x.optional, x.realmOpt, x.httpsOnly, x.passOnRedirect))
Expand Down
4 changes: 2 additions & 2 deletions bleep-core/src/main/scala/bleep/Dep.scala
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ object Dep {
),
version = version,
configuration = configuration,
exclusions = exclusions.value.flatMap { case (org, moduleNames) => moduleNames.values.map(moduleName => (org, moduleName)) }.toSet,
minimizedExclusions = exclusions.value.flatMap { case (org, moduleNames) => moduleNames.values.map(moduleName => (org, moduleName)) }.toSet,
publication = publication,
optional = false, // todo: we now express this in configuration. also here?
transitive = transitive
Expand Down Expand Up @@ -157,7 +157,7 @@ object Dep {
module = new Module(organization, moduleName, attributes),
version = version,
configuration = configuration,
exclusions = exclusions.value.flatMap { case (org, moduleNames) => moduleNames.values.map(moduleName => (org, moduleName)) }.toSet,
minimizedExclusions = exclusions.value.flatMap { case (org, moduleNames) => moduleNames.values.map(moduleName => (org, moduleName)) }.toSet,
publication = publication,
optional = false, // todo: we now express this in configuration. also here?
transitive = transitive
Expand Down
7 changes: 6 additions & 1 deletion bleep-core/src/main/scala/bleep/bsp/BloopLogger.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ import scala.build.blooprifle.BloopRifleLogger

class BloopLogger(logger: Logger) extends BloopRifleLogger {
override def info(msg: => String): Unit = logger.info(s"bloop: $msg")
override def debug(msg: => String): Unit = logger.debug(s"bloop: $msg")
override def debug(msg: => String, throwable: Throwable): Unit =
Option(throwable) match {
case Some(th) => logger.debug(s"bloop: $msg", th)
case None => logger.debug(s"bloop: $msg")
}

override def error(msg: => String, ex: Throwable): Unit = logger.error(s"bloop: $msg")
override val bloopCliInheritStdout: Boolean = false
override val bloopCliInheritStderr: Boolean = false
Expand Down
14 changes: 7 additions & 7 deletions bleep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ projects:
bleep-cli:
dependencies:
- com.lihaoyi::pprint:0.7.3
- com.monovore::decline:2.2.0
- com.monovore::decline:2.3.0
- org.graalvm.nativeimage:svm:22.1.0.1
- exclusions:
org.scala-sbt: util-logging_2.13
Expand All @@ -27,7 +27,7 @@ projects:
bleep-core:
dependencies:
- for3Use213: true
module: ch.epfl.scala::bloop-config:1.5.0
module: ch.epfl.scala::bloop-config:1.5.2
- com.lihaoyi::fansi:0.3.1
- io.circe::circe-core:0.14.2
- io.circe::circe-generic:0.14.2
Expand All @@ -36,14 +36,14 @@ projects:
- exclusions:
org.scala-lang.modules: scala-collection-compat_2.13
for3Use213: true
module: io.get-coursier::coursier-jvm:2.1.0-M6
module: io.get-coursier::coursier-jvm:2.1.0-M6-28-gbad85693f
- exclusions:
org.scala-lang.modules: scala-collection-compat_2.13
for3Use213: true
module: io.get-coursier::coursier:2.1.0-M6
module: io.get-coursier::coursier:2.1.0-M6-28-gbad85693f
- org.gnieh::diffson-circe:4.1.1
- org.snakeyaml:snakeyaml-engine:2.3
- org.virtuslab.scala-cli::bloop-rifle:0.1.8
- org.virtuslab.scala-cli::bloop-rifle:0.1.9
extends: template-cross-all
bleep-tasks:
dependsOn: bleep-core
Expand All @@ -52,7 +52,7 @@ projects:
sources: ./../liberated/sbt-native-image/plugin/src/main/scala
bleep-tasks-publishing:
dependencies:
- com.eed3si9n::gigahorse-okhttp:0.6.0
- com.eed3si9n::gigahorse-okhttp:0.7.0
- org.bouncycastle:bcpg-jdk15on:1.70
- org.scala-lang.modules::scala-parser-combinators:2.1.1
- org.sonatype.spice.zapper:spice-zapper:1.3
Expand All @@ -78,7 +78,7 @@ projects:
extends: template-common-test
folder: ./bleep-tasks-publishing
bleep-test-harness:
dependencies: org.scalatest::scalatest:3.2.12
dependencies: org.scalatest::scalatest:3.3.0-SNAP3
dependsOn: bleep-core
extends: template-cross-jvm-212-213-main
scripts:
Expand Down

0 comments on commit a3d06eb

Please sign in to comment.