Skip to content

Commit 00bc062

Browse files
authored
Merge branch 'main' into renovate/kstore
2 parents bc36066 + a161c85 commit 00bc062

File tree

4 files changed

+34
-27
lines changed

4 files changed

+34
-27
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
shell: bash
2020
run: echo "ORG_GRADLE_PROJECT_ACCOUNTBOOK_VERSIONCODE=$(( (GITHUB_RUN_NUMBER * 2) + 10000 ))" >> $GITHUB_ENV
2121

22-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
22+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2323

2424
- name: set up JDK
2525
uses: actions/setup-java@v4
@@ -69,7 +69,7 @@ jobs:
6969
timeout-minutes: 60
7070

7171
steps:
72-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
72+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
7373

7474
- name: Validate Gradle Wrapper
7575
uses: gradle/wrapper-validation-action@v3
@@ -115,7 +115,7 @@ jobs:
115115
timeout-minutes: 60
116116

117117
steps:
118-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
118+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
119119

120120
- uses: maxim-lobanov/setup-xcode@v1
121121
with:
@@ -171,7 +171,7 @@ jobs:
171171
timeout-minutes: 60
172172

173173
steps:
174-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
174+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
175175

176176
- uses: maxim-lobanov/setup-xcode@v1
177177
with:

.github/workflows/todo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
13+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1414
- uses: alstr/todo-to-issue-action@v4

gradle/libs.versions.toml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
[versions]
2-
agp = "8.5.2"
2+
agp = "8.7.2"
33

44
android-compileSdk = "35"
55
android-minSdk = "21"
66
android-targetSdk = "35"
77

8-
androidxactivity = "1.9.1"
9-
androidx-tooling = "1.6.8"
10-
androidx-uiTest = "1.6.8"
8+
9+
androidx-tooling = "1.7.5"
10+
androidxactivity = "1.9.3"
11+
androidx-uiTest = "1.7.5"
1112

1213
lifecycle = "2.8.3"
1314
compose-plugin = "1.6.11"
14-
ksp = "2.0.20-1.0.24"
15+
ksp = "2.0.21-1.0.28"
1516

1617
kotlin = "2.0.20"
1718
coroutines = "1.8.1"
18-
ktor = "2.3.12"
19+
ktor = "2.3.13"
1920

2021
kstore = "0.9.1"
21-
circuit = "0.23.1"
22+
circuit = "0.25.0"
2223
kotlininject = "0.7.1"
23-
logback = "1.5.3"
24+
logback = "1.5.12"
2425
oidc = "0.9.2"
2526
exposedVersion = "0.53.0"
26-
coil = "3.0.0-alpha10"
27+
coil = "3.0.3"
2728

2829
koin = "4.0.0-RC1"
2930
junit5 = "5.11.0"
3031

3132
[libraries]
3233
androidx-browser = { group = "androidx.browser", name = "browser", version = "1.8.0" }
33-
androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.13.1" }
34+
androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.15.0" }
3435
androidx-activity-activity = { module = "androidx.activity:activity", version.ref = "androidxactivity" }
3536
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxactivity" }
3637
androidx-testManifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-uiTest" }
@@ -43,12 +44,12 @@ androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process",
4344

4445
compose-material3-windowsizeclass = "dev.chrisbanes.material3:material3-window-size-class-multiplatform:0.5.0"
4546

46-
google-firebase-analytics = "com.google.firebase:firebase-analytics:22.0.2"
47-
google-firebase-crashlytics = "com.google.firebase:firebase-crashlytics:19.0.2"
47+
google-firebase-analytics = "com.google.firebase:firebase-analytics:22.1.2"
48+
google-firebase-crashlytics = "com.google.firebase:firebase-crashlytics:19.2.1"
4849

49-
google-firebase-perf = "com.google.firebase:firebase-perf:21.0.1"
50+
google-firebase-perf = "com.google.firebase:firebase-perf:21.0.2"
5051

51-
crashkios-crashlytics = "co.touchlab.crashkios:crashlytics:0.8.6"
52+
crashkios-crashlytics = "co.touchlab.crashkios:crashlytics:0.9.0"
5253

5354
timber = "com.jakewharton.timber:timber:5.0.1"
5455

@@ -99,7 +100,7 @@ exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "e
99100
exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exposedVersion" }
100101
exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposedVersion" }
101102
exposed-jodatime = { module = "org.jetbrains.exposed:exposed-jodatime", version.ref = "exposedVersion" }
102-
exposed-h2Db = "com.h2database:h2:2.2.224"
103+
exposed-h2Db = "com.h2database:h2:2.3.232"
103104
exposed-hikariCp = "com.zaxxer:HikariCP:5.1.0"
104105
exposed-postgres = "org.postgresql:postgresql:42.7.3"
105106

@@ -117,11 +118,11 @@ koin-logger = { module = "io.insert-koin:koin-logger-slf4j", version.ref = "koin
117118

118119
kotlinx-atomicfu = "org.jetbrains.kotlinx:atomicfu:0.25.0"
119120
kotlinx-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.6.0"
120-
kermit = "co.touchlab:kermit:2.0.4"
121+
kermit = "co.touchlab:kermit:2.0.5"
121122

122123
uuid = "com.benasher44:uuid:0.8.4"
123124

124-
test-mockk = "io.mockk:mockk:1.13.10"
125+
test-mockk = "io.mockk:mockk:1.13.13"
125126
test-coroutine = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
126127

127128
test-junit5-suite = "org.junit.platform:junit-platform-suite:1.10.2"

renovate.json

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": [
4-
"config:base"
4+
"config:recommended"
55
],
66
"packageRules": [
77
{
@@ -16,20 +16,26 @@
1616
{
1717
"groupName": "Firebase",
1818
"groupSlug": "firebase",
19-
"matchPackagePrefixes": [
20-
"com.google.firebase"
19+
"matchPackageNames": [
20+
"com.google.firebase{/,}**"
2121
]
2222
},
2323
{
2424
"description": "Automatically merge minor and patch-level updates",
25-
"matchUpdateTypes": ["minor", "patch", "digest"],
25+
"matchUpdateTypes": [
26+
"minor",
27+
"patch",
28+
"digest"
29+
],
2630
"automerge": true,
2731
"automergeType": "pr",
2832
"platformAutomerge": true
2933
},
3034
{
3135
"description": "Disable updates to SNAPSHOTS",
32-
"matchDatasources": ["maven"],
36+
"matchDatasources": [
37+
"maven"
38+
],
3339
"allowedVersions": "!/SNAPSHOT$/"
3440
}
3541
]

0 commit comments

Comments
 (0)