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

Move REPL related xsbti Java classes to the correct module #425

Merged
merged 3 commits into from
Oct 10, 2017
Merged

Move REPL related xsbti Java classes to the correct module #425

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2896e1
Move REPL related xsbti Java to correct module
eed3si9n Oct 9, 2017
505ac2e
Move mima exclusions to its own file
eed3si9n Oct 9, 2017
f2e2bf2
Import statement no longer needed
eed3si9n Oct 9, 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
10 changes: 9 additions & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Util._
import Dependencies._
import Scripted._
//import com.typesafe.tools.mima.core._, ProblemFilters._
import com.typesafe.tools.mima.core._, ProblemFilters._

def baseVersion = "1.1.0-SNAPSHOT"
def internalPath = file("internal")
Expand Down Expand Up @@ -387,6 +387,14 @@ lazy val compilerBridge: Project = (project in internalPath / "compiler-bridge")
publishLocal := publishLocal.dependsOn(cleanSbtBridge).value,
altPublishSettings,
mimaSettings,
mimaBinaryIssueFilters ++= Vector(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should follow the scalac standard of having this in an independent file. I don't like having this on the build.sbt.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate why?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can think of two reasons:

  • Every time I change something, It makes me reload the build.
  • A file inside a project's source directories is clearer to find and read.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 505ac2e

// xsbti Java interfaces must be defined in the compiler interface, not the bridge.
// Bridge implementations are compiled per Zinc, so these are safe to change.
exclude[MissingClassProblem]("xsbti.InteractiveConsoleFactory"),
exclude[MissingClassProblem]("xsbti.InteractiveConsoleResult"),
exclude[MissingClassProblem]("xsbti.InteractiveConsoleInterface"),
exclude[MissingClassProblem]("xsbti.InteractiveConsoleResponse"),
),
)

val scalaPartialVersion = Def setting (CrossVersion partialVersion scalaVersion.value)
Expand Down
0 ...java/xsbti/InteractiveConsoleFactory.java → ...java/xsbti/InteractiveConsoleFactory.java
View file
Open in desktop
File renamed without changes.
0 ...va/xsbti/InteractiveConsoleInterface.java → ...va/xsbti/InteractiveConsoleInterface.java
View file
Open in desktop
File renamed without changes.
0 ...ava/xsbti/InteractiveConsoleResponse.java → ...ava/xsbti/InteractiveConsoleResponse.java
View file
Open in desktop
File renamed without changes.
0 .../java/xsbti/InteractiveConsoleResult.java → .../java/xsbti/InteractiveConsoleResult.java
View file
Open in desktop
File renamed without changes.