Skip to content

Commit 2e1232c

Browse files
committed
Merge remote-tracking branch 'upstream/main' into sarif
2 parents 78dbdfa + d183cbd commit 2e1232c

File tree

129 files changed

+7
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+7
-7
lines changed

.github/workflows/Build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172
timeout-minutes: 55
173173
strategy:
174174
matrix:
175-
api-level: [26, 30]
175+
api-level: [26]
176176

177177
steps:
178178
- name: Delete unnecessary tools 🔧

app/dependencies/prodReleaseRuntimeClasspath.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ com.google.guava:failureaccess:1.0.1
194194
com.google.guava:guava:31.1-android
195195
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
196196
com.google.j2objc:j2objc-annotations:1.3
197-
com.google.protobuf:protobuf-javalite:4.28.2
198-
com.google.protobuf:protobuf-kotlin-lite:4.28.2
197+
com.google.protobuf:protobuf-javalite:4.26.1
198+
com.google.protobuf:protobuf-kotlin-lite:4.26.1
199199
com.squareup.okhttp3:logging-interceptor:4.12.0
200200
com.squareup.okhttp3:okhttp:4.12.0
201201
com.squareup.okio:okio-jvm:3.9.0
-107 Bytes
-66 Bytes
-2 Bytes
-81 Bytes
-20 Bytes
-71 Bytes
936 Bytes
32 Bytes

0 commit comments

Comments
 (0)