[OCBA] Bring last changes 3.2.1.2 - #294
Open
xurxodev wants to merge 815 commits into
Open
Conversation
build: 3.1.1 release
Merge Release/3.1.1 rc into main
Update develop with Release 3.1.1
* Update version to 3.2.0-DEV * chore: update desigSystem to 0.5.0 and SDK to 1.12.0 Signed-off-by: andresmr <andres@dhis2.org> * chore: non null feature type --------- Signed-off-by: andresmr <andres@dhis2.org> Co-authored-by: @dhis2-bot <apps@dhis2.org> Co-authored-by: andresmr <andres@dhis2.org>
…ng (dhis2#3926) * ci: [ANDROAPP-6713] add mocked request for reserved values * ci: [ANDROAPP-6713] Add test in landscape in Jenkinsfile * ci: [ANDROAPP-6713] run landscape tests on for scheduled jobs * ci: [ANDROAPP-6713] run landscape tests on for scheduled jobs
* build: update version vName and vCode * build: update RELEASE.md file
* feat: [ANDROAPP-6780] Add Sdk to aggregate module * feat: [ANDROAPP-6780] Added real use case scenario * feat: [ANDROAPP-6780] Added real use case scenario * feat: [ANDROAPP-6780] Refactor previews * add desugar to android * fix desugar * fix review comments
Release/3.1.1.1 rc
# Conflicts: # gradle/libs.versions.toml
Release/3.1.1.1 rc
* test: remove migrated test in ANDROAPP-6756 Signed-off-by: Manu Muñoz <manu.munoz@dhis2.org> * test: [ANDROAPP-6756] specify access level to RelationshipTypes fake models --------- Signed-off-by: Manu Muñoz <manu.munoz@dhis2.org> Co-authored-by: andresmr <andres@dhis2.org>
* test: [ANDROAPP-6802] Start datasetAutomate test * test: [ANDROAPP-6802] DatasetAutomate checkFilter combination * test: [ANDROAPP-6802] DatasetAutomate checkFilter combination * test: [ANDROAPP-6802] DatasetAutomate enable DatasetInstanceScreen by feature config * test: [ANDROAPP-6802] DatasetAutomate move filters after create dataset instance * test: [ANDROAPP-6802] fix ci
* feat: [ANDROAPP-6642] Create new commons multiplatform project with POC HTML converter, add dependency and import from aggregate module * build: [ANDROAPP-6820] remove html parser files and logic, add desktop module * build: [ANDROAPP-6820] revert modification in DataSetSection, remove unnecessary dependencies * build: [ANDROAPP-6820] remove ktxml dependency
* fix: [ANDROAPP-6754] Adapt bottom sheet buttons to new usage * fix: [ANDROAPP-6754] update bottomsheet to new uses * fix: [ANDROAPP-6754] Adapt BottomSheet usages to new implementation * fix: [ANDROAPP-6754] Migrate BottomSheetDialog to Commons module and deprecate it to ensure new calls to BottomSheetShell are done directly. * fix: [ANDROAPP-6754] Add window insets for bottom sheet in legend and for MultiSelectionInputProvider * fix: [ANDROAPP-6754] small corrections after rebase * fix: [ANDROAPP-6754] update login pop up and orgbottomsheet * fix: [ANDROAPP-6754] don't show dividers in schedule pop up * fix: [ANDROAPP-6754] ktlint fix * fix: [ANDROAPP-6754] update defaults paddings to be passed externally in InputFieldsProvider * feat: [ANDROAPP-6754] remove unnecessary spacers, use alias type for BottomSheetDialog import * feat: [ANDROAPP-6754] remove another unnecessary spacer * build: [ANDROAPP-6820] modify crashlitics and biometric login dialog secondary button styles * fix: [ANDROAPP-6754] fix tests * fix: [ANDROAPP-6754] remove unused import
…3984) * fix(translations): sync translations from transifex (develop) * fix(translations): sync translations from transifex (develop) * fix(translations): sync translations from transifex (develop)
* Update version code, sdk, and design system release version * build: Update release notes * build: Update version name --------- Co-authored-by: @dhis2-bot <apps@dhis2.org>
Release 3.2.1.1 [skip size]
fix: update pull request template for clarity and structure
Refine dependency ignore rules for designsystem.
…#4383) - Add comprehensive patterns to ignore versions with +dev suffix - Add pre-release version filtering using update-types - Specifically target JetBrains Compose dependencies - Prevent updates like 2.9.4 to 2.10.0+dev2995
- Remove invalid 'version-update:semver-prerelease' value - Replace with specific version patterns for pre-releases - Fix Dependabot configuration validation error Fixes the error: 'version-update:semver-prerelease' did not match valid values
…his2#4385) * fix: use Gradle-compatible version patterns in dependabot config - Replace wildcard patterns (*+*, *-alpha*) with Gradle-compatible version ranges - Use >= 2.10.0+dev to ignore JetBrains development versions - Use update-types filtering for broader JetBrains dependency control - Fixes Gradle ecosystem validation errors for version requirements Resolves: 'invalid version requirements for a gradle ignore condition' * fix: simplify dependabot config to only ignore +dev versions - Use simple version range '>= 0.0.0+dev' to ignore all +dev versions - Remove complex wildcard patterns that cause Gradle validation errors - Keep existing ignore rules for specific dependencies - Simple and effective solution for the original problem * refactor: remove unnecessary update-types restriction from android-core - Remove update-types restriction from org.hisp.dhis:android-core - Keep simple +dev version filtering with '>= 0.0.0+dev' pattern - Maintain ignore rules for OkHttp and designsystem dependencies - Cleaner and more maintainable configuration
Update translations [skip size]
…his2#4389) * Update version code, sdk, and design system release version * chore: Update release version name * chore: Update release notes and what's new * chore: Update release notes * chore: Update release notes * chore: Update release notes --------- Co-authored-by: @dhis2-bot <apps@dhis2.org>
build: Release 3.2.1.2 [skip size]
…cba/bring_last_changes_3_2_1_2 # Conflicts: # RELEASE.md # app/build.gradle.kts # app/src/main/java/org/dhis2/data/service/ReservedValuesWorkerModule.kt # app/src/main/java/org/dhis2/data/service/SyncPresenterImpl.kt # app/src/main/java/org/dhis2/data/service/workManager/WorkManagerControllerImpl.kt # app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentFormRepositoryImpl.kt # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.kt # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureContract.java # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureFieldProvider.kt # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormFragment.java # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/domain/ConfigureEventCatCombo.kt # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/providers/InputFieldsProvider.kt # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialRepositoryImpl.java # app/src/main/java/org/dhis2/usescases/login/LoginViewModel.kt # app/src/main/java/org/dhis2/usescases/main/MainActivity.kt # app/src/main/java/org/dhis2/usescases/main/program/ProgramFragment.kt # app/src/main/java/org/dhis2/usescases/main/program/ProgramModule.kt # app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepository.kt # app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepositoryImpl.kt # app/src/main/java/org/dhis2/usescases/programEventDetail/eventList/EventListFragment.kt # app/src/main/java/org/dhis2/usescases/programEventDetail/eventList/EventListFragmentView.kt # app/src/main/java/org/dhis2/usescases/programEventDetail/eventList/EventListPresenter.kt # app/src/main/java/org/dhis2/usescases/settings/SyncManagerFragment.java # app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt # app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/relationships/RelationshipRepositoryImpl.kt # app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepositoryImpl.kt # app/src/main/java/org/dhis2/utils/granularsync/SyncStatusDialog.kt # app/src/main/res/layout/fragment_program_event_detail_list.xml # app/src/main/res/values-v21/styles.xml # app/src/main/res/values/strings.xml # app/src/test/java/org/dhis2/data/filter/EventProgramFilterSearchHelperTest.kt # app/src/test/java/org/dhis2/usescases/login/LoginViewModelTest.kt # app/src/test/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailPresenterTest.kt # commons/build.gradle.kts # commons/src/main/java/org/dhis2/commons/bindings/ValueExtensions.kt # commons/src/main/java/org/dhis2/commons/filters/data/FilterRepository.kt # commons/src/main/java/org/dhis2/commons/prefs/PreferenceConstants.kt # form/src/main/java/org/dhis2/form/data/EnrollmentRepository.kt # form/src/main/java/org/dhis2/form/data/EnrollmentRuleEngineRepository.kt # form/src/main/java/org/dhis2/form/data/EventRepository.kt # form/src/main/java/org/dhis2/form/model/FieldUiModel.kt # form/src/main/java/org/dhis2/form/model/FieldUiModelImpl.kt # form/src/main/java/org/dhis2/form/ui/FieldViewModelFactory.kt # form/src/main/java/org/dhis2/form/ui/FieldViewModelFactoryImpl.kt # form/src/main/java/org/dhis2/form/ui/FormViewModel.kt # form/src/main/java/org/dhis2/form/ui/validation/FieldErrorMessageProvider.kt # form/src/main/res/values/strings.xml # form/src/test/java/org/dhis2/form/data/FormValueStoreTest.kt # gradle/libs.versions.toml # settings.gradle.kts
5 tasks
xurxodev
changed the title
xurxodev
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📌 References
⚙️ branches
app:
Origin: feature-ocba/bring_last_changes_3_2_1_2 Target: develop-ocba
dhis2-android-SDK:
Origin: feature/bring_last_changes_1_12_1_1
🎩 What is the goal?
Bring the last changes in 3.2.1.2
📝 How is it being implemented?
💥 How can it be tested?
The customizations in the app should work.
¡Important is necessary to merge related PR in SDK and create a new tag in the SDK!. This practice is new by @ifoche
💾 Requires DB migration?
🎨 UI changes?