Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/benchmark_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
sudo udevadm trigger --name-match=kvm

- name: Checkout Android source
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Setup JDK
uses: actions/setup-java@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

- name: Checkout
if: github.event.inputs.tramline-input == null || github.event.inputs.tramline-input == ''
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Setup JDK
uses: actions/setup-java@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_sandbox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

- name: Checkout
if: github.event.inputs.tramline-input == null || github.event.inputs.tramline-input == ''
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Setup JDK
uses: actions/setup-java@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

- name: Checkout
if: github.event.inputs.tramline-input == null || github.event.inputs.tramline-input == ''
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Setup JDK
uses: actions/setup-java@v5
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/ci_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: [ ubuntu-latest ]
if: github.event_name == 'pull_request'
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- name: Verify PR has Jira reference
env:
GITHUB_PR_TITLE: ${{ github.event.pull_request.title }}
Expand All @@ -30,13 +30,13 @@ jobs:
if: github.event_name == 'pull_request'
steps:
- name: Checkout master
uses: actions/checkout@v6
uses: actions/checkout@v7
with:
ref: master
path: master

- name: Checkout current
uses: actions/checkout@v6
uses: actions/checkout@v7
with:
path: current

Expand All @@ -46,7 +46,7 @@ jobs:
lint:
runs-on: [ ubuntu-latest ]
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Setup JDK
uses: actions/setup-java@v5
Expand All @@ -61,7 +61,7 @@ jobs:
unit_tests:
runs-on: [ ubuntu-latest ]
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Setup JDK
uses: actions/setup-java@v5
Expand Down Expand Up @@ -90,15 +90,15 @@ jobs:


- name: Checkout Android source
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Start Simple Docker server
run: |
.github/scripts/deploy_docker_server.sh
echo "CONTAINER_ID=$(docker container ls -q -f name=simple-server)" >> $GITHUB_ENV

- name: Cache AVD
uses: actions/cache@v5
uses: actions/cache@v6
id: avd-cache
with:
path: |
Expand Down Expand Up @@ -185,13 +185,13 @@ jobs:
runs-on: [ ubuntu-latest ]
steps:
- name: Checkout master
uses: actions/checkout@v6
uses: actions/checkout@v7
with:
ref: master
path: master

- name: Checkout current
uses: actions/checkout@v6
uses: actions/checkout@v7
with:
path: current

Expand All @@ -202,7 +202,7 @@ jobs:
runs-on: [ ubuntu-latest ]
if: github.event_name == 'pull_request'
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
ref: ${{github.event.pull_request.head.ref}}
fetch-depth: 0
Expand Down
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,19 @@
- Bump Sentry to v8.48.0
- Bump AndroidX Benchmark to v1.5.0-alpha07
- Bump Google Service to v4.5.0
- Bump Sentry Android to v6.15.0
- Bump Sentry Android to v6.16.0
- Bump threeten-extra to v1.10.0
- Bump Play Services Location to v21.4.0
- Bump Jackson Core to v2.22.1
- Bump sqlCipher to v4.17.0
- Bump KSP to v2.3.10
- Bump Play Services Auth to v21.6.0
- Bump Sentry to v8.50.1
- Bump AGP to v9.3.0
- Bump AGP to v9.3.1
- Bump Gradle to v9.6.1
- Bump Lint to v32.3.1
- Bump GH Actions `cache` to v6
- Update GH Actions `checkout` to v7

### Changes
- Add CVD risk view to patient summary screen behind feature flag `show_cvd_risk`
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
agp = "9.3.0"
agp = "9.3.1"

androidx-cameraView = "1.6.1"
androidx-camera = "1.6.1"
Expand All @@ -21,7 +21,7 @@ ksp = "2.3.10"

ktlint = "0.36.0"

lint = "32.3.0"
lint = "32.3.1"

mobius = "2.1.1"

Expand Down Expand Up @@ -231,7 +231,7 @@ kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref =
kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
google-services = { id = "com.google.gms.google-services", version = "4.5.0" }
sentry = { id = "io.sentry.android.gradle", version = "6.15.0" }
sentry = { id = "io.sentry.android.gradle", version = "6.16.0" }

[bundles]
androidx-camera = ["androidx-camera-core", "androidx-camera-camera2", "androidx-camera-view", "androidx-camera-lifecycle"]
Expand Down
Loading