Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
## Explanation Fixes #5658 It seems that there was an incompatibility introduced with older ``rules_java`` in the AS Bazel plugin (see bazelbuild/intellij#6474 for a related issue, though I'm unsure as to the exact change in the plugin that caused this). The fix essentially moves the app's ``rules_java`` initialization (which _is_ compatible with the plugin) to be before initializing ``oppia_proto_api`` since that uses an old version of ``rules_java``: https://github.com/oppia/oppia-proto-api/blob/f6d167c5de636edf941e366dc9a6ca6b2bf20e89/repo/versions.bzl#L35-L39. Since the WORKSPACE resolves as "first declaration wins" the order swap fixes the issue without introducing any cross-dependency incompatibilities. ## Essential Checklist - [x] The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".) - [x] Any changes to [scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets) files have their rationale included in the PR explanation. - [x] The PR follows the [style guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide). - [x] The PR does not contain any unnecessary code changes from Android Studio ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)). - [x] The PR is made from a branch that's **not** called "develop" and is up-to-date with "develop". - [x] The PR is **assigned** to the appropriate reviewers ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)). ## For UI-specific PRs only N/A -- this is an infrastructure change only.
- Loading branch information