Skip to content

Fix part of #5663: Remove json lesson files #6143

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

Draft
harshsomankar123-tech wants to merge 8 commits into
base: develop
Choose a base branch
from
Draft

Fix part of #5663: Remove json lesson files #6143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
15cdf1c
Remove LoadLessonProtosFromAssets annotation and module providers
harshsomankar123-tech Mar 4, 2026
a5a6dc4
Remove JSON loading paths and use proto-only lesson loading
harshsomankar123-tech Mar 4, 2026
6f7c58e
Delete JSON lesson asset files
harshsomankar123-tech Mar 4, 2026
fb4eacf
Clean up test files and config after JSON removal
harshsomankar123-tech Mar 4, 2026
231b349
Merge remote-tracking branch 'upstream/develop' into remove-json-less…
harshsomankar123-tech Mar 11, 2026
cb050ae
Remove unrelated changes from PR
harshsomankar123-tech Mar 19, 2026
deab472
Merge remote-tracking branch 'upstream/develop' into remove-json-less…
harshsomankar123-tech Apr 3, 2026
137e5e2
Fix CI failures: remove empty exemption block and fix stray @Provides…
harshsomankar123-tech Apr 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/stale.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ markComment: >
If no further activity occurs within **7 days**, it will be automatically closed so that others can take up the issue.

If you are still working on this PR, please make a follow-up commit within **3 days** (and submit it for review, if applicable).
Please also let us know if you are stuck so we can help you!
If you're unsure how to reassign this PR to a reviewer, please make sure to
review the wiki page that details the [Guidance on submitting PRs](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section).
Please also let us know if you are stuck so we can help you!

# Limit the number of actions per hour, from 1-30. Default is 30
limitPerRun: 30
Expand Down
3 changes: 0 additions & 3 deletions app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ import org.oppia.android.testing.time.FakeOppiaClockModule
import org.oppia.android.util.accessibility.AccessibilityTestModule
import org.oppia.android.util.caching.AssetModule
import org.oppia.android.util.caching.LoadImagesFromAssets
import org.oppia.android.util.caching.LoadLessonProtosFromAssets
import org.oppia.android.util.extensions.getProto
import org.oppia.android.util.gcsresource.GcsResourceModule
import org.oppia.android.util.locale.LocaleProdModule
Expand Down Expand Up @@ -7117,8 +7116,6 @@ class StateFragmentTest {
@Module
class TestModule {
@Provides
@LoadLessonProtosFromAssets
fun provideLoadLessonProtosFromAssets(): Boolean = true

@Provides
@LoadImagesFromAssets
Expand Down
3 changes: 0 additions & 3 deletions app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ import org.oppia.android.testing.time.FakeOppiaClockModule
import org.oppia.android.util.accessibility.AccessibilityTestModule
import org.oppia.android.util.caching.AssetModule
import org.oppia.android.util.caching.LoadImagesFromAssets
import org.oppia.android.util.caching.LoadLessonProtosFromAssets
import org.oppia.android.util.extensions.getProto
import org.oppia.android.util.gcsresource.GcsResourceModule
import org.oppia.android.util.locale.LocaleProdModule
Expand Down Expand Up @@ -583,8 +582,6 @@ class ConceptCardFragmentTest {
@Module
class TestModule {
@Provides
@LoadLessonProtosFromAssets
fun provideLoadLessonProtosFromAssets(): Boolean = true

@Provides
@LoadImagesFromAssets
Expand Down
3 changes: 0 additions & 3 deletions app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ import org.oppia.android.testing.time.FakeOppiaClockModule
import org.oppia.android.util.accessibility.AccessibilityTestModule
import org.oppia.android.util.caching.AssetModule
import org.oppia.android.util.caching.LoadImagesFromAssets
import org.oppia.android.util.caching.LoadLessonProtosFromAssets
import org.oppia.android.util.extensions.getProto
import org.oppia.android.util.gcsresource.GcsResourceModule
import org.oppia.android.util.locale.LocaleProdModule
Expand Down Expand Up @@ -905,8 +904,6 @@ class RevisionCardFragmentTest {
@Module
class TestModule {
@Provides
@LoadLessonProtosFromAssets
fun provideLoadLessonProtosFromAssets(): Boolean = true

@Provides
@LoadImagesFromAssets
Expand Down
4 changes: 0 additions & 4 deletions ...Test/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ import org.oppia.android.testing.time.FakeOppiaClockModule
import org.oppia.android.util.accessibility.AccessibilityTestModule
import org.oppia.android.util.caching.AssetModule
import org.oppia.android.util.caching.LoadImagesFromAssets
import org.oppia.android.util.caching.LoadLessonProtosFromAssets
import org.oppia.android.util.gcsresource.GcsResourceModule
import org.oppia.android.util.locale.LocaleProdModule
import org.oppia.android.util.logging.LoggerModule
Expand Down Expand Up @@ -276,9 +275,6 @@ class WalkthroughTopicListFragmentTest {
@Module
class TestModule {
@Provides
@LoadLessonProtosFromAssets
// TODO(#5663): Use proto assets in this test once thumbnails load correctly.
fun provideLoadLessonProtosFromAssets(): Boolean = false

@Provides
@LoadImagesFromAssets
Expand Down
3 changes: 0 additions & 3 deletions app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ import org.oppia.android.util.accessibility.AccessibilityTestModule
import org.oppia.android.util.accessibility.FakeAccessibilityService
import org.oppia.android.util.caching.AssetModule
import org.oppia.android.util.caching.LoadImagesFromAssets
import org.oppia.android.util.caching.LoadLessonProtosFromAssets
import org.oppia.android.util.gcsresource.GcsResourceModule
import org.oppia.android.util.locale.LocaleProdModule
import org.oppia.android.util.logging.LoggerModule
Expand Down Expand Up @@ -2996,8 +2995,6 @@ class StateFragmentLocalTest {
@Module
class TestModule {
@Provides
@LoadLessonProtosFromAssets
fun provideLoadLessonProtosFromAssets(): Boolean = true

@Provides
@LoadImagesFromAssets
Expand Down
Loading
Loading