Skip to content

Commit a7fb45c

Browse files
authored
Merge branch 'main' into ml/agp8_4
2 parents 8dd3249 + 31b0cf4 commit a7fb45c

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

.github/workflows/Build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/checkout@v4
2727

2828
- name: Validate Gradle Wrapper
29-
uses: gradle/wrapper-validation-action@v2
29+
uses: gradle/wrapper-validation-action@v3
3030

3131
- name: Copy CI gradle.properties
3232
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

.github/workflows/Release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@v4
2323

2424
- name: Validate Gradle Wrapper
25-
uses: gradle/wrapper-validation-action@v2
25+
uses: gradle/wrapper-validation-action@v3
2626

2727
- name: Copy CI gradle.properties
2828
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

app-nia-catalog/dependencies/releaseRuntimeClasspath.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
androidx.activity:activity-compose:1.8.0
2-
androidx.activity:activity-ktx:1.8.0
3-
androidx.activity:activity:1.8.0
1+
androidx.activity:activity-compose:1.8.2
2+
androidx.activity:activity-ktx:1.8.2
3+
androidx.activity:activity:1.8.2
44
androidx.annotation:annotation-experimental:1.4.0
55
androidx.annotation:annotation-jvm:1.7.1
66
androidx.annotation:annotation:1.7.1

app/dependencies/prodReleaseRuntimeClasspath.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
androidx.activity:activity-compose:1.8.0
2-
androidx.activity:activity-ktx:1.8.0
3-
androidx.activity:activity:1.8.0
1+
androidx.activity:activity-compose:1.8.2
2+
androidx.activity:activity-ktx:1.8.2
3+
androidx.activity:activity:1.8.2
44
androidx.annotation:annotation-experimental:1.4.0
55
androidx.annotation:annotation-jvm:1.8.0-beta01
66
androidx.annotation:annotation:1.8.0-beta01
@@ -188,8 +188,8 @@ com.google.guava:failureaccess:1.0.1
188188
com.google.guava:guava:31.1-android
189189
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
190190
com.google.j2objc:j2objc-annotations:1.3
191-
com.google.protobuf:protobuf-javalite:3.25.2
192-
com.google.protobuf:protobuf-kotlin-lite:3.25.2
191+
com.google.protobuf:protobuf-javalite:4.26.0
192+
com.google.protobuf:protobuf-kotlin-lite:4.26.0
193193
com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0
194194
com.squareup.okhttp3:logging-interceptor:4.12.0
195195
com.squareup.okhttp3:okhttp:4.12.0

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ androidDesugarJdkLibs = "2.0.4"
44
# AGP and tools should be updated together
55
androidGradlePlugin = "8.4.0"
66
androidTools = "31.4.0"
7-
androidxActivity = "1.8.0"
7+
androidxActivity = "1.8.2"
88
androidxAppCompat = "1.6.1"
99
androidxBrowser = "1.8.0"
1010
androidxComposeBom = "2024.02.02"
@@ -31,7 +31,7 @@ androidxUiAutomator = "2.2.0"
3131
androidxWindowManager = "1.3.0-alpha03"
3232
androidxWork = "2.9.0"
3333
coil = "2.6.0"
34-
dependencyGuard = "0.4.3"
34+
dependencyGuard = "0.5.0"
3535
firebaseBom = "32.4.0"
3636
firebaseCrashlyticsPlugin = "2.9.9"
3737
firebasePerfPlugin = "1.4.2"
@@ -49,7 +49,7 @@ kotlinxSerializationJson = "1.6.3"
4949
ksp = "1.9.22-1.0.18"
5050
moduleGraph = "2.5.0"
5151
okhttp = "4.12.0"
52-
protobuf = "3.25.2"
52+
protobuf = "4.26.0"
5353
protobufPlugin = "0.9.4"
5454
retrofit = "2.9.0"
5555
retrofitKotlinxSerializationJson = "1.0.0"
@@ -58,7 +58,7 @@ roborazzi = "1.7.0"
5858
room = "2.6.1"
5959
secrets = "2.0.1"
6060
truth = "1.4.2"
61-
turbine = "1.0.0"
61+
turbine = "1.1.0"
6262

6363
[libraries]
6464
accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanist" }

0 commit comments

Comments
 (0)