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.

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

Change the organization of the integration builds #30

Merged
merged 4 commits into from
Nov 16, 2017
Merged

Conversation

jvican
Copy link
Contributor

@jvican jvican commented Nov 15, 2017

No description provided.

val globalSettings =
List(Keys.onLoadMessage in sbt.Global := s"Setting up the integration builds.")
def genProjectSettings(ref: sbt.ProjectRef) =
BuildKeys.inProject(ref)(Keys.organization := "ch.epfl.scala")
Copy link
Collaborator

Choose a reason for hiding this comment

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

If we're changing the organisation here, we probably also need to tell the component compiler to use a different organisation when resolving the bridge sources.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Aha! good catch.

We have our own bridge version, and we want to be able to resolve it
independently of what sbt's bridge version is.
@jvican
Copy link
Contributor Author

jvican commented Nov 16, 2017

I've double-check that this does not break frontend/run. Ready for review again.

@jvican jvican changed the title Add latest changes Change the organization of the integration builds Nov 16, 2017
Copy link
Collaborator

@Duhemm Duhemm left a comment

Choose a reason for hiding this comment

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

LGTM!

case sc if (sc startsWith "2.10.") => "compiler-bridge_2.10"
case sc if (sc startsWith "2.11.") => "compiler-bridge_2.11"
case sc if (sc startsWith "2.12.") => "compiler-bridge_2.12"
case _ => "compiler-bridge_2.13"
Copy link
Collaborator

Choose a reason for hiding this comment

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

It would be cool to support Dotty too someday. Maybe that we should put the compiler bridge source in the configuration file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thought about the same 😄. Sounds good to me, mind opening a ticket?

@Duhemm Duhemm merged commit 806ae96 into master Nov 16, 2017
@Duhemm Duhemm mentioned this pull request Nov 17, 2017
tpasternak pushed a commit to tpasternak/bloop that referenced this pull request Dec 23, 2021
* Remove sockets module

* Use ipcsocket fork

* Use ipcsocket tweaked fork

* Empty commit to trigger CI

* Empty commit to trigger CI

* Empty commit to trigger CI
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants