Skip to content

Commit 8d48694

Browse files
Merge pull request #5638 from simpledotorg/master
2 parents fdb8369 + 689133e commit 8d48694

File tree

7 files changed

+36
-26
lines changed

7 files changed

+36
-26
lines changed

.github/workflows/benchmark_suite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
sudo udevadm trigger --name-match=kvm
2222
2323
- name: Checkout Android source
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v5
2525

2626
- name: Setup JDK
2727
uses: actions/setup-java@v4

.github/workflows/build_prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
4444
- name: Checkout
4545
if: github.event.inputs.tramline-input == null || github.event.inputs.tramline-input == ''
46-
uses: actions/checkout@v4
46+
uses: actions/checkout@v5
4747

4848
- name: Setup JDK
4949
uses: actions/setup-java@v4

.github/workflows/build_sandbox.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
4343
- name: Checkout
4444
if: github.event.inputs.tramline-input == null || github.event.inputs.tramline-input == ''
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@v5
4646

4747
- name: Setup JDK
4848
uses: actions/setup-java@v4

.github/workflows/build_staging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
4343
- name: Checkout
4444
if: github.event.inputs.tramline-input == null || github.event.inputs.tramline-input == ''
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@v5
4646

4747
- name: Setup JDK
4848
uses: actions/setup-java@v4

.github/workflows/ci_checks.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: [ ubuntu-latest ]
1919
if: github.event_name == 'pull_request'
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
- name: Verify PR description
2323
run: .github/scripts/story_link_check.sh '${{ github.event.pull_request.body }}'
2424

@@ -27,13 +27,13 @@ jobs:
2727
if: github.event_name == 'pull_request'
2828
steps:
2929
- name: Checkout master
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131
with:
3232
ref: master
3333
path: master
3434

3535
- name: Checkout current
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@v5
3737
with:
3838
path: current
3939

@@ -43,7 +43,7 @@ jobs:
4343
lint:
4444
runs-on: [ ubuntu-latest ]
4545
steps:
46-
- uses: actions/checkout@v4
46+
- uses: actions/checkout@v5
4747

4848
- name: Setup JDK
4949
uses: actions/setup-java@v4
@@ -58,7 +58,7 @@ jobs:
5858
unit_tests:
5959
runs-on: [ ubuntu-latest ]
6060
steps:
61-
- uses: actions/checkout@v4
61+
- uses: actions/checkout@v5
6262

6363
- name: Setup JDK
6464
uses: actions/setup-java@v4
@@ -87,7 +87,7 @@ jobs:
8787
8888
8989
- name: Checkout Android source
90-
uses: actions/checkout@v4
90+
uses: actions/checkout@v5
9191

9292
- name: Start Simple Docker server
9393
run: |
@@ -182,13 +182,13 @@ jobs:
182182
runs-on: [ ubuntu-latest ]
183183
steps:
184184
- name: Checkout master
185-
uses: actions/checkout@v4
185+
uses: actions/checkout@v5
186186
with:
187187
ref: master
188188
path: master
189189

190190
- name: Checkout current
191-
uses: actions/checkout@v4
191+
uses: actions/checkout@v5
192192
with:
193193
path: current
194194

@@ -199,7 +199,7 @@ jobs:
199199
runs-on: [ ubuntu-latest ]
200200
if: github.event_name == 'pull_request'
201201
steps:
202-
- uses: actions/checkout@v4
202+
- uses: actions/checkout@v5
203203
with:
204204
ref: ${{github.event.pull_request.head.ref}}
205205
fetch-depth: 0

CHANGELOG.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Next Release
44

55
### Internal
6-
- Bump Sentry to v8.21.1
6+
- Bump Sentry to v8.22.0
77
- Bump AndroidX Lifecycle to v2.9.4
88
- Bump AndroidX Test Runner to v1.7.0
99
- Bump AndroidX Test Rules to v1.7.0
@@ -12,11 +12,21 @@
1212
- Bump Play Services Auth to v21.4.0
1313
- Bump Material Components to v1.12.0
1414
- Bump Kotlin to v2.2.20
15-
- Bump AndroidX Work to v2.10.4
15+
- Bump AndroidX Work to v2.10.5
1616
- Bump AndroidX ViewModel to v2.9.4
1717
- Bump Lottie Compose to v6.6.9
1818
- Bump Gson to v2.13.2
1919
- Bump KSP to v2.2.20-2.0.2
20+
- Bump firebase remote config to v23.0.1
21+
- Bump Google Truth to v1.4.5
22+
- Bump AndroidX Benchmark to v1.4.1
23+
- Bump AndroidX Camera to v1.5.0
24+
- Bump AndroidX Camera View to v1.5.0
25+
- Bump dagger to v2.57.2
26+
- Bump UUID generator to v5.1.1
27+
- Bump Compose BOM to v2025.09.01
28+
- Bump Sentry Android to v5.12.0
29+
- Update GH Actions `checkout` to v5
2030

2131
### Changes
2232

gradle/libs.versions.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[versions]
22
agp = "8.13.0"
33

4-
androidx-cameraView = "1.4.2"
5-
androidx-camera = "1.4.2"
4+
androidx-cameraView = "1.5.0"
5+
androidx-camera = "1.5.0"
66
androidx-paging = "3.3.6"
77
androidx-room = "2.7.2"
8-
androidx-work = "2.10.4"
8+
androidx-work = "2.10.5"
99
androidx-security-crypto = "1.1.0-alpha07"
1010
androidx-viewmodel = "2.9.4"
1111
androidx-lifecycle = "2.9.4"
1212
androidx-activity = "1.10.1"
1313

1414
chucker = "4.2.0"
15-
dagger = "2.57.1"
15+
dagger = "2.57.2"
1616

1717
kotlin = "2.2.20"
1818

@@ -38,7 +38,7 @@ coroutines = "1.10.2"
3838

3939
compose-compiler = "1.5.13"
4040

41-
androidx-compose-bom = "2025.08.01"
41+
androidx-compose-bom = "2025.09.01"
4242

4343
composeThemeAdapter = "0.36.0"
4444

@@ -107,7 +107,7 @@ edittext-pinentry = "com.alimuzaffar.lib:pinentryedittext:2.0.6"
107107

108108
faker = "com.github.blocoio:faker:2.0.4"
109109

110-
firebase-config = "com.google.firebase:firebase-config:23.0.0"
110+
firebase-config = "com.google.firebase:firebase-config:23.0.1"
111111
firebase-analytics = "com.google.firebase:firebase-analytics-ktx:22.5.0"
112112

113113
gson = "com.google.code.gson:gson:2.13.2"
@@ -179,7 +179,7 @@ rx-java = "io.reactivex.rxjava2:rxjava:2.2.21"
179179
rx-kotlin = "io.reactivex.rxjava2:rxkotlin:2.4.0"
180180
rx-preferences = "com.f2prateek.rx.preferences2:rx-preferences:2.0.1"
181181

182-
sentry-android = "io.sentry:sentry-android:8.21.1"
182+
sentry-android = "io.sentry:sentry-android:8.22.0"
183183

184184
signaturepad = "com.github.gcacace:signature-pad:1.3.1"
185185

@@ -191,9 +191,9 @@ timber = "com.jakewharton.timber:timber:5.0.1"
191191

192192
rx-java-extensions = "com.github.akarnokd:rxjava3-extensions:3.1.1"
193193

194-
truth = "com.google.truth:truth:1.4.4"
194+
truth = "com.google.truth:truth:1.4.5"
195195

196-
uuid-generator = "com.fasterxml.uuid:java-uuid-generator:5.1.0"
196+
uuid-generator = "com.fasterxml.uuid:java-uuid-generator:5.1.1"
197197

198198
#noinspection GradleDependency
199199
viewpump = "io.github.inflationx:viewpump:2.0.3"
@@ -223,14 +223,14 @@ sqlCipher = { module = "net.zetetic:sqlcipher-android", version.ref = "sqlCipher
223223
android-application = { id = "com.android.application", version.ref = "agp" }
224224
android-library = { id = "com.android.library", version.ref = "agp" }
225225
android-lint = { id = "com.android.lint", version.ref = "agp" }
226-
androidx-benchmark = { id = "androidx.benchmark", version = "1.4.0" }
226+
androidx-benchmark = { id = "androidx.benchmark", version = "1.4.1" }
227227
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
228228
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
229229
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
230230
kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
231231
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
232232
google-services = { id = "com.google.gms.google-services", version = "4.4.3" }
233-
sentry = { id = "io.sentry.android.gradle", version = "5.9.0" }
233+
sentry = { id = "io.sentry.android.gradle", version = "5.12.0" }
234234

235235
[bundles]
236236
androidx-camera = ["androidx-camera-core", "androidx-camera-camera2", "androidx-camera-view", "androidx-camera-lifecycle"]

0 commit comments

Comments
 (0)