Skip to content

Commit 4df25c1

Browse files
committed
Merge branch 'release/1.0.10'
2 parents 73778a5 + 3e230c5 commit 4df25c1

4 files changed

Lines changed: 124 additions & 67 deletions

File tree

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
"editor.insertSpaces": true,
55
"editor.detectIndentation": false,
66
"editor.formatOnSave": true,
7-
}
7+
"java.configuration.updateBuildConfiguration": "interactive"
8+
}

companion/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
dependencies {
8-
implementation 'com.google.protobuf:protobuf-java:3.22.3'
8+
implementation 'com.google.protobuf:protobuf-java:3.25.5'
99
}
1010

1111
android {
@@ -61,7 +61,7 @@ android.applicationVariants.all { variant ->
6161

6262
protobuf {
6363
protoc {
64-
artifact = 'com.google.protobuf:protoc:3.22.3'
64+
artifact = 'com.google.protobuf:protoc:3.25.5'
6565
}
6666
generateProtoTasks {
6767
all().each { task ->

package-lock.json

Lines changed: 118 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "droidground",
3-
"version": "1.0.9",
3+
"version": "1.0.10",
44
"type": "module",
55
"author": "Angelo Delicato",
66
"scripts": {
@@ -37,7 +37,7 @@
3737
"@yume-chan/scrcpy-decoder-tinyh264": "2.0.1",
3838
"@yume-chan/scrcpy-decoder-webcodecs": "2.0.1",
3939
"ajv": "8.18.0",
40-
"axios": "1.16.0",
40+
"axios": "1.18.1",
4141
"compression": "1.8.1",
4242
"cors": "2.8.5",
4343
"cross-env": "7.0.3",

0 commit comments

Comments
 (0)