Skip to content

Commit

Permalink
Merge pull request #13087 from playframework/mergify/bp/main/pr-13085
Browse files Browse the repository at this point in the history
Fix `apiMappings` (backport #13085) by @mkurz
  • Loading branch information
mkurz authored Jan 24, 2025
2 parents a3be647 + f2b6389 commit b96a9b1
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions project/BuildSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,6 @@ object BuildSettings {
)
}.toMap
},
apiMappings ++= {
// Maps JDK 1.8 jar into apidoc.
val rtJar = sys.props
.get("sun.boot.class.path")
.flatMap(cp =>
cp.split(java.io.File.pathSeparator).collectFirst {
case str if str.endsWith(java.io.File.separator + "rt.jar") => str
}
)
rtJar match {
case None => Map.empty
case Some(rtJar) => Map(file(rtJar) -> url(Docs.javaApiUrl))
}
},
apiMappings ++= {
// Finds appropriate scala apidoc from dependencies when autoAPIMappings are insufficient.
// See the following:
Expand All @@ -166,7 +152,7 @@ object BuildSettings {
// https://github.com/ThoughtWorksInc/sbt-api-mappings/blob/master/src/main/scala/com/thoughtworks/sbtApiMappings/ApiMappings.scala#L34

val ScalaLibraryRegex = """^.*[/\\]scala-library-([\d\.]+)\.jar$""".r
val JavaxInjectRegex = """^.*[/\\]java.inject-([\d\.]+)\.jar$""".r
val JavaxInjectRegex = """^.*[/\\]javax.inject-([\d\.]+)\.jar$""".r

val IvyRegex = """^.*[/\\]([\.\-_\w]+)[/\\]([\.\-_\w]+)[/\\](?:jars|bundles)[/\\]([\.\-_\w]+)\.jar$""".r

Expand Down

0 comments on commit b96a9b1

Please sign in to comment.