luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove sbt._ types from FromSbt.scala (#771) 

* Remove more types from sbt._ namespace

* Use newest version of sbt-compat
This commit is contained in:
Leonard Ehrenfried 2018-02-09 00:57:08 +01:00 committed by Alexandre Archambault
parent c8d191401c
commit 4519faaf10
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -246,7 +246,7 @@ lazy val `sbt-shared` = project
// because we don't publish for 2.11 the following declaration // because we don't publish for 2.11 the following declaration
// is more wordy than usual // is more wordy than usual
libs ++= { libs ++= {
val dependency = "com.dwijnand" % "sbt-compat" % "1.2.4" val dependency = "com.dwijnand" % "sbt-compat" % "1.2.5"
val sbtV = (sbtBinaryVersion in pluginCrossBuild).value val sbtV = (sbtBinaryVersion in pluginCrossBuild).value
val scalaV = (scalaBinaryVersion in update).value val scalaV = (scalaBinaryVersion in update).value
val m = Defaults.sbtPluginExtra(dependency, sbtV, scalaV) val m = Defaults.sbtPluginExtra(dependency, sbtV, scalaV)

8
sbt-shared/src/main/scala/coursier/FromSbt.scala
View File

@ -162,7 +162,7 @@ object FromSbt {
) )
} }
private def mavenCompatibleBaseOpt(patterns: sbt.Patterns): Option[String] = private def mavenCompatibleBaseOpt(patterns: Patterns): Option[String] =
if (patterns.isMavenCompatible) { if (patterns.isMavenCompatible) {
val baseIvyPattern = patterns.ivyPatterns.head.takeWhile(c => c != '[' && c != '(') val baseIvyPattern = patterns.ivyPatterns.head.takeWhile(c => c != '[' && c != '(')
val baseArtifactPattern = patterns.ivyPatterns.head.takeWhile(c => c != '[' && c != '(') val baseArtifactPattern = patterns.ivyPatterns.head.takeWhile(c => c != '[' && c != '(')
@ -210,7 +210,7 @@ object FromSbt {
case r: sbt.librarymanagement.MavenRepository => case r: sbt.librarymanagement.MavenRepository =>
mavenRepositoryOpt(r.root, log, authentication) mavenRepositoryOpt(r.root, log, authentication)
case r: sbt.FileRepository case r: FileRepository
if r.patterns.ivyPatterns.lengthCompare(1) == 0 && if r.patterns.ivyPatterns.lengthCompare(1) == 0 &&
r.patterns.artifactPatterns.lengthCompare(1) == 0 => r.patterns.artifactPatterns.lengthCompare(1) == 0 =>
@ -241,7 +241,7 @@ object FromSbt {
mavenRepositoryOpt("file://" + mavenCompatibleBase, log, authentication) mavenRepositoryOpt("file://" + mavenCompatibleBase, log, authentication)
} }
case r: sbt.URLRepository case r: URLRepository
if r.patterns.ivyPatterns.lengthCompare(1) == 0 && if r.patterns.ivyPatterns.lengthCompare(1) == 0 &&
r.patterns.artifactPatterns.lengthCompare(1) == 0 => r.patterns.artifactPatterns.lengthCompare(1) == 0 =>
@ -272,7 +272,7 @@ object FromSbt {
mavenRepositoryOpt(mavenCompatibleBase, log, authentication) mavenRepositoryOpt(mavenCompatibleBase, log, authentication)
} }
case raw: sbt.RawRepository if raw.name == "inter-project" => // sbt.RawRepository.equals just compares names anyway case raw: RawRepository if raw.name == "inter-project" => // sbt.RawRepository.equals just compares names anyway
None None
case other => case other =>