Upstream cgruber/rules_kotlin changes to main repo. #205

cgruber · 2019-10-03T07:02:46Z

No description provided.

…precated (for this use-case anyway) `deps=`

* deps-to-exports: Make the no-srcs android_library use `exports=` instead of the now-deprecated (for this use-case anyway) `deps=` Add IntelliJ With Blaze and AndroidStudio With Blaze files to gitignore.

…e_no_les_dos * upstream/legacy-1.2-support: Add renovate.json (bazelbuild#176) Have the no-srcs android_library in android.bzl use exports= instead of deps= (bazelbuild#153) Fix mixed UTF-8 Java and Kotlin builds (bazelbuild#178) update bazel toolchains pin and add toolchain config target (bazelbuild#177) Update README.md Update bazel-toolchains (bazelbuild#173) Create CODEOWNERS (bazelbuild#171) Fix http_jar Cleanup for Bazel incompatible changes (bazelbuild#169) Run Buildifier to reformat files and apply automated fixes (bazelbuild#166) Update bazel-toolchains pin (bazelbuild#168) Update bazel_toolchains pin. (bazelbuild#157) Use Skylark version of http_archive. (bazelbuild#155) Update bazel-toolchains pin. (bazelbuild#154)

* upstream/master: Don't test on Ubuntu 14.04 (bazelbuild#183) Update deps for 0.26.0. (bazelbuild#191) update pin to bazel toolchains repo (bazelbuild#184) Update README.md Create ROADMAP.md

…shade dagger, avoiding leakage of the bytecode from the builder into compilation jobs peformed by the builder. Fixes bazelbuild#192

Shade dagger dep, to avoid leaking into a kapt dagger compilation.

…path. Currently, because there's no strict deps mechanism, that means basically use the full transitive closure. This fixes (or works around) but bazelbuild#132

… ctx.attr.runtime_deps is a list of deps, not a list of javainfos.

Make the compile time classpath use the full transitive compile classpath

Ensure that the runtime deps pass along their javainfo if present

Exposes a toolchain function (define_kt_toolchain) to allow the specification of non-default chains. Sets the default chain to 1.3.21. Removes the now-removed use-coroutines flag, which is permanently on. This also sets the compiler to permit use of experimental APIs. This is needed for people migrating from the older experimental coroutines to the new ones, during migration. This should be configurable, but for now it's just set. Also fixes up some tests and does some minor cleaning. Fixes bazelbuild#159 > Note: This no longer supports using pre-1.3 kotlinc distributions. You can make a toolchain that sets the language and api levels to 1.3, but you must use a 1.3+ kotlinc.

…iemntal versions. Regenerate the deps.

Enable Kotlin 1.3 in the rules_kotlin.

…lease.

Update the readme to include information about the fork and recent re…

Minor edit to the readme.

…er option. Fixes #10.

…ction()

Use modern APIs to unblock 0.27.0

Update for release legacy-modded-0.26.1-02

…explicitly opened usages. Also make sure older JVMs just ignore these options if they don't know about them.

Quiesce Java9+ module warnings about reflective access

…ons, and generate a compatibility matrix.

…new version testing here.

Add a test script to measure compatibility with various bazel versions.

googlebot · 2019-10-03T07:03:06Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-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 by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

cgruber · 2019-10-03T07:05:50Z

To preserve the history, I plan on doing a proper merge, from the command line, rather than a squash-and-merge.

cgruber · 2019-10-03T14:00:14Z

Also, the goal here is to merge the branch mostly as-is, with subsequent clean-ups based on suggestions, if any.

cgruber · 2019-10-03T16:50:19Z

@pbsf and @puffnfresh, could you please do the consent message thing from the google cla bot above?

pbsf · 2019-10-03T19:48:23Z

@googlebot I consent.

puffnfresh · 2019-10-04T02:43:25Z

@googlebot I consent.

googlebot · 2019-10-04T02:43:44Z

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

CHANGELOG.md

README.md

third_party/jarjar.bzl

src/main/kotlin/BUILD

scripts/test_version_utils.kt

scripts/test_version.kts

jin · 2019-10-04T22:14:15Z

kotlin/internal/jvm/impl.bzl

-        if jar.basename in source_tally:
-            artifacts += [struct(class_jar = jar, source_jar = source_tally[jar.basename], ijar = None)]
-        else:
-            artifacts += [struct(class_jar = jar, ijar = None)]


this no longer exists, but shouldn't this be needed to align the source jar to the actual jar if you're using the jars attr to import more than one pair of jars?

But you're not pulling in more than one pair of jars - jars= can only take in one real jar and one source jar. If you have more than one non-source jar and optionally one source jar, it should blow up, so this alignment isn't necessary (and you get the behaviour around the one pair you do get in the function call I extracted out.)

Co-Authored-By: Jin <jin@users.noreply.github.com>

… already been moved to another repo.

cgruber · 2019-10-05T17:54:40Z

Ok, I think I got all the comments addressed so far. @jin - was it just you doing the review, or were thomas and others going to pile in (they're auto-listed, and I didn't want to mess with the reviewers list)

jin

LGTM

Let's wait for @djwhang and/or @timpeut to take a look at this as well

timpeut

Thanks for this!

scripts/noop.sh

cgruber and others added 30 commits October 23, 2018 15:43

Add IntelliJ With Blaze and AndroidStudio With Blaze files to gitignore.

b00b362

Make the no-srcs android_library use exports= instead of the now-de…

c5c3503

…precated (for this use-case anyway) `deps=`

Make sure testonly is plumbed through the android rules.

d1151b4

Merge branch 'deps-to-exports' into porque_no_les_dos

3414166

* deps-to-exports: Make the no-srcs android_library use `exports=` instead of the now-deprecated (for this use-case anyway) `deps=` Add IntelliJ With Blaze and AndroidStudio With Blaze files to gitignore.

Merge remote-tracking branch 'upstream/master' into legacy_continued

d97374f

* upstream/master: Don't test on Ubuntu 14.04 (bazelbuild#183) Update deps for 0.26.0. (bazelbuild#191) update pin to bazel toolchains repo (bazelbuild#184) Update README.md Create ROADMAP.md

Update maven dependencies, and invoke jarjar on the kotlinbuilder to …

2038046

…shade dagger, avoiding leakage of the bytecode from the builder into compilation jobs peformed by the builder. Fixes bazelbuild#192

Merge pull request #4 from cgruber/dagger_jarjar

aaa819c

Shade dagger dep, to avoid leaking into a kapt dagger compilation.

Make the compile time classpath use the full transitive compile class…

2d86189

…path. Currently, because there's no strict deps mechanism, that means basically use the full transitive closure. This fixes (or works around) but bazelbuild#132

Ensure that the runtime deps pass along their javainfo if present, as…

9198f14

… ctx.attr.runtime_deps is a list of deps, not a list of javainfos.

Merge pull request #5 from cgruber/restore_transitive_compile_time_jars

fc3c0db

Make the compile time classpath use the full transitive compile classpath

Merge pull request #6 from cgruber/various_fixes

7cb4645

Ensure that the runtime deps pass along their javainfo if present

Eliminate deprecated usage of readBytes(int)

b6d5602

Upgrade the coffee app and move coroutines to the released, non-exper…

481fe1c

…iemntal versions. Regenerate the deps.

Merge pull request #7 from cgruber/kotlin_1_3

cde6391

Enable Kotlin 1.3 in the rules_kotlin.

Update the readme to include information about the fork and recent re…

ec81534

…lease.

Merge pull request #8 from cgruber/update_readme

87111f6

Update the readme to include information about the fork and recent re…

Minor edit to the readme.

c34577b

Merge pull request #9 from cgruber/cgruber-patch-1

b92db6f

Minor edit to the readme.

Use the proper allow_single_file instead of the obsolete dual-paramet…

4ed7992

…er option. Fixes #10.

Use the more modern ctx.actions.run() instead of the deprecated ctx.a…

b3ab49b

…ction()

Merge pull request #11 from cgruber/fix_obsolete_api

200802f

Use modern APIs to unblock 0.27.0

Update for release legacy-modded-0.26.1-02

0d03f6a

Merge pull request #12 from cgruber/cgruber-patch-1

cc9b150

Update for release legacy-modded-0.26.1-02

Quiesce Java9+ module warnings about reflective access, as these are …

f7ec687

…explicitly opened usages. Also make sure older JVMs just ignore these options if they don't know about them.

Merge pull request #15 from cgruber/quiesce_module_warnings

ecc8957

Quiesce Java9+ module warnings about reflective access

Add a script to test the current repo state with a set of bazel versi…

3f9752c

…ons, and generate a compatibility matrix.

Fix teh formatting a bit, and remove errors, since I'll actually put …

9d36ada

…new version testing here.

Merge pull request #16 from cgruber/test_script

347a34a

Add a test script to measure compatibility with various bazel versions.

cgruber requested review from git-str, thomaswk and timpeut as code owners October 3, 2019 07:02

cgruber self-assigned this Oct 3, 2019

cgruber changed the title ~~Prepare for upstream~~ Upstream cgruber/rules_kotlin changes to main repo. Oct 3, 2019

jin reviewed Oct 4, 2019

View reviewed changes

cgruber and others added 4 commits October 5, 2019 10:24

Update scripts/test_version_utils.kt

2b83aa2

Co-Authored-By: Jin <jin@users.noreply.github.com>

Fixes to the readme, per code review.

dc3e670

Remove script which (a) isn't needed given the CI matrix, and (b) has…

e1e1e9d

… already been moved to another repo.

remove unused import.

669a4ee

jin approved these changes Oct 6, 2019

View reviewed changes

timpeut approved these changes Oct 10, 2019

View reviewed changes

scripts/noop.sh Outdated Show resolved Hide resolved

Newline at end of file, per review comment.

8ca9485

cgruber merged commit 8ca9485 into bazelbuild:master Oct 10, 2019

github-pages bot temporarily deployed to github-pages October 10, 2019 04:03 Inactive

cgruber deleted the prepare_for_upstream branch October 10, 2019 04:03

This was referenced Oct 10, 2019

Merge cgruber's fork into the main upstream repository #204

Closed

Transitive dependencies missing in compilation #132

Closed

Kotlin 1.3 support #159

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upstream cgruber/rules_kotlin changes to main repo. #205

Upstream cgruber/rules_kotlin changes to main repo. #205

cgruber commented Oct 3, 2019

googlebot commented Oct 3, 2019

cgruber commented Oct 3, 2019

cgruber commented Oct 3, 2019

cgruber commented Oct 3, 2019

pbsf commented Oct 3, 2019

puffnfresh commented Oct 4, 2019

googlebot commented Oct 4, 2019

jin Oct 4, 2019

cgruber Oct 5, 2019 •

edited

Loading

cgruber commented Oct 5, 2019

jin left a comment

timpeut left a comment

Upstream cgruber/rules_kotlin changes to main repo. #205

Upstream cgruber/rules_kotlin changes to main repo. #205

Conversation

cgruber commented Oct 3, 2019

googlebot commented Oct 3, 2019

cgruber commented Oct 3, 2019

cgruber commented Oct 3, 2019

cgruber commented Oct 3, 2019

pbsf commented Oct 3, 2019

puffnfresh commented Oct 4, 2019

googlebot commented Oct 4, 2019

jin Oct 4, 2019

Choose a reason for hiding this comment

cgruber Oct 5, 2019 • edited Loading

Choose a reason for hiding this comment

cgruber commented Oct 5, 2019

jin left a comment

Choose a reason for hiding this comment

timpeut left a comment

Choose a reason for hiding this comment

cgruber Oct 5, 2019 •

edited

Loading