Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to new third party structure #4920

Closed
wants to merge 329 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
329 commits
Select commit Hold shift + click to select a range
e44b59d
Address TODOs as part of the migration.
BenHenning Apr 3, 2023
d2df104
Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow
BenHenning Apr 3, 2023
3b7df64
Post-merge fixes.
BenHenning Apr 3, 2023
a40f75a
Update build stats workflow.
BenHenning Apr 3, 2023
227b0f4
Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze…
BenHenning Apr 3, 2023
6e747dc
Fix Proguard breakages & post-merge fixes.
BenHenning Apr 3, 2023
83cab6f
Merge branch 'migrate-to-newer-bazel-and-kotlin' into migrate-to-new-…
BenHenning Apr 3, 2023
10378e6
Post-merge fixes.
BenHenning Apr 4, 2023
aa34602
Split up WORKSPACE.
BenHenning Apr 5, 2023
ca5acf3
Split app & scripts deps.
BenHenning Apr 5, 2023
3b9ae0e
Add version verification script.
BenHenning Apr 6, 2023
54dadc9
Remove reflection from prod app deps.
BenHenning Apr 7, 2023
7892fbd
Align Gradle & Bazel dep versions.
BenHenning Apr 7, 2023
30665f5
Streamline library exporting & version divisions.
BenHenning Apr 8, 2023
b0bccca
Fix a bunch of stuff.
BenHenning Apr 9, 2023
8ffa785
Simplify builds.
BenHenning Apr 10, 2023
a69cad7
Fix new validation check & add it to CI.
BenHenning Apr 11, 2023
4feb744
Update Maven deps, wiki page, and checks.
BenHenning Apr 11, 2023
5e86153
Fix static & lint checks.
BenHenning Apr 11, 2023
9cc6568
Fix remaining builds & checks.
BenHenning Apr 11, 2023
c624985
Upgrade coroutines core to 1.6.4.
BenHenning Apr 25, 2023
8a19b4e
Merge branch 'develop' into upgrade-compute-affected-tests
BenHenning May 11, 2023
773f7ff
Fix breakage from develop.
BenHenning May 11, 2023
311951f
Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e…
BenHenning May 11, 2023
9e377d5
Merge branch 'update-rules-jvm-external' into update-dagger-structure
BenHenning May 12, 2023
f087488
Merge branch 'update-dagger-structure' into upgrade-to-kotlin1.6
BenHenning May 12, 2023
413952c
Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow
BenHenning May 12, 2023
e80d869
Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze…
BenHenning May 12, 2023
a7fffec
Upgrade to 6.2.0.
BenHenning May 12, 2023
bc2acb4
Merge branch 'migrate-to-newer-bazel-and-kotlin' into migrate-to-new-…
BenHenning May 12, 2023
e7435a5
Fix hanging CoroutineExecutorService test.
BenHenning May 12, 2023
0b4fefa
Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow
BenHenning May 12, 2023
c0b3894
Permant-ify temporary TODOs for new tests.
BenHenning May 12, 2023
ec33a12
Upgrade runner for build stats.
BenHenning May 12, 2023
8a8101b
Fix broken Gradle build.
BenHenning May 12, 2023
d629d71
Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow
BenHenning May 12, 2023
e5eb517
Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze…
BenHenning May 12, 2023
fb3ebc6
Fix CI configs.
BenHenning May 12, 2023
1adcffa
Merge branch 'migrate-to-newer-bazel-and-kotlin' into migrate-to-new-…
BenHenning May 12, 2023
6fc9216
Clean up temporary TODOs.
BenHenning May 12, 2023
81bc6ab
Merge branch 'migrate-to-newer-bazel-and-kotlin' into migrate-to-new-…
BenHenning May 12, 2023
709e3eb
Fix/permanent-ify temporary TODOs.
BenHenning May 13, 2023
afbe6e6
Fix issue with compute stats workflow.
BenHenning May 13, 2023
070410b
Merge branch 'migrate-to-newer-bazel-and-kotlin' into migrate-to-new-…
BenHenning May 13, 2023
02d116e
Fix Guava Maven reference.
BenHenning May 13, 2023
88763e2
Attempt 2 to fix new Bazel versions build stats.
BenHenning May 13, 2023
3cfdf26
Attempt (3).
BenHenning May 13, 2023
0097827
Attempt (3).
BenHenning May 13, 2023
b4802b7
Fix another regular 'apt' usage.
BenHenning May 13, 2023
6eccb18
Merge branch 'migrate-to-newer-bazel-and-kotlin' into migrate-to-new-…
BenHenning May 13, 2023
ac5a4f2
Fix broken CI checks.
BenHenning May 15, 2023
f87feed
Fix broken TestLogReportingModule.
BenHenning May 16, 2023
e372fbf
Fix broken tests.
BenHenning May 16, 2023
a726b19
Stabilize patch download from GitHub.
BenHenning May 16, 2023
525a601
Merge branch 'develop' into upgrade-compute-affected-tests
BenHenning Jun 6, 2023
6cca78f
Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e…
BenHenning Jun 6, 2023
327114d
Post-merge fixes.
BenHenning Jun 6, 2023
bb4ff28
Merge branch 'update-rules-jvm-external' into update-dagger-structure
BenHenning Jun 6, 2023
5d924f4
Post-merge fixes.
BenHenning Jun 6, 2023
8690354
Merge branch 'update-dagger-structure' into upgrade-to-kotlin1.6
BenHenning Jun 6, 2023
66bf94f
Post-merge fixes.
BenHenning Jun 6, 2023
667bf89
Fix a variety of dev platform-specific issues.
BenHenning Aug 22, 2023
fb59232
Tidy some things up, and revert fragment test.
BenHenning Aug 28, 2023
2551d4b
Fix test behavior inconsistency in test.
BenHenning Sep 11, 2023
714f3ea
Merge branch 'develop' into fix-platform-specific-issues
BenHenning Sep 11, 2023
7488b9f
Fix broken ProfileAndDeviceIdFragmentTest test.
BenHenning Sep 13, 2023
e3d4091
Merge branch 'develop' into fix-platform-specific-issues
BenHenning Oct 26, 2023
5671673
Post-merge fix.
BenHenning Oct 26, 2023
f5ed0c9
Merge branch 'fix-platform-specific-issues' into upgrade-compute-affe…
BenHenning Oct 26, 2023
bd1466d
Merge branch 'develop' into fix-platform-specific-issues
BenHenning Jan 16, 2024
d9b38ea
Merge branch 'fix-platform-specific-issues' into upgrade-compute-affe…
BenHenning Jan 16, 2024
9f1a2ec
Some follow-up post-merge fixes.
BenHenning Jan 17, 2024
39a3add
Make TodoOpenCheck locally runnable.
BenHenning Jan 18, 2024
4f7bfd6
Simplify GitHubIssue & some static fixes/docs.
BenHenning Jan 18, 2024
000bba3
Add ScriptBackgroundCoroutineDispatcher.
BenHenning Jan 18, 2024
79878cd
Some more robustness fixes.
BenHenning Jan 19, 2024
a5f71d6
Merge branch 'fix-platform-specific-issues' into introduce-better-scr…
BenHenning Jan 19, 2024
0b55bd4
Post-merge fixes.
BenHenning Jan 19, 2024
53d6727
Merge branch 'introduce-better-script-execution-support' into make-to…
BenHenning Jan 19, 2024
00c7c28
Post-merge fixes & adjustments.
BenHenning Jan 20, 2024
bd97611
Fix BUILD file lint issue.
BenHenning Jan 20, 2024
d54829d
Merge branch 'fix-platform-specific-issues' into introduce-better-scr…
BenHenning Jan 20, 2024
fa9cae4
Merge branch 'introduce-better-script-execution-support' into make-to…
BenHenning Jan 20, 2024
0618b12
Static fix checks.
BenHenning Jan 20, 2024
fb148ea
Merge branch 'make-todo-check-locally-runnable' into upgrade-compute-…
BenHenning Jan 20, 2024
ab326ff
Post-merge fixes.
BenHenning Jan 20, 2024
d5bfad5
Merge branch 'upgrade-compute-affected-tests' of github.com:oppia/opp…
BenHenning Jan 20, 2024
1067a18
Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e…
BenHenning Jan 20, 2024
1e2df14
Post-merge fixes.
BenHenning Jan 20, 2024
211487c
Merge branch 'develop' into fix-platform-specific-issues
BenHenning Feb 6, 2024
1a666a9
Post-merge fixes.
BenHenning Feb 6, 2024
a2ee5d3
Add smoke tests for instr. binaries & tests.
BenHenning Feb 7, 2024
d5b9012
Some minor refactoring for readability.
BenHenning Feb 7, 2024
e6ec869
Fixed broken instrumentation builds.
BenHenning Feb 7, 2024
9f50469
Merge branch 'develop' into fix-instrumentation-build-failure
BenHenning Feb 7, 2024
8dbf4dc
Add missing CODEOWNERS line.
BenHenning Feb 7, 2024
9c38057
Remove old files from CODEOWNERS.
BenHenning Feb 7, 2024
f2ff4e3
Merge branch 'fix-instrumentation-build-failure' into fix-platform-sp…
BenHenning Feb 7, 2024
fad48ed
Add missing tests for TestBlazeWorkspace changes.
BenHenning Feb 8, 2024
e1802c8
Add missing Firebase auth tests.
BenHenning Feb 8, 2024
00c32f6
Merge branch 'fix-instrumentation-build-failure' into fix-platform-sp…
BenHenning Feb 8, 2024
2f87f4d
Merge branch 'fix-platform-specific-issues' into introduce-better-scr…
BenHenning Feb 8, 2024
aa3547c
Merge branch 'introduce-better-script-execution-support' into make-to…
BenHenning Feb 8, 2024
d3cbd93
Post-merge fixes for previously missed tests.
BenHenning Feb 8, 2024
13e4358
Merge branch 'fix-platform-specific-issues' into introduce-better-scr…
BenHenning Feb 8, 2024
622aced
Merge branch 'introduce-better-script-execution-support' into make-to…
BenHenning Feb 8, 2024
50f41d2
Merge branch 'develop' into fix-instrumentation-build-failure
BenHenning Feb 8, 2024
c8df70e
Merge branch 'fix-instrumentation-build-failure' into fix-platform-sp…
BenHenning Feb 8, 2024
c85d421
Merge branch 'develop' into fix-instrumentation-build-failure
BenHenning Feb 9, 2024
dcf27b6
Merge branch 'fix-instrumentation-build-failure' into fix-platform-sp…
BenHenning Feb 9, 2024
2369514
Merge branch 'develop' into fix-platform-specific-issues
BenHenning Feb 9, 2024
c7ec5d4
Merge branch 'fix-platform-specific-issues' into introduce-better-scr…
BenHenning Feb 9, 2024
4b418bd
Merge branch 'introduce-better-script-execution-support' into make-to…
BenHenning Feb 9, 2024
d6a9f70
Merge branch 'make-todo-check-locally-runnable' into upgrade-compute-…
BenHenning Feb 9, 2024
8de4d51
Improve new test robustness.
BenHenning Feb 9, 2024
3f69f11
Fix updated Maven license deps.
BenHenning Feb 9, 2024
ea8e0b1
Merge branch 'introduce-better-script-execution-support' into make-to…
BenHenning Feb 9, 2024
2916770
Update scripts/src/javatests/org/oppia/android/scripts/common/GitClie…
BenHenning Feb 14, 2024
f2d810a
Merge branch 'develop' into fix-platform-specific-issues
BenHenning Feb 14, 2024
808f412
Merge branch 'fix-platform-specific-issues' into introduce-better-scr…
BenHenning Feb 14, 2024
2315aea
Merge branch 'introduce-better-script-execution-support' into make-to…
BenHenning Feb 14, 2024
af51395
Add tests for GitHubClient & TodoOpenCheck.
BenHenning Feb 14, 2024
6856e3c
Merge branch 'develop' into fix-platform-specific-issues
BenHenning Feb 14, 2024
5a050de
Merge branch 'fix-platform-specific-issues' into introduce-better-scr…
BenHenning Feb 14, 2024
13b8d4b
Merge branch 'introduce-better-script-execution-support' into make-to…
BenHenning Feb 14, 2024
280b3ec
Add missing docs.
BenHenning Feb 14, 2024
0bd7e2f
Merge branch 'make-todo-check-locally-runnable' into upgrade-compute-…
BenHenning Feb 14, 2024
5951c0f
Post-merge fixes.
BenHenning Feb 15, 2024
ee71b32
Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e…
BenHenning Feb 15, 2024
3627067
Update Maven dep list checker & updater scripts.
BenHenning Feb 15, 2024
a5eb624
Merge branch 'develop' into introduce-better-script-execution-support
BenHenning Feb 20, 2024
ae239b3
Merge branch 'introduce-better-script-execution-support' into make-to…
BenHenning Feb 20, 2024
34ea6aa
Fix broken TodoOpenCheck tests & check exemptions.
BenHenning Feb 20, 2024
df61985
Merge branch 'make-todo-check-locally-runnable' into upgrade-compute-…
BenHenning Feb 20, 2024
161ae8d
Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e…
BenHenning Feb 20, 2024
8c87993
Fix broken checks & failing static checks.
BenHenning Feb 22, 2024
bb6e681
Merge branch 'update-rules-jvm-external' into update-dagger-structure
BenHenning Feb 22, 2024
5c812a1
Post merge build, test, and static check fixes.
BenHenning Feb 23, 2024
57c275c
Merge branch 'update-dagger-structure' into upgrade-to-kotlin1.6
BenHenning Feb 23, 2024
e0e74d5
Merge branch 'develop' into introduce-better-script-execution-support
BenHenning Mar 4, 2024
2dd0cd7
Merge branch 'introduce-better-script-execution-support' into make-to…
BenHenning Mar 4, 2024
79a2f0f
Merge branch 'make-todo-check-locally-runnable' into upgrade-compute-…
BenHenning Mar 4, 2024
60458bf
Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e…
BenHenning Mar 4, 2024
228a037
Merge branch 'update-rules-jvm-external' into update-dagger-structure
BenHenning Mar 4, 2024
195d604
Some post-merge fixes.
BenHenning Mar 4, 2024
3bdd1e0
Merge branch 'update-dagger-structure' into upgrade-to-kotlin1.6
BenHenning Mar 4, 2024
7cd345b
Silence deprecation warnings.
BenHenning Mar 5, 2024
70df9b3
Merge branch 'develop' into introduce-better-script-execution-support
BenHenning Mar 14, 2024
04fc8b8
Merge branch 'introduce-better-script-execution-support' into make-to…
BenHenning Mar 14, 2024
c301eed
Address reviewer comment.
BenHenning Mar 14, 2024
51a96ce
Merge branch 'develop' into introduce-better-script-execution-support
seanlip Mar 15, 2024
b3e2fd9
Merge commit 'e2f94e41e4cba3bc5b5f3af65f7c43a6543b4c52' into introduc…
BenHenning Mar 20, 2024
73a8bce
Merge branch 'introduce-better-script-execution-support' into make-to…
BenHenning Mar 20, 2024
f48f78e
Merge branch 'develop' into make-todo-check-locally-runnable
BenHenning Mar 20, 2024
02ccc87
Merge branch 'develop' into make-todo-check-locally-runnable
BenHenning May 16, 2024
28fcb9d
Merge branch 'make-todo-check-locally-runnable' into upgrade-compute-…
BenHenning May 16, 2024
aa8988c
Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e…
BenHenning May 16, 2024
658c9f0
Merge branch 'update-rules-jvm-external' into update-dagger-structure
BenHenning May 16, 2024
53d42e1
Merge branch 'update-dagger-structure' into upgrade-to-kotlin1.6
BenHenning May 16, 2024
4cf06d4
Address self-review comments.
BenHenning May 16, 2024
0cc5d5d
Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e…
BenHenning May 17, 2024
c43c036
Address review comment.
BenHenning May 17, 2024
c30a839
Merge branch 'update-rules-jvm-external' into update-dagger-structure
BenHenning May 17, 2024
fbac9a2
Post-merge fixes.
BenHenning May 17, 2024
840de58
Merge branch 'update-dagger-structure' into upgrade-to-kotlin1.6
BenHenning May 17, 2024
ce2c34b
Fix NetworkLoggingInterceptorTest.
BenHenning May 20, 2024
0f48cf5
Fix more tests & upgrade Robolectric.
BenHenning May 20, 2024
caf6f28
Fix more broken tests.
BenHenning May 20, 2024
118d32f
Undo Robolectric upgrade.
BenHenning May 21, 2024
956b358
Upgrade to rules_kotlin 1.5.0 beta 3.
BenHenning May 21, 2024
dd84da3
Merge branch 'upgrade-to-newer-rules-kotlin' into upgrade-to-kotlin1.6
BenHenning May 21, 2024
f5c07fc
Fix build-time Kotlin & Java warnings.
BenHenning May 22, 2024
0429177
Fix a few follow-up issues.
BenHenning May 22, 2024
8dcb531
Merge branch 'fix-build-time-kotlin-java-warnings' into upgrade-to-ko…
BenHenning May 22, 2024
c24069b
Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow
BenHenning May 22, 2024
c2fee1b
Post-merge fixes.
BenHenning May 22, 2024
46c65e8
Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze…
BenHenning May 22, 2024
d99f1a2
Post-merge fix.
BenHenning May 22, 2024
31ffc28
Follow-up fixes & doc updates.
BenHenning May 22, 2024
3dc6b7b
Merge branch 'develop' into upgrade-compute-affected-tests
BenHenning May 22, 2024
acd1c0d
Merge branch 'develop' into upgrade-compute-affected-tests
BenHenning May 22, 2024
c672af0
Address reviewer comment.
BenHenning May 22, 2024
1b19f5b
Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e…
BenHenning May 22, 2024
3e923e2
Follow-up variable rename for clarity.
BenHenning May 22, 2024
9af41bd
Merge branch 'update-rules-jvm-external' into update-dagger-structure
BenHenning May 22, 2024
6100394
Merge branch 'update-dagger-structure' into upgrade-to-newer-rules-ko…
BenHenning May 22, 2024
b6c3ebe
Merge branch 'upgrade-to-newer-rules-kotlin' into fix-build-time-kotl…
BenHenning May 22, 2024
d3cea44
Merge branch 'fix-build-time-kotlin-java-warnings' into upgrade-to-ko…
BenHenning May 22, 2024
da57feb
Address static check failures.
BenHenning May 22, 2024
32733a0
Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow
BenHenning May 22, 2024
1a67dd6
Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze…
BenHenning May 22, 2024
441e293
Move forward TODO fixes from #4937.
BenHenning May 23, 2024
2f1eed7
Remove unused view model bridge classes.
BenHenning May 23, 2024
0c96f8d
Merge branch 'fix-build-time-kotlin-java-warnings' into upgrade-to-ko…
BenHenning May 23, 2024
afde202
Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow
BenHenning May 23, 2024
e57be5b
Rework CI workflow.
BenHenning May 24, 2024
a07d3a6
Address all reviewer comments.
BenHenning May 25, 2024
0b7d357
Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze…
BenHenning May 25, 2024
d2185a4
Address reviewer comments + other simplifications.
BenHenning May 26, 2024
785d408
Pull in other warning fixes from #4886.
BenHenning May 26, 2024
7ccba36
Merge branch 'fix-build-time-kotlin-java-warnings' into upgrade-to-ko…
BenHenning May 26, 2024
f74d059
Pulled forward Gradle change from #4886.
BenHenning May 26, 2024
baa2c50
Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow
BenHenning May 26, 2024
42ab459
Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze…
BenHenning May 26, 2024
455342b
Static check fixes.
BenHenning May 26, 2024
1ee44c7
Re-add missing newline.
BenHenning May 26, 2024
7951d46
Merge branch 'develop' into update-rules-jvm-external
BenHenning May 26, 2024
d4d8646
Merge branch 'develop' into update-rules-jvm-external
BenHenning May 27, 2024
b6cfd74
Merge branch 'update-rules-jvm-external' into update-dagger-structure
BenHenning May 27, 2024
0468e81
Merge branch 'develop' into update-dagger-structure
BenHenning May 27, 2024
47ad078
Merge branch 'update-dagger-structure' into upgrade-to-newer-rules-ko…
BenHenning May 27, 2024
828e43e
Merge branch 'upgrade-to-newer-rules-kotlin' into fix-build-time-kotl…
BenHenning May 27, 2024
eda781e
Merge branch 'fix-build-time-kotlin-java-warnings' into upgrade-to-ko…
BenHenning May 27, 2024
82c530a
Down version to 1.6.10.
BenHenning May 27, 2024
05bc1c2
Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow
BenHenning May 27, 2024
386a487
Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze…
BenHenning May 27, 2024
62795b1
Update third-party wrappers to use aliases.
BenHenning May 27, 2024
1a51da1
Update Troubleshooting-Installation.md
BenHenning May 27, 2024
7c186c3
Merge branch 'develop' into upgrade-to-newer-rules-kotlin
BenHenning May 28, 2024
dffff83
Merge branch 'upgrade-to-newer-rules-kotlin' into fix-build-time-kotl…
BenHenning May 28, 2024
bc79bf7
Address review comment.
BenHenning May 29, 2024
2d3f5d5
Merge branch 'develop' into fix-build-time-kotlin-java-warnings
BenHenning May 29, 2024
bc98d27
Merge branch 'fix-build-time-kotlin-java-warnings' into upgrade-to-ko…
BenHenning May 29, 2024
bacbc2a
Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow
BenHenning May 29, 2024
16af8e1
Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze…
BenHenning May 29, 2024
4b26fd5
Merge branch 'develop' into fix-build-time-kotlin-java-warnings
BenHenning Jun 3, 2024
fd69342
Merge branch 'fix-build-time-kotlin-java-warnings' into upgrade-to-ko…
BenHenning Jun 3, 2024
3dcc2ac
Merge branch 'develop' into fix-build-time-kotlin-java-warnings
BenHenning Jun 11, 2024
4cbf04c
Merge branch 'fix-build-time-kotlin-java-warnings' into upgrade-to-ko…
BenHenning Jun 11, 2024
f97c111
Add config for Kotlin warnings.
BenHenning Jun 11, 2024
e9ac7f3
Address reviewer comment.
BenHenning Jun 11, 2024
c1d6959
Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow
BenHenning Jun 11, 2024
5347c9b
Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze…
BenHenning Jun 11, 2024
e62a51e
Reconfigure Java in Bazel.
BenHenning Jun 11, 2024
bfb583b
Undo action.yml changes.
BenHenning Jun 11, 2024
3b682f0
Address lint failures.
BenHenning Jun 11, 2024
9af2662
Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow
BenHenning Jun 11, 2024
daf282f
Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze…
BenHenning Jun 11, 2024
89a184d
Merge branch 'develop' into upgrade-to-kotlin1.6
BenHenning Jun 12, 2024
cae201f
Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow
BenHenning Jun 12, 2024
62858bb
Merge branch 'develop' into add-build-stats-ci-workflow
BenHenning Jun 12, 2024
95671b5
Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze…
BenHenning Jun 12, 2024
9e4b083
Apply suggestions from code review
BenHenning Jun 13, 2024
4a7fc84
Merge commit 'add9f7475857dd428884c861aef5c7c9db58f890' into migrate-…
BenHenning Jun 21, 2024
3e9458a
Merge branch 'migrate-to-newer-bazel-and-kotlin' into migrate-to-new-…
BenHenning Jun 21, 2024
3d2e3b9
Merge branch 'develop' into migrate-to-new-third-party-structure
BenHenning Jun 21, 2024
9a7df6a
Post-merge lint fixes.
BenHenning Jun 21, 2024
aca0848
Post-merge dependency resolutions.
BenHenning Jun 21, 2024
ae90c90
Fixed scripts dependencies & other parts.
BenHenning Jun 21, 2024
d7fa24f
Fix remaining non-script failures.
BenHenning Jun 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@

# ---=============================== MODULES ==============================--- #



################################################################################
# app module #
################################################################################
Expand Down
25 changes: 20 additions & 5 deletions .github/workflows/static_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -197,17 +197,32 @@ jobs:
with:
version: 6.5.0

- name: Maven Repin Check
- name: Dependency validation (app dependencies)
if: always()
run: |
REPIN=1 bazel run @unpinned_maven//:pin
bazel run //scripts:validate_maven_dependencies -- $(pwd) third_party/versions/direct_maven_versions.bzl third_party/versions/transitive_maven_versions.bzl third_party/versions/maven_install.json //third_party //...

- name: Maven Dependencies Update Check
- name: Dependency validation (scripts dependencies)
if: always()
run: |
bazel run //scripts:maven_dependencies_list_check -- $(pwd) third_party/maven_install.json scripts/assets/maven_dependencies.pb
bazel run //scripts:validate_maven_dependencies -- $(pwd) scripts/third_party/versions/direct_maven_versions.bzl scripts/third_party/versions/transitive_maven_versions.bzl scripts/third_party/versions/maven_install.json //scripts/third_party //scripts/...

- name: License Texts Check
- name: Maven re-pin check (app dependencies)
if: always()
run: |
REPIN=1 bazel run @unpinned_maven_app//:pin

- name: Maven re-pin check (scripts dependencies)
if: always()
run: |
REPIN=1 bazel run @unpinned_maven_scripts//:pin

- name: Maven dependencies update check (app dependencies)
if: always()
run: |
bazel run //scripts:maven_dependencies_list_check -- $(pwd) third_party/versions/maven_install.json scripts/assets/maven_dependencies.pb

- name: License texts check
if: always()
run: |
bazel run //scripts:license_texts_check -- $(pwd)/app/src/main/res/values/third_party_dependencies.xml
18 changes: 13 additions & 5 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ exports_files(["config/kitkat_main_dex_class_list.txt"])
package_group(
name = "oppia_api_visibility",
packages = [
"-//scripts/...",
"-//third_party/...",
"//...",
],
)
Expand All @@ -33,13 +35,16 @@ package_group(
# test targets.
package_group(
name = "oppia_testing_visibility",
includes = [
"//app:app_testing_visibility",
"//domain:domain_testing_visibility",
"//scripts:oppia_script_test_visibility",
"//utility:utility_testing_visibility",
],
packages = [
"//app/...",
"//data/...",
"//domain/...",
"//instrumentation/...",
"//testing/...",
"//utility/...",
],
)

Expand Down Expand Up @@ -70,6 +75,9 @@ package_group(
":oppia_binary_visibility",
":oppia_testing_visibility",
],
packages = [
"//app/src/main/java/org/oppia/android/app/application/...",
],
)

# TODO(#1640): Move binary manifest to top-level package post-Gradle.
Expand Down Expand Up @@ -135,8 +143,8 @@ package_group(
# be installed on a local device or emulator using a 'bazel run' command like so:
# bazel run //:install_oppia_dev
[
define_oppia_aab_binary_flavor(flavor = flavor)
define_oppia_aab_binary_flavor(name = flavor)
for flavor in AVAILABLE_FLAVORS
]

dagger_rules()
dagger_rules(repo_name = "@maven_app")
256 changes: 35 additions & 221 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,241 +1,55 @@
"""
This file lists and imports all external dependencies needed to build Oppia Android.
This file initializes all external dependencies & toolchains needed to build Oppia Android.
"""

load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_jar")
load("//:build_vars.bzl", "BUILD_SDK_VERSION", "BUILD_TOOLS_VERSION")
load("//third_party:versions.bzl", "HTTP_DEPENDENCY_VERSIONS", "MAVEN_REPOSITORIES", "get_maven_dependencies")
# Note to developer: The order of loads & calls below MUST NOT BE CHANGED--it will guarantee a
# breakage as subsequent loads depend on both previous loads & calls. There is no other order
# possible for the configuration below, and it ought to never need to be changed.

# Android SDK configuration. For more details, see:
# https://docs.bazel.build/versions/master/be/android.html#android_sdk_repository
# TODO(#1542): Sync Android SDK version with the manifest.
android_sdk_repository(
name = "androidsdk",
api_level = BUILD_SDK_VERSION,
build_tools_version = BUILD_TOOLS_VERSION,
)

# Oppia's backend proto API definitions.
git_repository(
name = "oppia_proto_api",
commit = HTTP_DEPENDENCY_VERSIONS["oppia_proto_api"]["version"],
remote = "https://github.com/oppia/oppia-proto-api",
shallow_since = "1716846301 -0700",
)

load("@oppia_proto_api//repo:deps.bzl", "initializeDepsForWorkspace")

initializeDepsForWorkspace()

load("@oppia_proto_api//repo:toolchains.bzl", "initializeToolchainsForWorkspace")

initializeToolchainsForWorkspace()

# Add support for JVM rules: https://github.com/bazelbuild/rules_jvm_external
http_archive(
name = "rules_jvm_external",
sha256 = HTTP_DEPENDENCY_VERSIONS["rules_jvm"]["sha"],
strip_prefix = "rules_jvm_external-%s" % HTTP_DEPENDENCY_VERSIONS["rules_jvm"]["version"],
url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % HTTP_DEPENDENCY_VERSIONS["rules_jvm"]["version"],
)

# Add support for Kotlin: https://github.com/bazelbuild/rules_kotlin.
http_archive(
name = "io_bazel_rules_kotlin",
patches = ["//tools/kotlin:remove_processor_duplicates.patch"],
sha256 = HTTP_DEPENDENCY_VERSIONS["rules_kotlin"]["sha"],
urls = ["https://github.com/bazelbuild/rules_kotlin/releases/download/%s/rules_kotlin_release.tgz" % HTTP_DEPENDENCY_VERSIONS["rules_kotlin"]["version"]],
)

load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "kotlinc_version")

# Use the 1.6 compiler since Kotlin 1.6 is the current supported version in the repository.
kotlin_repositories(
compiler_release = kotlinc_version(
release = "1.6.10",
sha256 = "432267996d0d6b4b17ca8de0f878e44d4a099b7e9f1587a98edc4d27e76c215a",
),
)

register_toolchains("//tools/kotlin:kotlin_16_jdk9_toolchain")

# The proto_compiler and proto_java_toolchain bindings load the protos rules needed for the model
# module while helping us avoid the unnecessary compilation of protoc. Referecences:
# - https://github.com/google/startup-os/blob/5f30a62/WORKSPACE#L179-L187
# - https://github.com/bazelbuild/bazel/issues/7095

bind(
name = "proto_compiler",
actual = "//tools:protoc",
)

bind(
name = "proto_java_toolchain",
actual = "//tools:java_toolchain",
)

# The rules_java contains the java_lite_proto_library rule used in the model module.
http_archive(
name = "rules_java",
sha256 = HTTP_DEPENDENCY_VERSIONS["rules_java"]["sha"],
url = "https://github.com/bazelbuild/rules_java/releases/download/{0}/rules_java-{0}.tar.gz".format(HTTP_DEPENDENCY_VERSIONS["rules_java"]["version"]),
)

load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")

rules_java_dependencies()

rules_java_toolchains()

# The rules_proto contains the proto_library rule used in the model module.
http_archive(
name = "rules_proto",
sha256 = HTTP_DEPENDENCY_VERSIONS["rules_proto"]["sha"],
strip_prefix = "rules_proto-%s" % HTTP_DEPENDENCY_VERSIONS["rules_proto"]["version"],
urls = ["https://github.com/bazelbuild/rules_proto/archive/%s.tar.gz" % HTTP_DEPENDENCY_VERSIONS["rules_proto"]["version"]],
)
workspace(name = "oppia_android")

load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")

rules_proto_dependencies()

rules_proto_toolchains()

# Add support for Dagger
http_archive(
name = "dagger",
sha256 = HTTP_DEPENDENCY_VERSIONS["dagger"]["sha"],
strip_prefix = "dagger-dagger-%s" % HTTP_DEPENDENCY_VERSIONS["dagger"]["version"],
urls = ["https://github.com/google/dagger/archive/dagger-%s.zip" % HTTP_DEPENDENCY_VERSIONS["dagger"]["version"]],
)

load("@dagger//:workspace_defs.bzl", "DAGGER_ARTIFACTS", "DAGGER_REPOSITORIES")

# Add support for Robolectric: https://github.com/robolectric/robolectric-bazel
http_archive(
name = "robolectric",
sha256 = HTTP_DEPENDENCY_VERSIONS["robolectric"]["sha"],
strip_prefix = "robolectric-bazel-%s" % HTTP_DEPENDENCY_VERSIONS["robolectric"]["version"],
urls = ["https://github.com/robolectric/robolectric-bazel/archive/%s.tar.gz" % HTTP_DEPENDENCY_VERSIONS["robolectric"]["version"]],
)

load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")

robolectric_repositories()
# The list of repositories from which all Maven-tied dependencies may be downloaded.
_MAVEN_REPOSITORIES = [
"https://maven.fabric.io/public",
"https://maven.google.com",
"https://repo1.maven.org/maven2",
]

# Add support for Firebase Crashlytics
git_repository(
name = "tools_android",
commit = "00e6f4b7bdd75911e33c618a9bc57bab7a6e8930",
remote = "https://github.com/bazelbuild/tools_android",
shallow_since = "1594238320 -0400",
load(
"//scripts/third_party/versions:direct_http_versions.bzl",
scripts_remote_deps = "DIRECT_REMOTE_DEPENDENCIES",
)

load("@tools_android//tools/googleservices:defs.bzl", "google_services_workspace_dependencies")

google_services_workspace_dependencies()

# A custom version of Android SVG is needed since custom changes needed to be added to the library
# to correctly size in-line SVGs (such as those needed for LaTeX-based math expressions).
git_repository(
name = "androidsvg",
commit = "5bc9c7553e94c3476e8ea32baea3c77567228fcd",
remote = "https://github.com/oppia/androidsvg",
shallow_since = "1686304726 -0700",
load("//third_party/macros:direct_dep_downloader.bzl", "download_direct_workspace_dependencies")
load(
"//third_party/versions:direct_http_versions.bzl",
app_remote_deps = "DIRECT_REMOTE_DEPENDENCIES",
)

git_repository(
name = "android-spotlight",
commit = "cc23499d37dc8533a2876e45b5063e981a4583f4",
remote = "https://github.com/oppia/android-spotlight",
shallow_since = "1680147372 -0700",
)
download_direct_workspace_dependencies(app_remote_deps, _MAVEN_REPOSITORIES)

# A custom fork of KotliTeX that removes resources artifacts that break the build, and updates the
# min target SDK version to be compatible with Oppia.
git_repository(
name = "kotlitex",
commit = "ccdf4170817fa3b48b8e1e452772dd58ecb71cf2",
remote = "https://github.com/oppia/kotlitex",
shallow_since = "1679426649 -0700",
)
download_direct_workspace_dependencies(scripts_remote_deps, _MAVEN_REPOSITORIES)

git_repository(
name = "archive_patcher",
commit = "d1c18b0035d5f669ddaefadade49cae0748f9df2",
remote = "https://github.com/oppia/archive-patcher",
shallow_since = "1642022460 -0800",
)
load("//third_party/tools:toolchains.bzl", "initialize_toolchains_for_workspace")

bind(
name = "databinding_annotation_processor",
actual = "//tools/android:compiler_annotation_processor",
)
initialize_toolchains_for_workspace()

http_archive(
name = "protobuf_tools",
sha256 = HTTP_DEPENDENCY_VERSIONS["protobuf_tools"]["sha"],
strip_prefix = "protobuf-%s" % HTTP_DEPENDENCY_VERSIONS["protobuf_tools"]["version"],
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v{0}/protobuf-all-{0}.zip".format(HTTP_DEPENDENCY_VERSIONS["protobuf_tools"]["version"])],
load(
"//scripts/third_party/versions:maven_config.bzl",
scripts_maven_artifact_config = "MAVEN_ARTIFACT_CONFIGURATION",
)

load("@rules_jvm_external//:defs.bzl", "maven_install")

ATS_TAG = "1edfdab3134a7f01b37afabd3eebfd2c5bb05151"

ATS_SHA256 = "dcd1ff76aef1a26329d77863972780c8fe1fc8ff625747342239f0489c2837ec"

http_archive(
name = "android_test_support",
sha256 = ATS_SHA256,
strip_prefix = "android-test-%s" % ATS_TAG,
urls = ["https://github.com/android/android-test/archive/%s.tar.gz" % ATS_TAG],
load("//third_party/macros:direct_dep_loader.bzl", "download_maven_dependencies")
load(
"//third_party/versions:maven_config.bzl",
app_maven_artifact_config = "MAVEN_ARTIFACT_CONFIGURATION",
)

load("@android_test_support//:repo.bzl", "android_test_repositories")

android_test_repositories()

# Android bundle tool.
http_jar(
name = "android_bundletool",
sha256 = HTTP_DEPENDENCY_VERSIONS["android_bundletool"]["sha"],
url = "https://github.com/google/bundletool/releases/download/{0}/bundletool-all-{0}.jar".format(HTTP_DEPENDENCY_VERSIONS["android_bundletool"]["version"]),
)
download_maven_dependencies("maven_app", app_maven_artifact_config, _MAVEN_REPOSITORIES)

# Note to developers: new dependencies should be added to //third_party:versions.bzl, not here.
maven_install(
artifacts = DAGGER_ARTIFACTS + get_maven_dependencies(),
duplicate_version_warning = "error",
fail_if_repin_required = True,
maven_install_json = "//third_party:maven_install.json",
override_targets = {
"com.google.guava:guava": "@//third_party:com_google_guava_guava",
},
repositories = DAGGER_REPOSITORIES + MAVEN_REPOSITORIES,
strict_visibility = True,
)
download_maven_dependencies("maven_scripts", scripts_maven_artifact_config, _MAVEN_REPOSITORIES)

load("@maven//:defs.bzl", "pinned_maven_install")
load("@maven_app//:defs.bzl", pinned_maven_install_app = "pinned_maven_install")
load("@maven_scripts//:defs.bzl", pinned_maven_install_scripts = "pinned_maven_install")

pinned_maven_install()
pinned_maven_install_app()

[
http_jar(
name = "guava_%s" % guava_type,
sha256 = HTTP_DEPENDENCY_VERSIONS["guava_%s" % guava_type]["sha"],
urls = [
"{0}/com/google/guava/guava/{1}-{2}/guava-{1}-{2}.jar".format(
url_base,
HTTP_DEPENDENCY_VERSIONS["guava_%s" % guava_type]["version"],
guava_type,
)
for url_base in DAGGER_REPOSITORIES + MAVEN_REPOSITORIES
],
)
for guava_type in [
"android",
"jre",
]
]
pinned_maven_install_scripts()
Loading
Loading