From 0999982ba4ef020788c5249b4046f2f74c9799bd Mon Sep 17 00:00:00 2001 From: Dave Handy Date: Tue, 27 Jul 2021 15:39:21 -0400 Subject: [PATCH] Wrap <:< check in undolog fixes #51. Also minor formatting updates, new scaldi version 0.6.2 --- .scalafmt.conf | 1 + CHANGELOG.md | 16 ---------------- README.md | 2 +- build.sbt | 4 ++-- .../scala/scaldi/jsr330/AnnotationBinding.scala | 6 +++--- .../jsr330/OnDemandAnnotationInjector.scala | 3 +-- 6 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/.scalafmt.conf b/.scalafmt.conf index 4073d11..d39a65e 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -2,6 +2,7 @@ version = 3.0.0-RC6 project.git = true maxColumn = 120 +docstrings.oneline = fold align.preset = more diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 26e70ce..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,16 +0,0 @@ -## v0.5.9 (2016-11-03) - -* Cross-compile for scala 2.11 and 2.12 -* Updated dependencies - -## v0.5.8 (2015-12-11) - -* Updated scaldi v0.5.7 - -## v0.5.7 (14.06.2015) - -* Minor bugfix: annotated scala `var` was not injected correctly in some cases - -## v0.5.6 (28.05.2015) - -* Initial release (extracted from scaldi project) diff --git a/README.md b/README.md index a09ea98..beaef6f 100644 --- a/README.md +++ b/README.md @@ -9,5 +9,5 @@ SBT Configuration: ```sbtshell -libraryDependencies += "org.scaldi" %% "scaldi-jsr330" % "0.6.0" +libraryDependencies += "org.scaldi" %% "scaldi-jsr330" % x.y.z ``` diff --git a/build.sbt b/build.sbt index 0f17757..f6bdbcd 100644 --- a/build.sbt +++ b/build.sbt @@ -9,12 +9,12 @@ licenses := Seq( scalaVersion := "2.13.6" crossScalaVersions := Seq("2.11.12", "2.12.14", "2.13.6") -mimaPreviousArtifacts := Set("0.6.0").map(organization.value %% name.value % _) +mimaPreviousArtifacts := Set("0.6.0", "0.6.1").map(organization.value %% name.value % _) scalacOptions ++= Seq("-deprecation", "-feature") crossPaths := false libraryDependencies ++= Seq( - "org.scaldi" %% "scaldi" % "0.6.1", + "org.scaldi" %% "scaldi" % "0.6.2", "javax.inject" % "javax.inject" % "1", "org.scalatest" %% "scalatest" % "3.2.9" % Test, "com.github.sbt" % "junit-interface" % "0.13.2" % Test, diff --git a/src/main/scala/scaldi/jsr330/AnnotationBinding.scala b/src/main/scala/scaldi/jsr330/AnnotationBinding.scala index 83f9ec3..0e20051 100644 --- a/src/main/scala/scaldi/jsr330/AnnotationBinding.scala +++ b/src/main/scala/scaldi/jsr330/AnnotationBinding.scala @@ -7,6 +7,7 @@ import java.lang.annotation.Annotation import java.lang.reflect.Constructor import javax.inject.{Inject, Named, Qualifier, Scope, Singleton, Provider => JProvider} import scala.reflect.runtime.universe._ +import scaldi.util.ReflectionHelper._ /** Binding for JSR 330 compliant types. */ case class AnnotationBinding( @@ -174,7 +175,7 @@ case class AnnotationBinding( val (s, annotations) = symbolWithAnnotations val it = s.typeSignature.resultType - if (it <:< typeOf[JProvider[_]]) { + if (it safe_<:< typeOf[JProvider[_]]) { val actualType = it.typeArgs.head val identifiers = TypeTagIdentifier(actualType) :: annotationIds(annotations) @@ -194,8 +195,7 @@ case class AnnotationBinding( object AnnotationBinding { - /** Extracts a list of identifiers from JSR 330 compliant type - */ + /** Extracts a list of identifiers from JSR 330 compliant type */ def extractIdentifiers(tpe: Type): List[Identifier] = findConstructor(tpe) map (_ => TypeTagIdentifier(tpe) :: Nil) getOrElse Nil diff --git a/src/main/scala/scaldi/jsr330/OnDemandAnnotationInjector.scala b/src/main/scala/scaldi/jsr330/OnDemandAnnotationInjector.scala index dd83f87..edf99a7 100644 --- a/src/main/scala/scaldi/jsr330/OnDemandAnnotationInjector.scala +++ b/src/main/scala/scaldi/jsr330/OnDemandAnnotationInjector.scala @@ -2,8 +2,7 @@ package scaldi.jsr330 import scaldi._ -/** Injector that creates JSR 330 compliant bindings on-demand (when they are injected) - */ +/** Injector that creates JSR 330 compliant bindings on-demand (when they are injected) */ class OnDemandAnnotationInjector extends MutableInjectorUser with InjectorWithLifecycle[OnDemandAnnotationInjector]