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

Incorporate lessons learned from latest publishing. #693

Merged
merged 49 commits into from
Oct 11, 2018

Conversation

ucbjrl
Copy link
Contributor

@ucbjrl ucbjrl commented Sep 15, 2017

Changes to sbt incorporated from release branch. This is not strictly required, but is an attempt to keep master and release branches relatively in sync.

ucbjrl and others added 30 commits May 13, 2016 16:05
…o 3.0-BETA-SNAPSHOT so we can update "in-place".
being lost in Driver.execute before firrtl is called.
Replace ambiguous bi-connect ("<>") with mono-connect (":=") for internal Pipe wiring.
(cherry picked from commit 0d121a2)

bump version
# Conflicts:
#	build.sbt
build.sbt Outdated

// Provide a managed dependency on X if -DXVersion="" is supplied on the command line.
libraryDependencies ++= (Seq("firrtl").map {
dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep)) }),
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this line be tabbed?

Copy link
Contributor

Choose a reason for hiding this comment

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

Agree, this should be tabbed

Copy link
Contributor

@ducky64 ducky64 left a comment

Choose a reason for hiding this comment

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

Mostly looks reasonable, two style comments.

build.sbt Outdated

// Provide a managed dependency on X if -DXVersion="" is supplied on the command line.
libraryDependencies ++= (Seq("firrtl").map {
dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep)) }),
Copy link
Contributor

Choose a reason for hiding this comment

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

Agree, this should be tabbed

build.sbt Outdated

// Provide a managed dependency on X if -DXVersion="" is supplied on the command line.
libraryDependencies ++= (Seq("firrtl").map {
dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep)) }),
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you also merge the dep into the rest of them? Unless you anticipate dependencies on more than just firrtl, that map really isn't doing much.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right. It was mostly to preserve style with the other repos where the map includes more/all of the BIG4.

@ducky64 ducky64 requested a review from a team as a code owner October 5, 2018 20:45
Copy link
Contributor

@ducky64 ducky64 left a comment

Choose a reason for hiding this comment

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

Not completely sure what this does but it looks sane.

@ucbjrl ucbjrl merged commit 10d5472 into master Oct 11, 2018
@ucbjrl ucbjrl deleted the update_build.sbt_from_release branch October 11, 2018 16:29
@ucbjrl ucbjrl added this to the 3.1.4 milestone Nov 30, 2018
@ucbjrl ucbjrl modified the milestones: 3.1.4, 3.1.2 Dec 11, 2018
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.

4 participants