Scala2_12 merge from master #435
Conversation
* jmh normalizes jar timestamps build_is_identical e2e test spits out differences in md5 * change jar creator to default to normalizing timestamps
build_is_identical stabilization
…lbuild#409) When executing non-locally, the wrong version of Java would be used, referencing a path that didn't exist. This change adds the _java_runtime attribute to have to locate the java runtime on the machine where the Scala code is being executed, and selects the correct configuration for the host_javabase. As a minor cleanup, this also removes the now no-longer-necessary _java attribute. TESTED=Ran unit tests and also ran a custom Scala unit test through: previously, the Scala unit test failed with an incorrect java path error, now it passes. Change-Id: I9c2829bded04ec2d9d014094bd9e72cd984fe6e6
The IntelliJ plugin assumes that source_jar and source_jars are both present on the jars struct. This sets those to empty values, so the IntelliJ plugin does not fail.
Without it, builds fail on Windows as it uses semi-colon instead.
* use transitive_proto_path_flags if exist * Update scala_proto.bzl
…rap-code Compile reporter using very strict settings
Add default javac opts when compiling java srcs
…_path adjust transitive_proto_path_flags skylark name to transitive_proto_path
|
So there's good news and bad news. 👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there. 😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request. Note to project maintainer: This is a terminal state, meaning the |
|
If we force push we will break shas that other people are using. I really don’t want to force push a publicly advertised branch. Can we not use merge and avoid force push? |
This enables targets that are files to be used with scala_import. For example if you have a jar checked into your repository, you can use that with scala_import.
|
@johnynek so just regular merge? |
or-shachar
changed the title
|
Or,
I suggest just to use a new branch for now each time.
2.12_date
…On Tue, 6 Mar 2018 at 14:32 Or Shachar ***@***.***> wrote:
Reopened #435 <#435>.
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#435 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/ABUIF0l8oBPPJ-2oQQVkMunH5NhtSyGbks5tboH0gaJpZM4SbSl9>
.
|
might need to force push it. @johnynek - do I have permissions to do it?