Fix regression introduced in #271 for legacy use of "jars" in kt_jvm_import #276
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jin
approved these changes
Feb 14, 2020
cromwellian
pushed a commit
to cromwellian/rules_kotlin
that referenced
this pull request
Mar 7, 2020
cgruber
added a commit
to cgruber/rules_kotlin
that referenced
this pull request
Apr 14, 2020
* upstream/master: Fix non-reproducible archives (bazelbuild#304) Adds a kt_plugin rule (bazelbuild#308) Ensure that KotlionBuilder workers use a clean directory for each compilation. (bazelbuild#298) Apply autoformatting to all files. (bazelbuild#302) Optional outputs (bazelbuild#291) Change plugins to use depsets, as opposed to lists. (bazelbuild#292) Add Corbin to the codeowners. (bazelbuild#293) Update Protobuf to 3.11.3 (bazelbuild#286) Remove tree artifacts (bazelbuild#287) Cleanup src tree (bazelbuild#288) Update README.md (bazelbuild#285) Filter non-kotlin code out of generated sources (bazelbuild#263) Update readme so the dev instructions highlight using a local clone (bazelbuild#283) Remove third_party checked in jars, and properly pull maven dependencies. (bazelbuild#279) Only propagate srcjar if it isn't the default empty jar added in ae70089 to fix bazelbuild/intellij#1616 (bazelbuild#276) Allow resources to be in a kotlin directory (bazelbuild#268)
jongerrish
added a commit
to jongerrish/rules_kotlin
that referenced
this pull request
Apr 16, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Only propagate srcjar if it isn't the default empty jar added in ae70089 to fix bazelbuild/intellij#1616
This fixes a regression introduced in #271, which fixes a bug in intellij by adding a default srcjar if there isn't one. This broke legacy handling of the
jars=attribute in kt_jvm_import, when the importedjars=attribute had a-sources.jarin the resulting files. By not using srcjar you get the default, plus you get the extra -sources.jar, which blows up the "only one source jar" assertion. This just only propagatessrcjarinto the legacy handling IF it isn't the default value.Also remove a print statement that leaked in, and fix a bad type issue in the fail() of the above-mentioned assertion code, which was surfaced when this mode came into existence.
This only occurs when using
kt_jvm_import(jars=), which is already legacy and slated for removal. We may just rip out the facility, but for now, we support it.