Open
Conversation
* Update version to 3.4.0-DEV * chore: correct design system version --------- Co-authored-by: @dhis2-bot <apps@dhis2.org> Co-authored-by: Xavier Molloy <xavi@dhis2.org>
dhis2#4576) Bumps the gradle-updates group with 15 updates in the / directory: | Package | From | To | | --- | --- | --- | | [org.hisp.dhis.lib.expression:expression-parser-jvm](https://github.com/dhis2/expression-parser) | `1.2.1` | `1.2.2` | | androidx.compose.material:material | `1.9.3` | `1.9.5` | | androidx.compose.ui:ui | `1.9.3` | `1.9.5` | | androidx.compose.runtime:runtime-livedata | `1.9.3` | `1.9.5` | | androidx.compose.ui:ui-tooling | `1.9.3` | `1.9.5` | | androidx.compose.ui:ui-tooling-preview | `1.9.3` | `1.9.5` | | androidx.compose.ui:ui-test-junit4 | `1.9.3` | `1.9.5` | | androidx.compose.ui:ui-test-manifest | `1.9.3` | `1.9.5` | | androidx.compose.ui:ui-test-junit4-android | `1.9.3` | `1.9.5` | | [org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose](https://github.com/JetBrains/compose-jb) | `2.9.5` | `2.9.6` | | com.google.android.gms:play-services-auth-api-phone | `18.0.1` | `18.0.2` | | [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) | `6.0.1` | `6.0.2` | | org.jetbrains.compose | `1.9.1` | `1.9.3` | | [com.google.devtools.ksp](https://github.com/google/ksp) | `2.2.20-2.0.4` | `2.2.21-2.0.4` | | org.sonarqube | `7.0.0.6105` | `7.0.1.6134` | Updates `org.hisp.dhis.lib.expression:expression-parser-jvm` from 1.2.1 to 1.2.2 - [Release notes](https://github.com/dhis2/expression-parser/releases) - [Commits](dhis2/expression-parser@v1.2.1...v1.2.2) Updates `androidx.compose.material:material` from 1.9.3 to 1.9.5 Updates `androidx.compose.ui:ui` from 1.9.3 to 1.9.5 Updates `androidx.compose.runtime:runtime-livedata` from 1.9.3 to 1.9.5 Updates `androidx.compose.ui:ui-tooling` from 1.9.3 to 1.9.5 Updates `androidx.compose.ui:ui-tooling-preview` from 1.9.3 to 1.9.5 Updates `androidx.compose.ui:ui-test-junit4` from 1.9.3 to 1.9.5 Updates `androidx.compose.ui:ui-test-manifest` from 1.9.3 to 1.9.5 Updates `androidx.compose.ui:ui-test-junit4-android` from 1.9.3 to 1.9.5 Updates `androidx.compose.ui:ui` from 1.9.3 to 1.9.5 Updates `androidx.compose.runtime:runtime-livedata` from 1.9.3 to 1.9.5 Updates `androidx.compose.ui:ui-tooling` from 1.9.3 to 1.9.5 Updates `androidx.compose.ui:ui-tooling-preview` from 1.9.3 to 1.9.5 Updates `org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose` from 2.9.5 to 2.9.6 - [Release notes](https://github.com/JetBrains/compose-jb/releases) - [Changelog](https://github.com/JetBrains/compose-multiplatform/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/compose-jb/commits) Updates `com.google.android.gms:play-services-auth-api-phone` from 18.0.1 to 18.0.2 Updates `androidx.compose.ui:ui-test-junit4` from 1.9.3 to 1.9.5 Updates `androidx.compose.ui:ui-test-manifest` from 1.9.3 to 1.9.5 Updates `androidx.compose.ui:ui-test-junit4-android` from 1.9.3 to 1.9.5 Updates `org.junit.jupiter:junit-jupiter` from 6.0.1 to 6.0.2 - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](junit-team/junit-framework@r6.0.1...r6.0.2) Updates `org.jetbrains.compose` from 1.9.1 to 1.9.3 Updates `com.google.devtools.ksp` from 2.2.20-2.0.4 to 2.2.21-2.0.4 - [Release notes](https://github.com/google/ksp/releases) - [Commits](google/ksp@2.2.20-2.0.4...2.2.21-2.0.4) Updates `org.sonarqube` from 7.0.0.6105 to 7.0.1.6134 --- updated-dependencies: - dependency-name: org.hisp.dhis.lib.expression:expression-parser-jvm dependency-version: 1.2.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: androidx.compose.material:material dependency-version: 1.9.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: androidx.compose.ui:ui dependency-version: 1.9.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: androidx.compose.runtime:runtime-livedata dependency-version: 1.9.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: androidx.compose.ui:ui-tooling dependency-version: 1.9.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: androidx.compose.ui:ui-tooling-preview dependency-version: 1.9.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: androidx.compose.ui:ui-test-junit4 dependency-version: 1.9.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: androidx.compose.ui:ui-test-manifest dependency-version: 1.9.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: androidx.compose.ui:ui-test-junit4-android dependency-version: 1.9.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: androidx.compose.ui:ui dependency-version: 1.9.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: androidx.compose.runtime:runtime-livedata dependency-version: 1.9.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: androidx.compose.ui:ui-tooling dependency-version: 1.9.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: androidx.compose.ui:ui-tooling-preview dependency-version: 1.9.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose dependency-version: 2.9.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: com.google.android.gms:play-services-auth-api-phone dependency-version: 18.0.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: androidx.compose.ui:ui-test-junit4 dependency-version: 1.9.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: androidx.compose.ui:ui-test-manifest dependency-version: 1.9.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: androidx.compose.ui:ui-test-junit4-android dependency-version: 1.9.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: org.junit.jupiter:junit-jupiter dependency-version: 6.0.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: org.jetbrains.compose dependency-version: 1.9.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: com.google.devtools.ksp dependency-version: 2.2.21-2.0.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates - dependency-name: org.sonarqube dependency-version: 7.0.1.6134 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-updates ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…his2#4579) * feat: add workflow and gradle plugin for generating sbom * feat: add workflow and gradle plugin for generating sbom
… of https://github.com/dhis2/dhis2-android-capture-app into ANDROAPP-7435-Deprecate-Android-sdk-versions-21-and-22
…oid-sdk-versions-21-and-22 chore: [ANDROAPP-7435] Deprecate android sdk versions 21 and 22
…is2#4559) * fix: [ANDROAPP-7348] Enable dependency verification * fix: [ANDROAPP-7348] Enable dependency verification only for release builds * fix: [ANDROAPP-7348] Enable dependency verification only for release builds * fix: [ANDROAPP-7348] code clean up * chore: [ANDROAPP-7348] Update dependency verification file * chore: [ANDROAPP-7348] Update dependency verification file * chore: [ANDROAPP-7348] Update dependency verification file * chore: [ANDROAPP-7348] updated dependency verification mode to lenient * fix: [ANDROAPP-7348] update continuous-delivery job * fix: [ANDROAPP-7348] update Jenkinsfile job * fix: [ANDROAPP-7348] update sonarcube script * fix: [ANDROAPP-7348] update remaining git hub actions for dependency verification
…rification chore: update dependency verification file
…senter test [skip size] (dhis2#4600) * chore: [ANDROAPP-7463] update databaseCreationDate type * chore: [ANDROAPP-7463] fix test * chore: [ANDROAPP-7463] add dependency verification metadata
…his2#4590) * chore: rename dependency-track workflow and set gradle group/version * chore: rename dependency-track workflow and set gradle group/version * chore: rename dependency-track workflow and set gradle group/version * reverting changes * chore: [ANDROAPP-7432] added workflow_dispatch:
chore: Update develop with Release 3.3.1 [skip size]
* fix: Manage Invalid configuration d2 error * fix: Update deprecated sdk methods * fix: fix unit tests
…his2#4603) * updates continues delivery workflow * updates continues delivery workflow * Add debug suffix to apk name * Add config for using debug keystore store in the CI * change debug keystore name and extension * change debug keystore name and extension
…-add-search-operators ANDROAPP-7545-update-test-db-add-search-operators
…e] (dhis2#4700) * feat: Add ColorMatcher.kt to find the closest color palette * fix: [ANDROAPP-7521] Use configuration theme colour * fix: [ANDROAPP-7521] set background compose color to theme color correctly in settings screen * fix: [ANDROAPP-7521] update warnings in colorUtils file * fix: [ANDROAPP-7521] copilot review comments * fix: [ANDROAPP-7521] remember color property to avoid recompositions --------- Co-authored-by: Xavier Molloy <xavi@dhis2.org>
* feat: [ANDROAPP-7445] adapt to mandatory dataset for value Signed-off-by: Manu Muñoz <manu.munoz@dhis2.org> * feat: [ANDROAPP-7445] adapt to mandatory dataset for value Signed-off-by: Manu Muñoz <manu.munoz@dhis2.org> * sonarcloud depecrated networkutils Signed-off-by: Manu Muñoz <manu.munoz@dhis2.org> --------- Signed-off-by: Manu Muñoz <manu.munoz@dhis2.org>
…is2#4722) * fix: [ANDROAPP-7530] Sync config status not updating occasionally * added test * fix rebase
Signed-off-by: Manu Muñoz <manu.munoz@dhis2.org>
* feat: Modify PinBottomSheet file to use fullScreenDialog component * feat: Remove old PinView.kt and replace it by PinBottomSheet * test: remove pin test * refactor: update ViewCompositionStrategy in PinBottomSheetLauncher (dhis2#4707) * fix: manage PIN bottom sheet lifecycle in MainActivity * feat: refactor PinBottomSheet to support previews and improve landscape layout * refactor: rename PinBottomSheet to PinDialog and reorganize PIN models * refactor: update PIN UI state management and resource handling * feat: add key icon to PIN dialog primary button when in SET mode * refactor: simplify PinDialog by passing uiState to PinInputBlock and renaming components * fix: Set contentDescription to null for Pin Icon in PinDialog.kt * fix: enable vertical scrolling and update layout constraints in PinDialog * refactor: update PinDialog layout to use a Row with side-by-side scrollable columns --------- Co-authored-by: Xavier Molloy <xavi@dhis2.org>
…p size] (dhis2#4733) * add way to skip display related actions in rules * fix rebase * fix: [ANDROAPP-7455] Improve program rules performance * fix test * fix tests * remove parameter
…#4736) * fix: [ANDROAPP-7539] optimize data loading in stock management * fix: [ANDROAPP-7539] fix tests
…ize] (dhis2#4731) * fix(translations): sync translations from transifex (develop) WARNING: This automated sync from transifex removed more lines than it added. Please check carefully before merging! * fix(translations): fix ellipsis character entities in vi and uz-rUZ strings * fix(translations): remove unnecessary backslash escapes from question marks in strings.xml * fix(translations): remove `data_sync_warning_program` string from multiple locales and fix character escaping in Spanish translation. --------- Co-authored-by: andresmr <andres@dhis2.org>
* Update rule engine version to 3.7.0 Co-authored-by: andresmr <3330344+andresmr@users.noreply.github.com> * Add rule-engine-jvm 3.7.0 checksums to verification-metadata.xml Co-authored-by: andresmr <3330344+andresmr@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: andresmr <3330344+andresmr@users.noreply.github.com>
* feat: [ANDROAPP-7456] Legend evaluation for rule actions Implement legend evaluation for Display KeyValue Pair rule actions * fix: [ANDROAPP-7456] Update regex for legend sets + use RuleConstants * Add test class for value parser; identify negative numbers --------- Co-authored-by: Fernando Gomez <fgomez@baosystems.com>
* fix: [ANDROAPP-7495] Update filters in main thread * fix: [ANDROAPP-7495] fix tests * fix: [ANDROAPP-7495] inject dispather
…if sync is still running (dhis2#4789)
…c metadata settings triggered when job is set to manual initially (dhis2#4792)
…ed (dhis2#4835) * fix: [ANDROAPP-7569] Set default sync periods if ASWA is not configured * fix: [ANDROAPP-7569] Set default sync periods if ASWA is not configured
* Update version code, sdk, and design system release version * build: 3.4.0 release --------- Co-authored-by: @dhis2-bot <apps@dhis2.org> Co-authored-by: andresmr <andres@dhis2.org>
# Conflicts: # app/src/main/res/values-en-rUS/strings.xml # app/src/main/res/values-hi-rIN/strings.xml # app/src/main/res/values-zh/strings.xml # commons/src/main/res/values-en-rUS/strings.xml # commons/src/main/res/values-ru/strings.xml # commons/src/main/res/values-zh-rCN/strings.xml # commonskmm/src/commonMain/composeResources/values-cs/strings.xml # commonskmm/src/commonMain/composeResources/values-en-rUS/strings.xml # commonskmm/src/commonMain/composeResources/values-es/strings.xml # commonskmm/src/commonMain/composeResources/values-fr/strings.xml # commonskmm/src/commonMain/composeResources/values-hi-rIN/strings.xml # commonskmm/src/commonMain/composeResources/values-lo/strings.xml # commonskmm/src/commonMain/composeResources/values-zh/strings.xml # form/src/main/res/values-en-rUS/strings.xml # form/src/main/res/values-hi-rIN/strings.xml # login/src/commonMain/composeResources/values-cs/strings.xml # login/src/commonMain/composeResources/values-en-rUS/strings.xml # login/src/commonMain/composeResources/values-zh/strings.xml # stock-usecase/src/main/res/values-cs/strings.xml # stock-usecase/src/main/res/values-nl/strings.xml # stock-usecase/src/main/res/values-zh/strings.xml # sync/src/commonMain/composeResources/values-ar/strings.xml # sync/src/commonMain/composeResources/values-ckb/strings.xml # sync/src/commonMain/composeResources/values-cs/strings.xml # sync/src/commonMain/composeResources/values-es-rES/strings.xml # sync/src/commonMain/composeResources/values-es/strings.xml # sync/src/commonMain/composeResources/values-fr/strings.xml # sync/src/commonMain/composeResources/values-id/strings.xml # sync/src/commonMain/composeResources/values-km/strings.xml # sync/src/commonMain/composeResources/values-lo/strings.xml # sync/src/commonMain/composeResources/values-nb/strings.xml # sync/src/commonMain/composeResources/values-nl/strings.xml # sync/src/commonMain/composeResources/values-pt/strings.xml # sync/src/commonMain/composeResources/values-ru/strings.xml # sync/src/commonMain/composeResources/values-sv/strings.xml # sync/src/commonMain/composeResources/values-uk/strings.xml # sync/src/commonMain/composeResources/values-uz-rUZ/strings.xml # sync/src/commonMain/composeResources/values-uz/strings.xml # sync/src/commonMain/composeResources/values-vi/strings.xml # sync/src/commonMain/composeResources/values-zh-rCN/strings.xml # sync/src/commonMain/composeResources/values-zh/strings.xml # tracker/src/commonMain/composeResources/values-ar/strings.xml # tracker/src/commonMain/composeResources/values-ckb/strings.xml # tracker/src/commonMain/composeResources/values-cs/strings.xml # tracker/src/commonMain/composeResources/values-es-rES/strings.xml # tracker/src/commonMain/composeResources/values-hi-rIN/strings.xml # tracker/src/commonMain/composeResources/values-id/strings.xml # tracker/src/commonMain/composeResources/values-nb/strings.xml # tracker/src/commonMain/composeResources/values-prs/strings.xml # tracker/src/commonMain/composeResources/values-pt-rBR/strings.xml # tracker/src/commonMain/composeResources/values-uk/strings.xml # tracker/src/commonMain/composeResources/values-uz/strings.xml # tracker/src/commonMain/composeResources/values-zh/strings.xml # ui-components/src/main/res/values-fr/strings.xml # ui-components/src/main/res/values-hi-rIN/strings.xml # ui-components/src/main/res/values-lo/strings.xml
Release/3.4.0
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
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.
This PR brings upstream-tracking
release/3.4.0-RCbranch to be merged intomain.Release merge commit in the upstream-tracking
upstream-mainbranch of this (fork) repo: f75af25503ec95e6165559dfd9bfbb6ee237826a.Release merge commit in the
mainbranch of the dhis2/dhis2-android-capture-app upstream repo: f75af25503ec95e6165559dfd9bfbb6ee237826a.For your reference, this Action's config can be viewed here, and the run logs here.