Skip to content

Commit b210ba2

Browse files
committed
Renames
1 parent 9ec188a commit b210ba2

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

Diff for: build.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ scalacOptions := Seq("-unchecked", "-deprecation", "-feature", "-encoding", "utf
1818

1919
publishTo := {
2020
val scalasbt = "http://repo.scala-sbt.org/scalasbt/"
21-
val (name, url) = if (version.toString.contains("-SNAPSHOT"))
22-
("sbt-plugin-snapshots", scalasbt + "sbt-plugin-snapshots")
23-
else ("sbt-plugin-releases", scalasbt + "sbt-plugin-releases")
21+
val (name, url) =
22+
if (version.toString.contains("-SNAPSHOT")) ("sbt-plugin-snapshots", scalasbt + "sbt-plugin-snapshots")
23+
else ("sbt-plugin-releases", scalasbt + "sbt-plugin-releases")
2424
Some(Resolver.url(name, new URL(url))(Resolver.ivyStylePatterns))
2525
}
2626

Diff for: src/main/scala/org/scalescc/sbt/ScalesSbtPlugin.scala renamed to src/main/scala/org/scalescc/sbt/ScootSbtPlugin.scala

+24-24
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,30 @@ import scales._
66
import sbt.File
77
import scales.report.{ScalesHtmlWriter, CoberturaXmlWriter, ScalesXmlWriter}
88

9-
object ScalesSbtPlugin extends Plugin {
9+
object ScootSbtPlugin extends Plugin {
1010

1111
val scalesReportDir = SettingKey[File]("scoot-report-dir")
1212

13-
lazy val Scales = config("scoot")
14-
lazy val ScalesTest = config("scoot-test") extend Scales
13+
lazy val Scoot = config("scoot")
14+
lazy val ScootTest = config("scoot-test") extend Scoot
1515

1616
lazy val instrumentSettings = {
17-
inConfig(Scales)(Defaults.compileSettings) ++
18-
inConfig(ScalesTest)(Defaults.testSettings) ++
17+
inConfig(Scoot)(Defaults.compileSettings) ++
18+
inConfig(ScootTest)(Defaults.testSettings) ++
1919
Seq(
2020
scalesReportDir <<= crossTarget / "coverage-report",
2121

22-
ivyConfigurations ++= Seq(Scales, ScalesTest),
22+
ivyConfigurations ++= Seq(Scoot, ScootTest),
2323

2424
resolvers += Resolver.url("local-ivy",
2525
new URL("file://" + Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns),
2626

27-
libraryDependencies += "com.sksamuel.scoot" %% "scalac-scoot-plugin" % "0.91.0" % Scales.name,
27+
libraryDependencies += "com.sksamuel.scoot" %% "scalac-scoot-plugin" % "0.91.0" % Scoot.name,
2828

29-
sources in Scales <<= (sources in Compile),
30-
sourceDirectory in Scales <<= (sourceDirectory in Compile),
29+
sources in Scoot <<= (sources in Compile),
30+
sourceDirectory in Scoot <<= (sourceDirectory in Compile),
3131

32-
scalacOptions in Scales <++= (name in Scales, baseDirectory in Scales, update) map {
32+
scalacOptions in Scoot <++= (name in Scoot, baseDirectory in Scoot, update) map {
3333
(n, b, report) =>
3434
val scalesDeps = report matching configurationFilter("scoot")
3535
scalesDeps.find(_.getAbsolutePath.contains("scalac-scoot-plugin")) match {
@@ -42,34 +42,34 @@ object ScalesSbtPlugin extends Plugin {
4242
}
4343
},
4444

45-
sources in ScalesTest <<= (sources in Test),
46-
sourceDirectory in ScalesTest <<= (sourceDirectory in Test),
47-
unmanagedResources in ScalesTest <<= (unmanagedResources in Test),
45+
sources in ScootTest <<= (sources in Test),
46+
sourceDirectory in ScootTest <<= (sourceDirectory in Test),
47+
unmanagedResources in ScootTest <<= (unmanagedResources in Test),
4848

49-
resourceDirectory in ScalesTest <<= (resourceDirectory in Compile),
49+
resourceDirectory in ScootTest <<= (resourceDirectory in Compile),
5050

51-
externalDependencyClasspath in Scales <<= Classpaths
52-
.concat(externalDependencyClasspath in Scales, externalDependencyClasspath in Compile),
53-
externalDependencyClasspath in ScalesTest <<= Classpaths
54-
.concat(externalDependencyClasspath in ScalesTest, externalDependencyClasspath in Test),
51+
externalDependencyClasspath in Scoot <<= Classpaths
52+
.concat(externalDependencyClasspath in Scoot, externalDependencyClasspath in Compile),
53+
externalDependencyClasspath in ScootTest <<= Classpaths
54+
.concat(externalDependencyClasspath in ScootTest, externalDependencyClasspath in Test),
5555

56-
internalDependencyClasspath in Scales <<= (internalDependencyClasspath in Compile),
57-
internalDependencyClasspath in ScalesTest <<= (internalDependencyClasspath in Test, internalDependencyClasspath in ScalesTest, classDirectory in Compile) map {
56+
internalDependencyClasspath in Scoot <<= (internalDependencyClasspath in Compile),
57+
internalDependencyClasspath in ScootTest <<= (internalDependencyClasspath in Test, internalDependencyClasspath in ScootTest, classDirectory in Compile) map {
5858
(testDeps, scalesDeps, oldClassDir) =>
5959
scalesDeps ++ testDeps.filter(_.data != oldClassDir)
6060
},
6161

62-
testOptions in ScalesTest <+= testsCleanup,
62+
testOptions in ScootTest <+= testsCleanup,
6363

6464
// make scales config the same as scalesTest config
65-
test in Scales <<= (test in ScalesTest)
65+
test in Scoot <<= (test in ScootTest)
6666
)
6767
}
6868

6969
/** Generate hook that is invoked after each tests execution. */
7070
def testsCleanup = {
71-
(target in ScalesTest,
72-
definedTests in ScalesTest,
71+
(target in ScootTest,
72+
definedTests in ScootTest,
7373
streams) map {
7474
(target,
7575
definedTests,

0 commit comments

Comments
 (0)