-
Notifications
You must be signed in to change notification settings - Fork 120
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #438 from scalacenter/add-headers-restructure-dir
Add headers and move compiler interface
- Loading branch information
Showing
11 changed files
with
87 additions
and
26 deletions.
There are no files selected for viewing
7 changes: 7 additions & 0 deletions
7
internal/zinc-compile-core/src/main/java/xsbti/ReporterUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
internal/zinc-compile-core/src/main/scala/sbt/internal/inc/FilteredReporter.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
internal/zinc-compile-core/src/main/scala/sbt/internal/inc/ReporterManager.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
internal/zinc-core/src/main/java/xsbti/compile/AnalysisContents.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
internal/zinc-core/src/main/java/xsbti/compile/AnalysisStore.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
internal/zinc-core/src/main/scala/sbt/internal/inc/ConcreteAnalysisContents.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
internal/zinc-persist/src/main/java/xsbti/compile/FileAnalysisStore.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
internal/zinc-persist/src/main/java/xsbti/compile/analysis/RootPaths.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
internal/zinc-persist/src/main/scala/sbt/internal/inc/ConcreteRootPaths.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,25 @@ | ||
// import sbt._ | ||
// import Keys._ | ||
import sbt._ | ||
import Keys._ | ||
|
||
// import de.heikoseeberger.sbtheader.{ HeaderPlugin, HeaderPattern } | ||
// import HeaderPlugin.autoImport._ | ||
import de.heikoseeberger.sbtheader.HeaderPlugin | ||
import de.heikoseeberger.sbtheader.HeaderPlugin.{autoImport => SbtHeaderKeys} | ||
|
||
// object CustomHeaderPlugin extends AutoPlugin { | ||
// override def requires = plugins.JvmPlugin && HeaderPlugin | ||
// override def trigger = allRequirements | ||
object CustomHeaderPlugin extends AutoPlugin { | ||
override def requires = plugins.JvmPlugin && HeaderPlugin | ||
override def trigger = allRequirements | ||
import SbtHeaderKeys.{HeaderFileType, HeaderCommentStyle, HeaderLicense} | ||
|
||
// override def projectSettings = Seq( | ||
// headers := Map( | ||
// "scala" -> (HeaderPattern.cStyleBlockComment, copyrightText), | ||
// "java" -> (HeaderPattern.cStyleBlockComment, copyrightText) | ||
// ) | ||
// ) | ||
|
||
// val copyrightText = | ||
// """|/* | ||
// | * Zinc - The incremental compiler for Scala. | ||
// | * Copyright 2011 - 2017, Lightbend, Inc. | ||
// | * Copyright 2008 - 2010, Mark Harrah | ||
// | * This software is released under the terms written in LICENSE. | ||
// | */ | ||
// | | ||
// |""".stripMargin | ||
// } | ||
override def projectSettings = Seq( | ||
SbtHeaderKeys.headerMappings ++= Map( | ||
HeaderFileType.scala -> HeaderCommentStyle.CStyleBlockComment, | ||
HeaderFileType.java -> HeaderCommentStyle.CStyleBlockComment | ||
), | ||
SbtHeaderKeys.headerLicense := Some(HeaderLicense.Custom( | ||
"""|Zinc - The incremental compiler for Scala. | ||
|Copyright 2011 - 2017, Lightbend, Inc. | ||
|Copyright 2008 - 2010, Mark Harrah | ||
|This software is released under the terms written in LICENSE. | ||
|""".stripMargin | ||
)) | ||
) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters