Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add headers and move compiler interface #438

Merged
merged 3 commits into from
Nov 16, 2017
Merged

Add headers and move compiler interface #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e334903
Update sbt-scalafmt to 1.12
jvican Oct 11, 2017
90da1fb
Fix #332: Add sbt-header back to the build
jvican Oct 11, 2017
0816162
Add headers to missing files
jvican Oct 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions internal/zinc-compile-core/src/main/java/xsbti/ReporterUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* 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.
*/

package xsbti;

import sbt.internal.inc.ReporterManager;
Expand Down
7 changes: 7 additions & 0 deletions internal/zinc-compile-core/src/main/scala/sbt/internal/inc/FilteredReporter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* 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.
*/

package sbt.internal.inc

import java.nio.file.Path
Expand Down
7 changes: 7 additions & 0 deletions internal/zinc-compile-core/src/main/scala/sbt/internal/inc/ReporterManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* 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.
*/

package sbt.internal.inc

import java.io.{ OutputStreamWriter, PrintStream, PrintWriter }
Expand Down
7 changes: 7 additions & 0 deletions internal/zinc-core/src/main/java/xsbti/compile/AnalysisContents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* 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.
*/

package xsbti.compile;

import sbt.internal.inc.ConcreteAnalysisContents;
Expand Down
7 changes: 7 additions & 0 deletions internal/zinc-core/src/main/java/xsbti/compile/AnalysisStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* 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.
*/

package xsbti.compile;

import java.util.Optional;
Expand Down
7 changes: 7 additions & 0 deletions internal/zinc-core/src/main/scala/sbt/internal/inc/ConcreteAnalysisContents.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* 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.
*/

package sbt.internal.inc

import xsbti.compile.{ AnalysisContents, CompileAnalysis, MiniSetup }
Expand Down
7 changes: 7 additions & 0 deletions internal/zinc-persist/src/main/java/xsbti/compile/FileAnalysisStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* 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.
*/

package xsbti.compile;

import xsbti.compile.analysis.ReadWriteMappers;
Expand Down
7 changes: 7 additions & 0 deletions internal/zinc-persist/src/main/java/xsbti/compile/analysis/RootPaths.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* 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.
*/

package xsbti.compile.analysis;

import java.io.File;
Expand Down
7 changes: 7 additions & 0 deletions internal/zinc-persist/src/main/scala/sbt/internal/inc/ConcreteRootPaths.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* 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.
*/

package sbt.internal.inc

import java.io.File
Expand Down
46 changes: 22 additions & 24 deletions project/Header.scala
View file
Open in desktop
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
))
)
}
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.27")
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.10")
// addSbtPlugin("de.heikoseeberger" % "sbt-header" % "1.7.0")
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.12")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2")
addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.3")
addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.0")
addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.12-rc5")
Expand Down