Fixes part of #59: Model module builds with both Bazel + Gradle #1481

miaboloix · 2020-07-17T15:19:25Z

Explanation

Fixes part of #59: Model module builds with both Bazel + Gradle
As part of the first step towards migrating to Bazel, I have added a root WORKSPACE file that imports the external dependencies necessary to begin building with Bazel. I have also added both a root BUILD file and a /model module BUILD file.

To build the /model module in Bazel: bazel build //model

Note:

Gradle seems to fail when Bazel build artifacts are present. Be sure to remove them before building Gradle by running bazel clean
Bazel convention states build files should be named BUILD but because we are working alongside Gradle, following this convention causes naming conflicts with existing Gradle files. So, to solve this, all BUILD files will be named BUILD.bazel until we are completely moved off of Gradle. See Change Bazel BUILD file names post-Gradle #1532.
Here is a link to instructions on how to set up Bazel: https://docs.google.com/document/d/1V0RMehfi3GLVsZ6dyin1nTo4_TO28LACp4wPlEnvnM0/edit?usp=sharing.

Checklist

The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
The PR follows the style guide.
The PR does not contain any unnecessary auto-generated code from Android Studio.
The PR is made from a branch that's not called "develop".
The PR is made from a branch that is up-to-date with "develop".
The PR's branch is based on "develop" and not on any other branch.
The PR is assigned to an appropriate reviewer in both the Assignees and the Reviewers sections.

… develop

BenHenning

Thanks @miaboloix! Do we need the top-level BUILD.bazel file?

WORKSPACE

model/BUILD.bazel

model/src/main/proto/preprocess_protos.bzl

BenHenning · 2020-07-18T03:33:07Z

Also: branch names should follow the format:

<action-verb>-and-additional-details

E.g. update-state-fragment-tests or stabilize-app-startup-state-controller-tests

… stage1_bazel

anandwana001

LGTM
just a nit update, update the PR description from model_lib to model as we had updated the android_library name = "model",

… stage1_bazel

BenHenning

Just one comment.

model/src/main/proto/format_import_proto_library.bzl

BenHenning · 2020-07-29T20:29:08Z

@miaboloix I count 5 open threads that require a response and potentially some follow-up. Please re-assign once done.

Also regarding your earlier question, let's keep the branch name as-is & use the established convention for future branches.

miaboloix · 2020-07-29T22:20:05Z

LGTM
just a nit update, update the PR description from model_lib to model as we had updated the android_library name = "model",

Done!

miaboloix · 2020-07-29T22:28:39Z

Thanks @miaboloix! Do we need the top-level BUILD.bazel file?

Technically not until we start working on the binary. Just deleted it!

BenHenning

Thanks @miaboloix! This LGTM!

… stage1_bazel

…+ Gradle [BLOCKED: #1481] (#1482) * Working on having one module build with bazel * Created initial app-level WORKSPACE file * Added proto_library rule to build model app module * Added newline at end of WORKSPACE file * Created macro to process proto files * Both Bazel and Gradle now build /model successfully * Fixed typo in BUILD * Added missing end of file empty lines * Added Robolectric dependencies and general build rule * Source files building in both systems - added a TODO for test files * Turned two kt_android_library rules into one * Added dependencies for test files * Added a test manifest for android_local_test() * Added Firebase dependencies and git_repository for tools_android * Refactored google-services.json, imported new dependencies * Fixed Bens nits * Fixed space in WORKSPACE comment * Got a demo test working in both Java and Kotlin * Added rules_java dependencies for protocol buffers * Added java_proto_library rules, each proto file now has its own rule * Remove unnecessary srcs attribute for android_library * Rename bzl file macro * Changed to java_lite * Each library now has its own build rule * Utility is now one rule * Changed visibility for utility_lib * Added duplicate google-services.json file to please Gradle * Changed event_logger.proto to oppia_logger.proto * Added missing EOF newlines * Fixed bug in import statements for exploration.proto, topic.proto, and question.proto * Deleted DemoJava * CHanged rules_kotlin version * Added Firebase dependencies * Removed AsyncResultTest example * Removed unnecessary comments in WORKSPACE and moved rules_kotlin * Added re-naming TODOs * Renamed java_proto rules java_proto_lite * Added doc comments to model/BUILD.bazel and format_import_proto_library * Added comments to WORKSPACE file * Fixed nits * Added comment to kt_android_library() rule * Fixed more nits * Added Firebase comment * Changed library name to model * Formatted WORKSPACE comment * Formatted TODO statement * Changed format_import_proto_library comment * Added EOF newline * Created Issue and linked TODO in WORKSPACE * Edited model BUILD file top comment * Addressed nits * Fixed nits and added comments * Fixing nits * Deleted unnecessary dependencies and testing example file * Fixed manifest issues * Move google json file * Restore app version of json * Edit TODO * Deleted TODO * Changed Firebase comment * Added targetSDK to manifests * Changed crashlytics_lib to crashlytics * Fixed nits and added TODOs * Changed targetSDK to 29 * Formatted TODO * Moved google-services.json * Added gogle-services.json back to app * Formatted dependencies and removed unused dependency * Updated dependency list * Fixed the duplicate google-services.json issue * Created Issue and added TODO * Changed targetSdk to 28

miaboloix added 10 commits June 29, 2020 16:18

Working on having one module build with bazel

d68f0a9

Merge branch 'develop' of https://github.com/oppia/oppia-android into…

3115352

… develop

Merge branch 'develop' of https://github.com/oppia/oppia-android into…

897bf6d

… develop

Created initial app-level WORKSPACE file

37a13f8

Added proto_library rule to build model app module

f522846

Added newline at end of WORKSPACE file

372deae

Created macro to process proto files

5c0b6f5

Both Bazel and Gradle now build /model successfully

9408e27

Fixed typo in BUILD

7d44fea

Added missing end of file empty lines

5c44743

miaboloix requested review from BenHenning and anandwana001 July 17, 2020 15:19

miaboloix assigned BenHenning and anandwana001 Jul 17, 2020

miaboloix mentioned this pull request Jul 17, 2020

Fixes part of #59: Utility module source files build with both Bazel + Gradle [BLOCKED: #1481] #1482

Merged

8 tasks

BenHenning requested changes Jul 18, 2020

View reviewed changes

BenHenning assigned miaboloix and unassigned BenHenning Jul 18, 2020

miaboloix added 6 commits July 20, 2020 12:04

Fixed Bens nits

fa16eb4

Fixed space in WORKSPACE comment

5d31b5c

Added rules_java dependencies for protocol buffers

1c982a9

Added java_proto_library rules, each proto file now has its own rule

a7346e1

Remove unnecessary srcs attribute for android_library

6fc021b

Rename bzl file macro

b3d55e8

miaboloix assigned BenHenning and unassigned miaboloix Jul 21, 2020

miaboloix added 3 commits July 21, 2020 14:03

Changed to java_lite

a8fe758

Merge branch 'develop' of https://github.com/oppia/oppia-android into…

d4d40c2

… stage1_bazel

Changed event_logger.proto to oppia_logger.proto

94213cd

miaboloix added 5 commits July 28, 2020 16:29

Changed format_import_proto_library comment

9fc0d53

Added EOF newline

fdcb154

Created Issue and linked TODO in WORKSPACE

8185bdd

Edited model BUILD file top comment

3d21d6f

Addressed nits

8e368b4

miaboloix assigned anandwana001 and unassigned miaboloix Jul 28, 2020

anandwana001 approved these changes Jul 29, 2020

View reviewed changes

Merge branch 'develop' of https://github.com/oppia/oppia-android into…

32ce87a

… stage1_bazel

miaboloix assigned BenHenning Jul 29, 2020

BenHenning approved these changes Jul 29, 2020

View reviewed changes

model/src/main/proto/format_import_proto_library.bzl Outdated Show resolved Hide resolved

BenHenning assigned miaboloix and unassigned BenHenning Jul 29, 2020

Fixed nits and added TODOs

65f13c1

miaboloix assigned BenHenning and unassigned miaboloix Jul 29, 2020

BenHenning approved these changes Jul 30, 2020

View reviewed changes

BenHenning assigned miaboloix and unassigned BenHenning Jul 30, 2020

anandwana001 removed their assignment Jul 30, 2020

miaboloix and others added 2 commits July 30, 2020 10:16

Merge branch 'develop' of https://github.com/oppia/oppia-android into…

3638d43

… stage1_bazel

Merge branch 'develop' into stage1_bazel

18c0f6d

miaboloix merged commit 61f99cc into develop Aug 5, 2020

miaboloix deleted the stage1_bazel branch August 5, 2020 14:15

miaboloix added the Bazel Stage 1 label Aug 10, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes part of #59: Model module builds with both Bazel + Gradle #1481

Fixes part of #59: Model module builds with both Bazel + Gradle #1481

miaboloix commented Jul 17, 2020 •

edited

Loading

BenHenning left a comment

BenHenning commented Jul 18, 2020

anandwana001 left a comment

BenHenning left a comment

BenHenning commented Jul 29, 2020

miaboloix commented Jul 29, 2020

miaboloix commented Jul 29, 2020 •

edited

Loading

BenHenning left a comment

Fixes part of #59: Model module builds with both Bazel + Gradle #1481

Fixes part of #59: Model module builds with both Bazel + Gradle #1481

Conversation

miaboloix commented Jul 17, 2020 • edited Loading

Explanation

Checklist

BenHenning left a comment

Choose a reason for hiding this comment

BenHenning commented Jul 18, 2020

anandwana001 left a comment

Choose a reason for hiding this comment

BenHenning left a comment

Choose a reason for hiding this comment

BenHenning commented Jul 29, 2020

miaboloix commented Jul 29, 2020

miaboloix commented Jul 29, 2020 • edited Loading

BenHenning left a comment

Choose a reason for hiding this comment

miaboloix commented Jul 17, 2020 •

edited

Loading

miaboloix commented Jul 29, 2020 •

edited

Loading