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.

Sign up for GitHub

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

Jump to bottom

Fix #5370, part of #59: Migrate to Bazel 6.5.0 #4886

Merged
merged 292 commits into from
Jun 13, 2024
Merged

Fix #5370, part of #59: Migrate to Bazel 6.5.0 #4886

merged 292 commits into from
Jun 13, 2024
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Mar 29, 2023

  1. Post-merge lint fix.

    @BenHenning
    BenHenning committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    47f9c02 View commit details
    Browse the repository at this point in the history

  2. Fix updated TODOs. 

    Also, update TODO check script to have nicer output, and support
generating the exemption textproto file for easier updates in the
future.
    @BenHenning
    BenHenning committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    8ae5aa8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e… 

    …xternal
    @BenHenning
    BenHenning committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    de3cf14 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. Fix Dagger structure. 

    This moves the codebase to using the recommended single top-level Dagger
library rather than replicating it in a bunch of different places.
    @BenHenning
    BenHenning committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    b2ca68b View commit details
    Browse the repository at this point in the history

  2. Upgrade Dagger version. 

    This is needed for downstream work. It also includes ensuring that Guava
JRE can never be used (since only Android should ever be referenced by
the production app build).
    @BenHenning
    BenHenning committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    839be0f View commit details
    Browse the repository at this point in the history

  3. Fix test builds that depend on Dagger generation.

    @BenHenning
    BenHenning committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    c2fe337 View commit details
    Browse the repository at this point in the history

  4. Update Maven dependency licenses.

    @BenHenning
    BenHenning committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    a543500 View commit details
    Browse the repository at this point in the history

  5. Fix broken test & binary builds.

    @BenHenning
    BenHenning committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    b882832 View commit details
    Browse the repository at this point in the history

  6. Add support for Kotlin 1.6. 

    There's some cleanup work needed beyond this, but this is the core
change to introduce Kotlin 1.6 support (at least for dev builds).

Moshi needed to be upgraded due to a metadata incompatibility when moving
over to Kotlin 1.6.
    @BenHenning
    BenHenning committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    c5b940b View commit details
    Browse the repository at this point in the history

  7. Correctly interact with rules_kotlin. 

    rules_kotlin moved its imports into more structured bzl files to load,
so this updates all references in the codebase to point to the correct
locations (which removes debug warnings that show up on the CLI).
    @BenHenning
    BenHenning committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    10ae796 View commit details
    Browse the repository at this point in the history

  8. Fix upgrade by downgrading Moshi to 1.13. 

    Moshi 1.14 pulls in kotlin-reflect 1.7.0 which isn't compatible with the
rules_kotlin version we need for Bazel 4.x. Relatedly, this downgrades
rules_kotlin to 1.5.0, but it fortunately keeps all other changes needed
for 1.7.1 (which will be used in a later PR).

Some code fixes were needed, too, for unknown reasons (since the build
should've been using Kotlin 1.6 before). Either way, these fixes seem
reasonable.
    @BenHenning
    BenHenning committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    1cf7b76 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2023

  1. Turn on warnings as errors for Kotlin. 

    Fixed all warnings that the compiler warned about.

Removed ViewModelProvider & fixed state leaking entirely by moving away
from Jetpack's ViewModel as a base class (since we aren't correctly
using that correctly).
    @BenHenning
    BenHenning committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    d2799f0 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2023

  1. Fix Java build & other warnings. 

    Enables Java warnings-as-errors, though this doesn't yet apply to
kapt-generated code (such as the code from Dagger), but those warnings
were still manually fixed.

This also fixes a small import warning in a proto file, and warnings
when building oppia_dev_kitkat (by updating the main dex list, but it's
likely the build doesn't work anymore, anyway, and it's hard to test
locally).
    @BenHenning
    BenHenning committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    86dacfb View commit details
    Browse the repository at this point in the history

  2. Try to fix AndroidX databinding compile race. 

    There's a race condition when building large numbers of app tests
simultaneously that can lead to build failures. While the CI runs are
resilient now to this failure, it'd be better to try and fix it. This
removes the last non-AndroidX dependency from the codebase with hopes
that it helps reduce the likelihood of the error (though there are no
dependencies on it, so it's unlikely).
    @BenHenning
    BenHenning committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    bc62b22 View commit details
    Browse the repository at this point in the history

  3. Fix static check failures.

    @BenHenning
    BenHenning committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    6f9bbd6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow 

    Conflicts:
	WORKSPACE
	app/build.gradle
	app/src/main/java/org/oppia/android/app/viewmodel/ViewModelBridgeFactory.kt
	config/proguard/kotlin-proguard-rules.pro
	domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
	scripts/assets/maven_dependencies.textproto
	scripts/src/java/org/oppia/android/scripts/common/BUILD.bazel
	scripts/src/java/org/oppia/android/scripts/common/CommandExecutorImpl.kt
	scripts/src/java/org/oppia/android/scripts/license/MavenDependenciesRetriever.kt
	scripts/src/java/org/oppia/android/scripts/maven/model/MavenListDependencies.kt
	scripts/src/java/org/oppia/android/scripts/maven/model/MavenListDependency.kt
	scripts/src/java/org/oppia/android/scripts/maven/model/MavenListDependencyTree.kt
	third_party/BUILD.bazel
	third_party/maven_install.json
	third_party/versions.bzl
	tools/kotlin/BUILD.bazel
	utility/build.gradle
	utility/src/main/java/org/oppia/android/util/parser/image/UrlImageParser.kt
    @BenHenning
    BenHenning committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    7cc591d View commit details
    Browse the repository at this point in the history

  5. Post-merge fixes.

    @BenHenning
    BenHenning committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    a4790a4 View commit details
    Browse the repository at this point in the history

  6. Fix Proguard builds (temp) and static failures.

    @BenHenning
    BenHenning committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    b74ecbb View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into upgrade-compute-affected-tests

    @BenHenning
    BenHenning committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    aaa0299 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e… 

    …xternal
    @BenHenning
    BenHenning committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    d520fa9 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'update-rules-jvm-external' into update-dagger-structure

    @BenHenning
    BenHenning committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    037be61 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'update-dagger-structure' into upgrade-to-kotlin1.6

    @BenHenning
    BenHenning committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    756534a View commit details
    Browse the repository at this point in the history

  11. Fix CI breakages, including Gradle.

    @BenHenning
    BenHenning committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    a92e37c View commit details
    Browse the repository at this point in the history

  12. Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow 

    Conflicts:
	build.gradle
	data/build.gradle
	domain/build.gradle
	third_party/maven_install.json
    @BenHenning
    BenHenning committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    bb8592b View commit details
    Browse the repository at this point in the history

  13. Post-merge dep fixes + test fix.

    @BenHenning
    BenHenning committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    9890877 View commit details
    Browse the repository at this point in the history

  14. Undo unnecessary changes.

    @BenHenning
    BenHenning committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    f118fa2 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2023

  1. Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze… 

    …l-and-kotlin

Conflicts:
	WORKSPACE
	app/BUILD.bazel
	app/src/main/java/org/oppia/android/app/activity/route/BUILD.bazel
	app/src/main/java/org/oppia/android/app/application/BUILD.bazel
	app/src/main/java/org/oppia/android/app/application/alpha/BUILD.bazel
	app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel
	app/src/main/java/org/oppia/android/app/application/beta/BUILD.bazel
	app/src/main/java/org/oppia/android/app/application/dev/BUILD.bazel
	app/src/main/java/org/oppia/android/app/application/ga/BUILD.bazel
	app/src/main/java/org/oppia/android/app/application/testing/BUILD.bazel
	app/src/main/java/org/oppia/android/app/notice/testing/BUILD.bazel
	app/src/main/java/org/oppia/android/app/player/exploration/testing/BUILD.bazel
	app/src/main/java/org/oppia/android/app/shim/BUILD.bazel
	app/src/main/java/org/oppia/android/app/translation/BUILD.bazel
	app/src/main/java/org/oppia/android/app/translation/testing/BUILD.bazel
	app/src/main/java/org/oppia/android/app/utility/datetime/BUILD.bazel
	app/src/main/java/org/oppia/android/app/utility/lifecycle/BUILD.bazel
	app/src/main/java/org/oppia/android/app/utility/math/BUILD.bazel
	app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/BUILD.bazel
	app/src/sharedTest/java/org/oppia/android/app/customview/interaction/BUILD.bazel
	app/src/sharedTest/java/org/oppia/android/app/databinding/BUILD.bazel
	app/src/sharedTest/java/org/oppia/android/app/devoptions/mathexpressionparser/BUILD.bazel
	app/src/sharedTest/java/org/oppia/android/app/notice/BUILD.bazel
	app/src/sharedTest/java/org/oppia/android/app/player/exploration/BUILD.bazel
	app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel
	app/src/sharedTest/java/org/oppia/android/app/splash/BUILD.bazel
	app/src/test/java/org/oppia/android/app/activity/BUILD.bazel
	app/src/test/java/org/oppia/android/app/activity/route/BUILD.bazel
	app/src/test/java/org/oppia/android/app/application/alpha/BUILD.bazel
	app/src/test/java/org/oppia/android/app/application/beta/BUILD.bazel
	app/src/test/java/org/oppia/android/app/application/dev/BUILD.bazel
	app/src/test/java/org/oppia/android/app/application/ga/BUILD.bazel
	app/src/test/java/org/oppia/android/app/application/testing/BUILD.bazel
	app/src/test/java/org/oppia/android/app/testing/activity/BUILD.bazel
	app/src/test/java/org/oppia/android/app/translation/BUILD.bazel
	app/src/test/java/org/oppia/android/app/translation/testing/BUILD.bazel
	app/src/test/java/org/oppia/android/app/utility/math/BUILD.bazel
	config/proguard/kotlin-proguard-rules.pro
	data/BUILD.bazel
	data/build.gradle
	data/src/main/java/org/oppia/android/data/backends/gae/BUILD.bazel
	data/src/main/java/org/oppia/android/data/backends/gae/api/BUILD.bazel
	data/src/main/java/org/oppia/android/data/backends/gae/model/BUILD.bazel
	data/src/main/java/org/oppia/android/data/persistence/BUILD.bazel
	data/src/test/java/org/oppia/android/data/persistence/BUILD.bazel
	domain/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/classify/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/classify/rules/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/classify/rules/continueinteraction/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/classify/rules/mathequationinput/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/classify/rules/numericexpressioninput/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/clipboard/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/exploration/testing/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/feedbackreporting/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/locale/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/onboarding/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/onboarding/testing/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/oppialogger/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/testing/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/oppialogger/logscheduler/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/profile/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/spotlight/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/testing/oppialogger/loguploader/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/translation/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/classify/rules/algebraicexpressioninput/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/classify/rules/mathequationinput/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/classify/rules/numericexpressioninput/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/clipboard/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/exploration/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/exploration/testing/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/hintsandsolution/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/locale/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/onboarding/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/testing/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/question/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/translation/BUILD.bazel
	instrumentation/src/java/org/oppia/android/instrumentation/application/BUILD.bazel
	instrumentation/src/javatests/org/oppia/android/instrumentation/application/BUILD.bazel
	scripts/assets/maven_dependencies.textproto
	scripts/src/java/org/oppia/android/scripts/ci/ComputeAffectedTests.kt
	scripts/src/java/org/oppia/android/scripts/common/BUILD.bazel
	scripts/src/java/org/oppia/android/scripts/common/CommandExecutorImpl.kt
	scripts/src/java/org/oppia/android/scripts/common/GitClient.kt
	testing/BUILD.bazel
	testing/src/main/java/org/oppia/android/testing/data/BUILD.bazel
	testing/src/main/java/org/oppia/android/testing/espresso/BUILD.bazel
	testing/src/main/java/org/oppia/android/testing/logging/BUILD.bazel
	testing/src/main/java/org/oppia/android/testing/network/BUILD.bazel
	testing/src/main/java/org/oppia/android/testing/platformparameter/BUILD.bazel
	testing/src/main/java/org/oppia/android/testing/robolectric/BUILD.bazel
	testing/src/main/java/org/oppia/android/testing/threading/BUILD.bazel
	testing/src/main/java/org/oppia/android/testing/time/BUILD.bazel
	testing/src/test/java/org/oppia/android/testing/data/BUILD.bazel
	testing/src/test/java/org/oppia/android/testing/junit/BUILD.bazel
	testing/src/test/java/org/oppia/android/testing/logging/BUILD.bazel
	testing/src/test/java/org/oppia/android/testing/networking/BUILD.bazel
	testing/src/test/java/org/oppia/android/testing/threading/BUILD.bazel
	third_party/BUILD.bazel
	third_party/maven_install.json
	third_party/versions.bzl
	utility/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/accessibility/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/caching/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/caching/testing/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/data/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/gcsresource/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/locale/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/locale/testing/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/logging/firebase/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/logging/performancemetrics/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/networking/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/parser/html/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/parser/image/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/profile/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/system/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/threading/BUILD.bazel
	utility/src/test/java/org/oppia/android/util/caching/BUILD.bazel
	utility/src/test/java/org/oppia/android/util/caching/testing/BUILD.bazel
	utility/src/test/java/org/oppia/android/util/data/BUILD.bazel
	utility/src/test/java/org/oppia/android/util/locale/BUILD.bazel
	utility/src/test/java/org/oppia/android/util/locale/testing/BUILD.bazel
	utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel
	utility/src/test/java/org/oppia/android/util/logging/firebase/BUILD.bazel
	utility/src/test/java/org/oppia/android/util/logging/performancemetrics/BUILD.bazel
	utility/src/test/java/org/oppia/android/util/networking/BUILD.bazel
	utility/src/test/java/org/oppia/android/util/profile/BUILD.bazel
    @BenHenning
    BenHenning committed Apr 2, 2023
    Configuration menu
    Copy the full SHA
    6abf41b View commit details
    Browse the repository at this point in the history

  2. Post-merge fixes.

    @BenHenning
    BenHenning committed Apr 2, 2023
    Configuration menu
    Copy the full SHA
    151ecca View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2023

  1. Fix broken CI checks. 

    Specifically:
- The TODO check was fixed by reformatting a TODO comment.
- The Proguard build was fixed by upgrading kotlinx.coroutines to use a
  version compatible with Kotlin 1.6, as well as adding a Proguard
  dontwarn directive for one class that can't execute on Android.
    @BenHenning
    BenHenning committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    d8792a8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow 

    Conflicts:
	WORKSPACE
	config/proguard/kotlin-proguard-rules.pro
	third_party/BUILD.bazel
	third_party/maven_install.json
	third_party/versions.bzl
    @BenHenning
    BenHenning committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    6b5291f View commit details
    Browse the repository at this point in the history

  3. Post-merge fixes.

    @BenHenning
    BenHenning committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    125be3c View commit details
    Browse the repository at this point in the history

  4. Address self-review comments.

    @BenHenning
    BenHenning committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    59f7f87 View commit details
    Browse the repository at this point in the history

  5. Fix broken tests. 

    For some reason, the old kotlinx-coroutines-test was causing a
codebase-wide incompatibility with the 1.6.x kotlinx-coroutines-core
library, so this updates that version.

It also updates Gradle dependencies for consistency, and to fix the
Gradle builds.

And, this fixes the IntelliJ Bazel plugin syncing issue when using
kt_jvm_import (for kotlinx-coroutines-core-jvm).
    @BenHenning
    BenHenning committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    0709b3d View commit details
    Browse the repository at this point in the history

  6. Address TODOs as part of the migration. 

    This addresses TODOs for #4119 and #4120. It also updates TODOs on #3715
to #4463, instead, since these apparently weren't correctly originally.
    @BenHenning
    BenHenning committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    e44b59d View commit details
    Browse the repository at this point in the history

  7. Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow 

    Conflicts:
	third_party/BUILD.bazel
	third_party/maven_install.json
    @BenHenning
    BenHenning committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    d2df104 View commit details
    Browse the repository at this point in the history

  8. Post-merge fixes.

    @BenHenning
    BenHenning committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    3b7df64 View commit details
    Browse the repository at this point in the history

  9. Update build stats workflow. 

    This changes the following:
- Removes the alpha_kitkat build (since it's no longer important).
- Adds build checks for beta & GA builds.
- Updates the logic to run against the base commit rather than develop
  for better interoperability with chained PRs.
    @BenHenning
    BenHenning committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    a40f75a View commit details
    Browse the repository at this point in the history

  10. Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze… 

    …l-and-kotlin

Conflicts:
	config/proguard/kotlin-proguard-rules.pro
	third_party/BUILD.bazel
    @BenHenning
    BenHenning committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    227b0f4 View commit details
    Browse the repository at this point in the history

  11. Fix Proguard breakages & post-merge fixes. 

    Upgrading to Moshi 1.14 requires pulling in Kotlin's 1.7.x runtime
library which will require other dependency updates. Moshi 1.14 isn't
actually needed for successful builds, so this fixes Proguard builds by
reversing that dependency.

This alsp updates the new build stats workflow to use Bazel 6.1.1 & JDK
11, and fixes a test introduced in #4092.
    @BenHenning
    BenHenning committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    6e747dc View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. Merge branch 'develop' into upgrade-compute-affected-tests

    @BenHenning
    BenHenning committed May 11, 2023
    Configuration menu
    Copy the full SHA
    8a19b4e View commit details
    Browse the repository at this point in the history

  2. Fix breakage from develop. 

    The new proto target isn't used anywhere so this was missed.
    @BenHenning
    BenHenning committed May 11, 2023
    Configuration menu
    Copy the full SHA
    773f7ff View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e… 

    …xternal
    @BenHenning
    BenHenning committed May 11, 2023
    Configuration menu
    Copy the full SHA
    311951f View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. Merge branch 'update-rules-jvm-external' into update-dagger-structure

    @BenHenning
    BenHenning committed May 12, 2023
    Configuration menu
    Copy the full SHA
    9e377d5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'update-dagger-structure' into upgrade-to-kotlin1.6 

    Conflicts:
	app/src/main/res/layout-land/profile_chooser_profile_view.xml
	app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml
	app/src/main/res/layout/profile_chooser_profile_view.xml
    @BenHenning
    BenHenning committed May 12, 2023
    Configuration menu
    Copy the full SHA
    f087488 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow

    @BenHenning
    BenHenning committed May 12, 2023
    Configuration menu
    Copy the full SHA
    413952c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze… 

    …l-and-kotlin
    @BenHenning
    BenHenning committed May 12, 2023
    Configuration menu
    Copy the full SHA
    e80d869 View commit details
    Browse the repository at this point in the history

  5. Upgrade to 6.2.0. 

    Also, fix some post-merge (or post-upgrade) fixes. It's not clear if
these are due to the upgrade to 6.2.0 or an earlier PR, but the fixes
are needed at least at the time of this branch.
    @BenHenning
    BenHenning committed May 12, 2023
    Configuration menu
    Copy the full SHA
    a7fffec View commit details
    Browse the repository at this point in the history

  6. Fix hanging CoroutineExecutorService test. 

    I'm not sure of the underlying problem, but we've run into issues with
the custom Deferred-to-Future conversion mechanism. This replaces that
with an existing kotlinx Deferred-to-Guava ListenableFuture mechanism
that is used elsewhere in the codebase and it seems to fix the stability
issue.
    @BenHenning
    BenHenning committed May 12, 2023
    Configuration menu
    Copy the full SHA
    e7435a5 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow

    @BenHenning
    BenHenning committed May 12, 2023
    Configuration menu
    Copy the full SHA
    0b4fefa View commit details
    Browse the repository at this point in the history

  8. Permant-ify temporary TODOs for new tests. 

    Also, fix some oddities in the API contract for functions returning
sizes as strings rather than longs.

Issue #4971 is tracking the long-term effort to add tests for the new
utilities being introduced by this branch's PR.
    @BenHenning
    BenHenning committed May 12, 2023
    Configuration menu
    Copy the full SHA
    c0b3894 View commit details
    Browse the repository at this point in the history

  9. Upgrade runner for build stats. 

    This ensures that the workflow can actually run since GitHub doesn't
support the old 18.04 Ubuntu images anymore (or they are at least
significantly limited in availability).
    @BenHenning
    BenHenning committed May 12, 2023
    Configuration menu
    Copy the full SHA
    ec33a12 View commit details
    Browse the repository at this point in the history

  10. Fix broken Gradle build.

    @BenHenning
    BenHenning committed May 12, 2023
    Configuration menu
    Copy the full SHA
    8a8101b View commit details
    Browse the repository at this point in the history

  11. Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow

    @BenHenning
    BenHenning committed May 12, 2023
    Configuration menu
    Copy the full SHA
    d629d71 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze… 

    …l-and-kotlin
    @BenHenning
    BenHenning committed May 12, 2023
    Configuration menu
    Copy the full SHA
    e5eb517 View commit details
    Browse the repository at this point in the history

  13. Fix CI configs. 

    Two things:
1. Updates all Bazel CI workflows to use the correct version of Bazel.
2. Fixes an issue with the compute_affected_tests workflow to properly
   handle failures (which should cause the check results step to fail
   rather than pass as though there are no tests to run).
    @BenHenning
    BenHenning committed May 12, 2023
    Configuration menu
    Copy the full SHA
    fb3ebc6 View commit details
    Browse the repository at this point in the history

  14. Clean up temporary TODOs.

    @BenHenning
    BenHenning committed May 12, 2023
    Configuration menu
    Copy the full SHA
    6fc9216 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2023

  1. Fix issue with compute stats workflow. 

    If the Bazel version changes then the previous binaries won't build, so
this changes the stats workflow to install both the previous and current
versions of Bazel. While this is only needed for the PR making the
version change, it should be low-impact to always include (plus, Bazel
updates often so these changes might become more frequent in the
long-term).
    @BenHenning
    BenHenning committed May 13, 2023
    Configuration menu
    Copy the full SHA
    afbe6e6 View commit details
    Browse the repository at this point in the history

  2. Attempt 2 to fix new Bazel versions build stats. 

    This uses https://bazel.build/install/ubuntu#install-on-ubuntu which I
also use locally for managing multiple Bazel versions.
    @BenHenning
    BenHenning committed May 13, 2023
    Configuration menu
    Copy the full SHA
    88763e2 View commit details
    Browse the repository at this point in the history

  3. Attempt (3). 

    This also adds installing build tools 29.0.2 (which is needed by old
builds) and temporarily setting up support for building with the Oppia
custom Android tools (also needed for older builds). The latter must be
removed for newer builds, so some extra handling was added for that.

Some of this boilerplate could be removed in a future PR once there's
better backward compatibility guarantees in place (the workflows will
probably always need to download old SDKs, build tools, Bazel versions,
and possibly Java versions, though, except where backward compatibility
is guaranteed).
    @BenHenning
    BenHenning committed May 13, 2023
    Configuration menu
    Copy the full SHA
    3cfdf26 View commit details
    Browse the repository at this point in the history

  4. Attempt (3). 

    This:
- Uses a stable apt-get CLI (instead of regular apt).
- Only temporarily modifies .bazelrc after git checkout, and resets
  progress before restoring the feature branch (to override error cases
  where changing branches would overwrite the temporary changes).
    @BenHenning
    BenHenning committed May 13, 2023
    Configuration menu
    Copy the full SHA
    0097827 View commit details
    Browse the repository at this point in the history

  5. Fix another regular 'apt' usage. 

    This isn't actually needed to fix anything, but it's being done to
address a warning in CI (of using an unstable 'apt' API in scripts) and
for consistency.
    @BenHenning
    BenHenning committed May 13, 2023
    Configuration menu
    Copy the full SHA
    b4802b7 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. Merge branch 'develop' into upgrade-compute-affected-tests 

    Conflicts:
	scripts/assets/todo_open_exemptions.textproto
    @BenHenning
    BenHenning committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    525a601 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e… 

    …xternal

Conflicts:
	scripts/assets/test_file_exemptions.textproto
	third_party/maven_install.json
    @BenHenning
    BenHenning committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    6cca78f View commit details
    Browse the repository at this point in the history

  3. Post-merge fixes.

    @BenHenning
    BenHenning committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    327114d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'update-rules-jvm-external' into update-dagger-structure 

    Conflicts:
	app/src/main/java/org/oppia/android/app/translation/BUILD.bazel
	third_party/maven_install.json
    @BenHenning
    BenHenning committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    bb4ff28 View commit details
    Browse the repository at this point in the history

  5. Post-merge fixes.

    @BenHenning
    BenHenning committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    5d924f4 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'update-dagger-structure' into upgrade-to-kotlin1.6 

    Conflicts:
	.github/CODEOWNERS
	app/src/main/java/org/oppia/android/app/options/AppLanguageActivity.kt
	app/src/main/java/org/oppia/android/app/options/AppLanguageActivityPresenter.kt
	app/src/main/java/org/oppia/android/app/options/AppLanguageFragment.kt
	app/src/main/java/org/oppia/android/app/options/AppLanguageFragmentPresenter.kt
	app/src/main/java/org/oppia/android/app/options/OptionsActivity.kt
	app/src/main/java/org/oppia/android/app/options/OptionsActivityPresenter.kt
	app/src/main/java/org/oppia/android/app/options/OptionsFragmentPresenter.kt
	app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageActivityTest.kt
	app/src/sharedTest/java/org/oppia/android/app/options/AppLanguageFragmentTest.kt
	app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt
	app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
	app/src/test/java/org/oppia/android/app/translation/AppLanguageResourceHandlerTest.kt
	app/src/test/java/org/oppia/android/app/utility/math/MathExpressionAccessibilityUtilTest.kt
	scripts/src/java/org/oppia/android/scripts/build/FilterPerLanguageResources.kt
	third_party/maven_install.json
	utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt
    @BenHenning
    BenHenning committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    8690354 View commit details
    Browse the repository at this point in the history

  7. Post-merge fixes.

    @BenHenning
    BenHenning committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    66bf94f View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. Fix a variety of dev platform-specific issues. 

    These issues were found after I started using a new development
environment.
    @BenHenning
    BenHenning committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    667bf89 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Tidy some things up, and revert fragment test. 

    ProfileAndDeviceIdFragmentTest had been updated to use a newer fragment
initialization pattern, but that's no longer needed and seems to be
causing what appears to be timing discrepancies between local dev and
CI.
    @BenHenning
    BenHenning committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    fb59232 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. Fix test behavior inconsistency in test. 

    The issue ultimately arose from test parameters being initialized after
they're needed in the launched UI. This type of change was tried earlier
in the branch, but reverted since it didn't seem necessary. It is,
however, necessary when there are environment differences (e.g. local
vs. CI) or when running certain tests individually.

Due to the difficulty in finding this issue, ActivityScenarioRule has
been added as a prohibited pattern in the static regex checks (along
with ActivityTestRule since that's deprecated and discouraged, anyway).
    @BenHenning
    BenHenning committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    2551d4b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into fix-platform-specific-issues

    @BenHenning
    BenHenning committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    714f3ea View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2023

  1. Fix broken ProfileAndDeviceIdFragmentTest test. 

    The test was suffering from some proto encoding inconsistencies that
seem to occur between some development machines vs. on CI. The fix
improves the test's robustness by extracting the raw encoded string,
verifying that the other outputs in the intent message correctly
correspond to that string, and that the string (as a parsed proto)
contains the correct values. As a result, the test no longer depends on
a hardcoded encoding value to be present for verification. This does
result in a bit more logic than is generally good to have in a test (and
it lengthened the test code quite a bit), but it seems necessary in this
particular case.
    @BenHenning
    BenHenning committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    7488b9f View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Merge branch 'develop' into fix-platform-specific-issues

    @BenHenning
    BenHenning committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    e3d4091 View commit details
    Browse the repository at this point in the history

  2. Post-merge fix.

    @BenHenning
    BenHenning committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    5671673 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix-platform-specific-issues' into upgrade-compute-affe… 

    …cted-tests

Conflicts:
	scripts/assets/todo_open_exemptions.textproto
	scripts/src/javatests/org/oppia/android/scripts/ci/ComputeAffectedTestsTest.kt
	scripts/src/javatests/org/oppia/android/scripts/common/GitClientTest.kt
	scripts/src/javatests/org/oppia/android/scripts/todo/TodoIssueResolvedCheckTest.kt
	scripts/src/javatests/org/oppia/android/scripts/todo/TodoOpenCheckTest.kt
    @BenHenning
    BenHenning committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    f5ed0c9 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Merge branch 'develop' into fix-platform-specific-issues

    @BenHenning
    BenHenning committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    bd1466d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix-platform-specific-issues' into upgrade-compute-affe… 

    …cted-tests

Conflicts:
	scripts/assets/todo_open_exemptions.textproto
	scripts/src/javatests/org/oppia/android/scripts/ci/ComputeAffectedTestsTest.kt
	scripts/src/javatests/org/oppia/android/scripts/common/GitClientTest.kt
	scripts/src/javatests/org/oppia/android/scripts/todo/TodoIssueResolvedCheckTest.kt
	scripts/src/javatests/org/oppia/android/scripts/todo/TodoOpenCheckTest.kt
    @BenHenning
    BenHenning committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    d9b38ea View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Some follow-up post-merge fixes. 

    This doesn't address all timeouts being observed in scripts. More
analysis may be needed.
    @BenHenning
    BenHenning committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    9f1a2ec View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. Make TodoOpenCheck locally runnable. 

    This does a bunch of other small things, too, but the main difference
here is introducing support for interacting with GitHub via its REST API
rather than requiring the user to use the 'gh' tool locally (though the
gh CLI tool is still needed for maintaining authentication access).
    @BenHenning
    BenHenning committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    39a3add View commit details
    Browse the repository at this point in the history

  2. Simplify GitHubIssue & some static fixes/docs. 

    Tests still need to be added, and some cleanup is needed once the
branch's base is adjusted.
    @BenHenning
    BenHenning committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    4f7bfd6 View commit details
    Browse the repository at this point in the history

  3. Add ScriptBackgroundCoroutineDispatcher. 

    This is a script-specific dispatcher which will allow for better
asynchronous support in upcoming PRs (especially for command execution).
This change serves to prepare for those changes.
    @BenHenning
    BenHenning committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    000bba3 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. Some more robustness fixes. 

    The main change here is ensuring that Bazel 4.0.0 is used & bzlmod
disabled in newer versions of Bazel when running operations in a test
Bazel environment.

This commit also introduces some more timing tweaks on CommandExecutor
for some tests, though these only affect very specific tests (as many
script tests directly call a script's main() function and thus don't
overwrite its executor behavior).

This commit attempted to introduce "--batch" mode to runs, but the
isolation didn't actually seem to improve stability and, instead,
substantially slowed down some of the tests.
    @BenHenning
    BenHenning committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    79878cd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix-platform-specific-issues' into introduce-better-scr… 

    …ipt-execution-support

Conflicts:
	scripts/src/java/org/oppia/android/scripts/ci/ComputeAffectedTests.kt
	scripts/src/javatests/org/oppia/android/scripts/ci/ComputeAffectedTestsTest.kt
	scripts/src/javatests/org/oppia/android/scripts/common/BazelClientTest.kt
    @BenHenning
    BenHenning committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    a5f71d6 View commit details
    Browse the repository at this point in the history

  3. Post-merge fixes. 

    Plus, actually makes use of the new script background dispatcher in
CommandExecutorImpl to make the new wiring make more sense (though its
real utility will come in a follow-up PR).
    @BenHenning
    BenHenning committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    0b55bd4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'introduce-better-script-execution-support' into make-to… 

    …do-check-locally-runnable
    @BenHenning
    BenHenning committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    53d6727 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2024

  1. Post-merge fixes & adjustments. 

    This makes the TODO open check script runnable using the script
background dispatcher, and fixes some tests so that they pass now.

More documentation and testing work is still needed to finalize this PR.
    @BenHenning
    BenHenning committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    00c7c28 View commit details
    Browse the repository at this point in the history

  2. Fix BUILD file lint issue.

    @BenHenning
    BenHenning committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    bd97611 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix-platform-specific-issues' into introduce-better-scr… 

    …ipt-execution-support
    @BenHenning
    BenHenning committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    d54829d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'introduce-better-script-execution-support' into make-to… 

    …do-check-locally-runnable
    @BenHenning
    BenHenning committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    fa9cae4 View commit details
    Browse the repository at this point in the history

  5. Static fix checks.

    @BenHenning
    BenHenning committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    0618b12 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'make-todo-check-locally-runnable' into upgrade-compute-… 

    …affected-tests

Conflicts:
	scripts/assets/todo_open_exemptions.textproto
	scripts/src/java/org/oppia/android/scripts/ci/ComputeAffectedTests.kt
	scripts/src/java/org/oppia/android/scripts/common/BazelClient.kt
	scripts/src/java/org/oppia/android/scripts/common/CommandExecutorImpl.kt
	scripts/src/java/org/oppia/android/scripts/common/GitClient.kt
	scripts/src/java/org/oppia/android/scripts/todo/BUILD.bazel
	scripts/src/java/org/oppia/android/scripts/todo/TodoOpenCheck.kt
	scripts/src/javatests/org/oppia/android/scripts/ci/ComputeAffectedTestsTest.kt
	scripts/src/javatests/org/oppia/android/scripts/common/ScriptBackgroundCoroutineDispatcherTest.kt
	scripts/src/javatests/org/oppia/android/scripts/testing/TestGitRepositoryTest.kt
	scripts/src/javatests/org/oppia/android/scripts/todo/TodoIssueResolvedCheckTest.kt
	scripts/src/javatests/org/oppia/android/scripts/todo/TodoOpenCheckTest.kt
    @BenHenning
    BenHenning committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    fb148ea View commit details
    Browse the repository at this point in the history

  7. Post-merge fixes.

    @BenHenning
    BenHenning committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    ab326ff View commit details
    Browse the repository at this point in the history

  8. Merge branch 'upgrade-compute-affected-tests' of github.com:oppia/opp… 

    …ia-android into upgrade-compute-affected-tests

Conflicts:
	scripts/assets/todo_open_exemptions.textproto
	scripts/src/java/org/oppia/android/scripts/testing/TestBazelWorkspace.kt
	scripts/src/javatests/org/oppia/android/scripts/todo/TodoOpenCheckTest.kt
    @BenHenning
    BenHenning committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    d5bfad5 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e… 

    …xternal

Conflicts:
	scripts/assets/test_file_exemptions.textproto
	scripts/src/javatests/org/oppia/android/scripts/maven/RetrieveLicenseTextsTest.kt
    @BenHenning
    BenHenning committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    1067a18 View commit details
    Browse the repository at this point in the history

  10. Post-merge fixes.

    @BenHenning
    BenHenning committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    1e2df14 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. Merge branch 'develop' into fix-platform-specific-issues

    @BenHenning
    BenHenning committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    211487c View commit details
    Browse the repository at this point in the history

  2. Post-merge fixes.

    @BenHenning
    BenHenning committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    1a666a9 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. Add smoke tests for instr. binaries & tests.

    @BenHenning
    BenHenning committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    a2ee5d3 View commit details
    Browse the repository at this point in the history

  2. Some minor refactoring for readability.

    @BenHenning
    BenHenning committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    d5b9012 View commit details
    Browse the repository at this point in the history

  3. Fixed broken instrumentation builds. 

    This was done by removing the //testing dependency and, instead, having
instrumentation targets depend on the direct module within //testing
that they need to build. This module & its corresponding implementation
binding (and tests) needed to be moved out of //testing and into their
own /firebase package.
    @BenHenning
    BenHenning committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    e6ec869 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into fix-instrumentation-build-failure

    @BenHenning
    BenHenning committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    9f50469 View commit details
    Browse the repository at this point in the history

  5. Add missing CODEOWNERS line.

    @BenHenning
    BenHenning committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    8dbf4dc View commit details
    Browse the repository at this point in the history

  6. Remove old files from CODEOWNERS.

    @BenHenning
    BenHenning committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    9c38057 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'fix-instrumentation-build-failure' into fix-platform-sp… 

    …ecific-issues
    @BenHenning
    BenHenning committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    f2ff4e3 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. Add missing tests for TestBlazeWorkspace changes. 

    Also includes some minor clean-ups within TestBazelWorkspaceTest.
    @BenHenning
    BenHenning committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    fad48ed View commit details
    Browse the repository at this point in the history

  2. Add missing Firebase auth tests.

    @BenHenning
    BenHenning committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    e1802c8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix-instrumentation-build-failure' into fix-platform-sp… 

    …ecific-issues
    @BenHenning
    BenHenning committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    00c32f6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'fix-platform-specific-issues' into introduce-better-scr… 

    …ipt-execution-support
    @BenHenning
    BenHenning committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    2f87f4d View commit details
    Browse the repository at this point in the history

  5. Merge branch 'introduce-better-script-execution-support' into make-to… 

    …do-check-locally-runnable
    @BenHenning
    BenHenning committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    aa3547c View commit details
    Browse the repository at this point in the history

  6. Post-merge fixes for previously missed tests.

    @BenHenning
    BenHenning committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    d3cbd93 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'fix-platform-specific-issues' into introduce-better-scr… 

    …ipt-execution-support
    @BenHenning
    BenHenning committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    13e4358 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'introduce-better-script-execution-support' into make-to… 

    …do-check-locally-runnable
    @BenHenning
    BenHenning committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    622aced View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into fix-instrumentation-build-failure

    @BenHenning
    BenHenning committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    50f41d2 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'fix-instrumentation-build-failure' into fix-platform-sp… 

    …ecific-issues
    @BenHenning
    BenHenning committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    c8df70e View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. Merge branch 'develop' into fix-instrumentation-build-failure

    @BenHenning
    BenHenning committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    c85d421 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix-instrumentation-build-failure' into fix-platform-sp… 

    …ecific-issues
    @BenHenning
    BenHenning committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    dcf27b6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into fix-platform-specific-issues

    @BenHenning
    BenHenning committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    2369514 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'fix-platform-specific-issues' into introduce-better-scr… 

    …ipt-execution-support
    @BenHenning
    BenHenning committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    c7ec5d4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'introduce-better-script-execution-support' into make-to… 

    …do-check-locally-runnable
    @BenHenning
    BenHenning committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    4b418bd View commit details
    Browse the repository at this point in the history

  6. Merge branch 'make-todo-check-locally-runnable' into upgrade-compute-… 

    …affected-tests
    @BenHenning
    BenHenning committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    d6a9f70 View commit details
    Browse the repository at this point in the history

  7. Improve new test robustness. 

    Required upgrade of kotlinx-coroutines-core.
    @BenHenning
    BenHenning committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    8de4d51 View commit details
    Browse the repository at this point in the history

  8. Fix updated Maven license deps.

    @BenHenning
    BenHenning committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    3f69f11 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'introduce-better-script-execution-support' into make-to… 

    …do-check-locally-runnable
    @BenHenning
    BenHenning committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    ea8e0b1 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Update scripts/src/javatests/org/oppia/android/scripts/common/GitClie… 

    …ntTest.kt

Co-authored-by: Adhiambo Peres <[email protected]>
    @BenHenning @adhiamboperes
    BenHenning and adhiamboperes authored Feb 14, 2024
    Configuration menu
    Copy the full SHA
    2916770 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into fix-platform-specific-issues

    @BenHenning
    BenHenning authored Feb 14, 2024
    Configuration menu
    Copy the full SHA
    f2d810a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix-platform-specific-issues' into introduce-better-scr… 

    …ipt-execution-support

Conflicts:
	third_party/maven_install.json
    @BenHenning
    BenHenning committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    808f412 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'introduce-better-script-execution-support' into make-to… 

    …do-check-locally-runnable
    @BenHenning
    BenHenning committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    2315aea View commit details
    Browse the repository at this point in the history

  5. Add tests for GitHubClient & TodoOpenCheck. 

    Add new FakeCommandExecutor utility + tests.

Add missing GitHub workflow update.
    @BenHenning
    BenHenning committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    af51395 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into fix-platform-specific-issues

    @BenHenning
    BenHenning committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    6856e3c View commit details
    Browse the repository at this point in the history

  7. Merge branch 'fix-platform-specific-issues' into introduce-better-scr… 

    …ipt-execution-support
    @BenHenning
    BenHenning committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    5a050de View commit details
    Browse the repository at this point in the history

  8. Merge branch 'introduce-better-script-execution-support' into make-to… 

    …do-check-locally-runnable
    @BenHenning
    BenHenning committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    13b8d4b View commit details
    Browse the repository at this point in the history

  9. Add missing docs.

    @BenHenning
    BenHenning committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    280b3ec View commit details
    Browse the repository at this point in the history

  10. Merge branch 'make-todo-check-locally-runnable' into upgrade-compute-… 

    …affected-tests

Conflicts:
	scripts/assets/todo_open_exemptions.textproto
	scripts/src/javatests/org/oppia/android/scripts/todo/TodoOpenCheckTest.kt
    @BenHenning
    BenHenning committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    0bd7e2f View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Post-merge fixes.

    @BenHenning
    BenHenning committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    5951c0f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e… 

    …xternal

Conflicts:
	scripts/assets/maven_dependencies.textproto
	third_party/maven_install.json
    @BenHenning
    BenHenning committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    ee71b32 View commit details
    Browse the repository at this point in the history

  3. Update Maven dep list checker & updater scripts. 

    Updates the utilities for the Maven dep list & updater scripts to have
much more robustness when trying to verify the correct repository URLs
for artifact coordinates, and when downloading artifact POM files. The
main robustness changes come in the form of retries and smarter
parallelization and error checking.

These changes were necessary due to one of my workstations frequently
flaking out on large numbers of URL blocks during verification, and this
helps considerably.
    @BenHenning
    BenHenning committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    3627067 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. Merge branch 'develop' into introduce-better-script-execution-support

    @BenHenning
    BenHenning authored Feb 20, 2024
    Configuration menu
    Copy the full SHA
    a5eb624 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'introduce-better-script-execution-support' into make-to… 

    …do-check-locally-runnable
    @BenHenning
    BenHenning committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    ae239b3 View commit details
    Browse the repository at this point in the history

  3. Fix broken TodoOpenCheck tests & check exemptions. 

    For the former, this mainly involved isolating the gh auth tool
dependency in the same way as GitHubClientTest. This improves
environment independence and test performance.
    @BenHenning
    BenHenning committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    34ea6aa View commit details
    Browse the repository at this point in the history

  4. Merge branch 'make-todo-check-locally-runnable' into upgrade-compute-… 

    …affected-tests

Conflicts:
	scripts/assets/todo_open_exemptions.textproto
	scripts/src/javatests/org/oppia/android/scripts/todo/TodoOpenCheckTest.kt
    @BenHenning
    BenHenning committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    df61985 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e… 

    …xternal
    @BenHenning
    BenHenning committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    161ae8d View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Fix broken checks & failing static checks.

    @BenHenning
    BenHenning committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    8c87993 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'update-rules-jvm-external' into update-dagger-structure 

    Includes some manual fixes due to ":dagger" being moved to top-level.

Conflicts:
	app/BUILD.bazel
	app/src/main/java/org/oppia/android/app/notice/testing/BUILD.bazel
	app/src/sharedTest/java/org/oppia/android/app/notice/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/onboarding/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/exploration/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/onboarding/BUILD.bazel
	domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
	scripts/assets/maven_dependencies.textproto
	third_party/maven_install.json
	third_party/versions.bzl
	utility/src/main/java/org/oppia/android/util/logging/firebase/BUILD.bazel
	utility/src/test/java/org/oppia/android/util/logging/firebase/BUILD.bazel
    @BenHenning
    BenHenning committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    bb6e681 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. Post merge build, test, and static check fixes.

    @BenHenning
    BenHenning committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    5c812a1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'update-dagger-structure' into upgrade-to-kotlin1.6 

    Includes some additional clean-up changes in ClickableAreasImage.

Conflicts:
	app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt
	app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt
	app/src/main/java/org/oppia/android/app/testing/InputInteractionViewTestActivity.kt
	app/src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt
	app/src/main/res/layout/activity_input_interaction_view_test.xml
	app/src/main/res/layout/nav_header_navigation_drawer.xml
	app/src/main/res/layout/profile_picture_activity.xml
	domain/build.gradle
	instrumentation/oppia_instrumentation_test.bzl
	scripts/assets/maven_dependencies.textproto
	testing/build.gradle
	third_party/maven_install.json
	third_party/versions.bzl
    @BenHenning
    BenHenning committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    57c275c View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Merge branch 'develop' into introduce-better-script-execution-support

    @BenHenning
    BenHenning committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    e0e74d5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'introduce-better-script-execution-support' into make-to… 

    …do-check-locally-runnable
    @BenHenning
    BenHenning committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    2dd0cd7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'make-todo-check-locally-runnable' into upgrade-compute-… 

    …affected-tests
    @BenHenning
    BenHenning committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    79a2f0f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e… 

    …xternal
    @BenHenning
    BenHenning committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    60458bf View commit details
    Browse the repository at this point in the history

  5. Merge branch 'update-rules-jvm-external' into update-dagger-structure 

    Conflicts:
	utility/src/main/java/org/oppia/android/util/locale/BUILD.bazel
    @BenHenning
    BenHenning committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    228a037 View commit details
    Browse the repository at this point in the history

  6. Some post-merge fixes. 

    More are needed yet to address all of the Kotlin warnings (which are now
treated as errors).
    @BenHenning
    BenHenning committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    195d604 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'update-dagger-structure' into upgrade-to-kotlin1.6

    @BenHenning
    BenHenning committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    3bdd1e0 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Silence deprecation warnings. 

    These will need to be fixed properly before the PR is ready for review.
    @BenHenning
    BenHenning committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    7cd345b View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Merge branch 'develop' into introduce-better-script-execution-support

    @BenHenning
    BenHenning committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    70df9b3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'introduce-better-script-execution-support' into make-to… 

    …do-check-locally-runnable
    @BenHenning
    BenHenning committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    04fc8b8 View commit details
    Browse the repository at this point in the history

  3. Address reviewer comment.

    @BenHenning
    BenHenning committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    c301eed View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. Merge branch 'develop' into introduce-better-script-execution-support

    @seanlip
    seanlip authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    51a96ce View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Merge commit 'e2f94e41e4cba3bc5b5f3af65f7c43a6543b4c52' into introduc… 

    …e-better-script-execution-support
    @BenHenning
    BenHenning committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    b3e2fd9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'introduce-better-script-execution-support' into make-to… 

    …do-check-locally-runnable
    @BenHenning
    BenHenning committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    73a8bce View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into make-todo-check-locally-runnable

    @BenHenning
    BenHenning committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    f48f78e View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Merge branch 'develop' into make-todo-check-locally-runnable

    @BenHenning
    BenHenning committed May 16, 2024
    Configuration menu
    Copy the full SHA
    02ccc87 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'make-todo-check-locally-runnable' into upgrade-compute-… 

    …affected-tests
    @BenHenning
    BenHenning committed May 16, 2024
    Configuration menu
    Copy the full SHA
    28fcb9d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e… 

    …xternal

Conflicts:
	WORKSPACE
	third_party/maven_install.json
    @BenHenning
    BenHenning committed May 16, 2024
    Configuration menu
    Copy the full SHA
    aa8988c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'update-rules-jvm-external' into update-dagger-structure 

    Conflicts:
	domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
	third_party/maven_install.json
	utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel
    @BenHenning
    BenHenning committed May 16, 2024
    Configuration menu
    Copy the full SHA
    658c9f0 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'update-dagger-structure' into upgrade-to-kotlin1.6 

    Conflicts:
	app/src/main/java/org/oppia/android/app/testing/InputInteractionViewTestActivity.kt
	app/src/main/res/layout/activity_input_interaction_view_test.xml
	app/src/sharedTest/java/org/oppia/android/app/customview/interaction/MathExpressionInteractionsViewTest.kt
	domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
	third_party/maven_install.json
    @BenHenning
    BenHenning committed May 16, 2024
    Configuration menu
    Copy the full SHA
    53d42e1 View commit details
    Browse the repository at this point in the history

  6. Address self-review comments.

    @BenHenning
    BenHenning committed May 16, 2024
    Configuration menu
    Copy the full SHA
    4cf06d4 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e… 

    …xternal
    @BenHenning
    BenHenning committed May 17, 2024
    Configuration menu
    Copy the full SHA
    0cc5d5d View commit details
    Browse the repository at this point in the history

  2. Address review comment.

    @BenHenning
    BenHenning committed May 17, 2024
    Configuration menu
    Copy the full SHA
    c43c036 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'update-rules-jvm-external' into update-dagger-structure 

    Conflicts:
	third_party/maven_install.json
    @BenHenning
    BenHenning committed May 17, 2024
    Configuration menu
    Copy the full SHA
    c30a839 View commit details
    Browse the repository at this point in the history

  4. Post-merge fixes.

    @BenHenning
    BenHenning committed May 17, 2024
    Configuration menu
    Copy the full SHA
    fbac9a2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'update-dagger-structure' into upgrade-to-kotlin1.6 

    Conflicts:
	domain/src/main/java/org/oppia/android/domain/auth/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/oppialogger/survey/BUILD.bazel
	domain/src/main/java/org/oppia/android/domain/survey/BUILD.bazel
	testing/src/main/java/org/oppia/android/testing/firebase/BUILD.bazel
	third_party/maven_install.json
    @BenHenning
    BenHenning committed May 17, 2024
    Configuration menu
    Copy the full SHA
    840de58 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. Fix NetworkLoggingInterceptorTest.

    @BenHenning
    BenHenning committed May 20, 2024
    Configuration menu
    Copy the full SHA
    ce2c34b View commit details
    Browse the repository at this point in the history

  2. Fix more tests & upgrade Robolectric. 

    Fixing one of the test warnings required upgrading to Robolectric 4.9
(to add support for SDK 33 which the app has targeted for the past ~6
months).
    @BenHenning
    BenHenning committed May 20, 2024
    Configuration menu
    Copy the full SHA
    0f48cf5 View commit details
    Browse the repository at this point in the history

  3. Fix more broken tests.

    @BenHenning
    BenHenning committed May 20, 2024
    Configuration menu
    Copy the full SHA
    caf6f28 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Undo Robolectric upgrade. 

    Robolectric upgrade is hard: it requires upgrading Espresso in order to
work around robolectric/robolectric#7367 and
robolectric/robolectric#6593. However, newer
Espresso makes use of new manifest features that require upgrading
Bazel: bazelbuild/bazel#14285. Because
upgrading Kotlin is a precursor to the Bazel upgrade, a workaround for
the single test that required the Robolectric upgrade (due to using a
deprecated API from SDK 33 without being able to actually use SDK 33 in
the test) is the best approach here until Robolectric can actually be
upgraded in the future.
    @BenHenning
    BenHenning committed May 21, 2024
    Configuration menu
    Copy the full SHA
    118d32f View commit details
    Browse the repository at this point in the history

  2. Upgrade to rules_kotlin 1.5.0 beta 3. 

    This is in preparation for the codebase-wide upgrade to Kotlin 1.6.
    @BenHenning
    BenHenning committed May 21, 2024
    Configuration menu
    Copy the full SHA
    956b358 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upgrade-to-newer-rules-kotlin' into upgrade-to-kotlin1.6 

    Conflicts:
	WORKSPACE
	scripts/src/java/org/oppia/android/scripts/testing/TestBazelWorkspace.kt
	third_party/versions.bzl
    @BenHenning
    BenHenning committed May 21, 2024
    Configuration menu
    Copy the full SHA
    dd84da3 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Fix build-time Kotlin & Java warnings. 

    This pulls in non-configuration changes from #4937 that are compatible with the
current Kotlin 1.4.x. Kotlin 1.5 and 1.6 changes will need to come as part of a
downstream PR.
    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    f5c07fc View commit details
    Browse the repository at this point in the history

  2. Fix a few follow-up issues. 

    These are mainly reverting a few more Kotlin 1.5/1.6-specific API
changes.
    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    0429177 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix-build-time-kotlin-java-warnings' into upgrade-to-ko… 

    …tlin1.6

Conflicts:
	app/src/sharedTest/java/org/oppia/android/app/customview/interaction/MathExpressionInteractionsViewTest.kt
	app/src/test/java/org/oppia/android/app/translation/AppLanguageResourceHandlerTest.kt
	data/src/test/java/org/oppia/android/data/backends/gae/NetworkLoggingInterceptorTest.kt
	testing/src/main/java/org/oppia/android/testing/junit/ParameterizedMethod.kt
	utility/src/test/java/org/oppia/android/util/logging/ConsoleLoggerTest.kt
    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    8dcb531 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow 

    Conflicts:
	WORKSPACE
	scripts/src/java/org/oppia/android/scripts/license/MavenDependenciesRetriever.kt
	third_party/maven_install.json
    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    c24069b View commit details
    Browse the repository at this point in the history

  5. Post-merge fixes.

    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    c2fee1b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze… 

    …l-and-kotlin

Conflicts:
	build_vars.bzl
	utility/build.gradle
    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    46c65e8 View commit details
    Browse the repository at this point in the history

  7. Post-merge fix. 

    This probably further breaks the KitKat build, but I'm fairly certain
it's already not working so the main goal is keeping it building until
it can be fully removed later.
    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    d99f1a2 View commit details
    Browse the repository at this point in the history

  8. Follow-up fixes & doc updates. 

    This better prepares the team for moving over to Bazel 6.x by updating
old Bazel and JDK references that are no longer correct. It also fixes
some newer tests added after this branch was started that are Bazel
verison dependent.
    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    31ffc28 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into upgrade-compute-affected-tests

    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    3dc6b7b View commit details
    Browse the repository at this point in the history

  10. Merge branch 'develop' into upgrade-compute-affected-tests

    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    acd1c0d View commit details
    Browse the repository at this point in the history

  11. Address reviewer comment.

    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    c672af0 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'upgrade-compute-affected-tests' into update-rules-jvm-e… 

    …xternal
    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    1b19f5b View commit details
    Browse the repository at this point in the history

  13. Follow-up variable rename for clarity.

    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    3e923e2 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'update-rules-jvm-external' into update-dagger-structure

    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    9af41bd View commit details
    Browse the repository at this point in the history

  15. Merge branch 'update-dagger-structure' into upgrade-to-newer-rules-ko… 

    …tlin
    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    6100394 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'upgrade-to-newer-rules-kotlin' into fix-build-time-kotl… 

    …in-java-warnings
    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    b6c3ebe View commit details
    Browse the repository at this point in the history

  17. Merge branch 'fix-build-time-kotlin-java-warnings' into upgrade-to-ko… 

    …tlin1.6
    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    d3cea44 View commit details
    Browse the repository at this point in the history

  18. Address static check failures. 

    This mainly involved updating CODEOWNERS & fixing a bunch of TODO
references for now-marked deprecations.
    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    da57feb View commit details
    Browse the repository at this point in the history

  19. Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow

    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    32733a0 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze… 

    …l-and-kotlin
    @BenHenning
    BenHenning committed May 22, 2024
    Configuration menu
    Copy the full SHA
    1a67dd6 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Move forward TODO fixes from #4937. 

    These changes should have been in this branch originally.
    @BenHenning
    BenHenning committed May 23, 2024
    Configuration menu
    Copy the full SHA
    441e293 View commit details
    Browse the repository at this point in the history

  2. Remove unused view model bridge classes.

    @BenHenning
    BenHenning committed May 23, 2024
    Configuration menu
    Copy the full SHA
    2f1eed7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix-build-time-kotlin-java-warnings' into upgrade-to-ko… 

    …tlin1.6

Conflicts:
	app/src/main/java/org/oppia/android/app/viewmodel/BUILD.bazel
    @BenHenning
    BenHenning committed May 23, 2024
    Configuration menu
    Copy the full SHA
    0c96f8d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow

    @BenHenning
    BenHenning committed May 23, 2024
    Configuration menu
    Copy the full SHA
    afde202 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Rework CI workflow. 

    This sets up the CI for build stats to run on a cron job across all PRs
rather than for each PR change.
    @BenHenning
    BenHenning committed May 24, 2024
    Configuration menu
    Copy the full SHA
    e57be5b View commit details
    Browse the repository at this point in the history

Commits on May 25, 2024

  1. Address all reviewer comments.

    @BenHenning
    BenHenning committed May 25, 2024
    Configuration menu
    Copy the full SHA
    a07d3a6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze… 

    …l-and-kotlin

Conflicts:
	.github/workflows/stats.yml

Note that the conflict resolutions here are probably not complete as
more thought will need to go into recent changes to the build stats CI
workflow and how it will impact the build environment differences being
introduced in this branch.
    @BenHenning
    BenHenning committed May 25, 2024
    Configuration menu
    Copy the full SHA
    0b7d357 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2024

  1. Address reviewer comments + other simplifications.

    @BenHenning
    BenHenning committed May 26, 2024
    Configuration menu
    Copy the full SHA
    d2185a4 View commit details
    Browse the repository at this point in the history

  2. Pull in other warning fixes from #4886.

    @BenHenning
    BenHenning committed May 26, 2024
    Configuration menu
    Copy the full SHA
    785d408 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix-build-time-kotlin-java-warnings' into upgrade-to-ko… 

    …tlin1.6
    @BenHenning
    BenHenning committed May 26, 2024
    Configuration menu
    Copy the full SHA
    7ccba36 View commit details
    Browse the repository at this point in the history

  4. Pulled forward Gradle change from #4886.

    @BenHenning
    BenHenning committed May 26, 2024
    Configuration menu
    Copy the full SHA
    f74d059 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow

    @BenHenning
    BenHenning committed May 26, 2024
    Configuration menu
    Copy the full SHA
    baa2c50 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze… 

    …l-and-kotlin
    @BenHenning
    BenHenning committed May 26, 2024
    Configuration menu
    Copy the full SHA
    42ab459 View commit details
    Browse the repository at this point in the history

  7. Static check fixes.

    @BenHenning
    BenHenning committed May 26, 2024
    Configuration menu
    Copy the full SHA
    455342b View commit details
    Browse the repository at this point in the history

  8. Re-add missing newline.

    @BenHenning
    BenHenning committed May 26, 2024
    Configuration menu
    Copy the full SHA
    1ee44c7 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into update-rules-jvm-external

    @BenHenning
    BenHenning committed May 26, 2024
    Configuration menu
    Copy the full SHA
    7951d46 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. Merge branch 'develop' into update-rules-jvm-external

    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    d4d8646 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'update-rules-jvm-external' into update-dagger-structure

    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    b6cfd74 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into update-dagger-structure

    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    0468e81 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'update-dagger-structure' into upgrade-to-newer-rules-ko… 

    …tlin
    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    47ad078 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'upgrade-to-newer-rules-kotlin' into fix-build-time-kotl… 

    …in-java-warnings
    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    828e43e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'fix-build-time-kotlin-java-warnings' into upgrade-to-ko… 

    …tlin1.6
    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    eda781e View commit details
    Browse the repository at this point in the history

  7. Down version to 1.6.10. 

    This is to ensure Jetpack Compose compatibility.
    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    82c530a View commit details
    Browse the repository at this point in the history

  8. Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow 

    Conflicts:
	third_party/maven_install.json
    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    05bc1c2 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze… 

    …l-and-kotlin

Conflicts:
	third_party/maven_install.json
    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    386a487 View commit details
    Browse the repository at this point in the history

  10. Update third-party wrappers to use aliases. 

    Aliases are cleaner and possibly more performant, but also more
semantically correct than using wrapper libraries. Wrappers are now only
used when actually needed (due to additional functionality or multiple
targets being combined together).
    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    62795b1 View commit details
    Browse the repository at this point in the history

  11. Update Troubleshooting-Installation.md 

    Fix formatting issue with the wiki markdown.
    @BenHenning
    BenHenning authored May 27, 2024
    Configuration menu
    Copy the full SHA
    1a51da1 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Merge branch 'develop' into upgrade-to-newer-rules-kotlin

    @BenHenning
    BenHenning committed May 28, 2024
    Configuration menu
    Copy the full SHA
    7c186c3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upgrade-to-newer-rules-kotlin' into fix-build-time-kotl… 

    …in-java-warnings
    @BenHenning
    BenHenning committed May 28, 2024
    Configuration menu
    Copy the full SHA
    dffff83 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Address review comment.

    @BenHenning
    BenHenning committed May 29, 2024
    Configuration menu
    Copy the full SHA
    bc79bf7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into fix-build-time-kotlin-java-warnings 

    Conflicts:
	domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerImpl.kt
    @BenHenning
    BenHenning committed May 29, 2024
    Configuration menu
    Copy the full SHA
    2d3f5d5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix-build-time-kotlin-java-warnings' into upgrade-to-ko… 

    …tlin1.6

Conflicts:
	domain/BUILD.bazel
	third_party/versions.bzl
    @BenHenning
    BenHenning committed May 29, 2024
    Configuration menu
    Copy the full SHA
    bc98d27 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow

    @BenHenning
    BenHenning committed May 29, 2024
    Configuration menu
    Copy the full SHA
    bacbc2a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze… 

    …l-and-kotlin

Conflicts:
	third_party/versions.bzl
    @BenHenning
    BenHenning committed May 29, 2024
    Configuration menu
    Copy the full SHA
    16af8e1 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. Merge branch 'develop' into fix-build-time-kotlin-java-warnings

    @BenHenning
    BenHenning committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    4b26fd5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix-build-time-kotlin-java-warnings' into upgrade-to-ko… 

    …tlin1.6
    @BenHenning
    BenHenning committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    fd69342 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Merge branch 'develop' into fix-build-time-kotlin-java-warnings

    @BenHenning
    BenHenning committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    3dcc2ac View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix-build-time-kotlin-java-warnings' into upgrade-to-ko… 

    …tlin1.6
    @BenHenning
    BenHenning committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    4cbf04c View commit details
    Browse the repository at this point in the history

  3. Add config for Kotlin warnings. 

    Add a config to allow warnings-as-errors to be disabled for local
development to make things easier. The default is still to treat them as
errors (and that will be the build configuration for CI, so PRs
shouldn't be mergeable with Kotlin build warnings).
    @BenHenning
    BenHenning committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    f97c111 View commit details
    Browse the repository at this point in the history

  4. Address reviewer comment.

    @BenHenning
    BenHenning committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    e9ac7f3 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow

    @BenHenning
    BenHenning committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    c1d6959 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze… 

    …l-and-kotlin
    @BenHenning
    BenHenning committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    5347c9b View commit details
    Browse the repository at this point in the history

  7. Reconfigure Java in Bazel. 

    This change ensures that builds, tools, and local tests all use the same
version of Java, and specifically the remote JDK 11 that's bundled
within Bazel itself (or, rather, downloaded by Bazel during workspace
setup). This ensures more consistency across different build
configurations, and has subsequently led to a significant simplification
of setup instructions for Linux, Mac, and Windows.

Separately, I also noticed that the Python instructions seem outdated
now that the project has been migrated to Bazel 6.x. Python 2 should no
longer be needed.
    @BenHenning
    BenHenning committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    e62a51e View commit details
    Browse the repository at this point in the history

  8. Undo action.yml changes. 

    Java is probably still needed for sdkmanager.
    @BenHenning
    BenHenning committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    bfb583b View commit details
    Browse the repository at this point in the history

  9. Address lint failures.

    @BenHenning
    BenHenning committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    3b682f0 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow

    @BenHenning
    BenHenning committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    9af2662 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze… 

    …l-and-kotlin
    @BenHenning
    BenHenning committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    daf282f View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Merge branch 'develop' into upgrade-to-kotlin1.6

    @BenHenning
    BenHenning committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    89a184d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upgrade-to-kotlin1.6' into add-build-stats-ci-workflow

    @BenHenning
    BenHenning committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    cae201f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into add-build-stats-ci-workflow

    @BenHenning
    BenHenning committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    62858bb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'add-build-stats-ci-workflow' into migrate-to-newer-baze… 

    …l-and-kotlin
    @BenHenning
    BenHenning committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    95671b5 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Apply suggestions from code review 

    Revert changes to Windows doc.
    @BenHenning
    BenHenning authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    9e4b083 View commit details
    Browse the repository at this point in the history