Skip to content

Commit 4f2a5f2

Browse files
TvdBrinkTvdBrink
committed
deps: bump many deps
Signed-off-by: Timon van den Brink <[email protected]>
1 parent 4ba8794 commit 4f2a5f2

File tree

8 files changed

+36
-32
lines changed

8 files changed

+36
-32
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
/.idea/caches/
44
/.idea/dictionaries/
55
/.idea/libraries/
6+
/.kotlin/
67
/captures/
78
/local.properties
89
.DS_Store

‎build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77

88
tasks {
99
wrapper {
10-
gradleVersion = "8.3"
11-
distributionSha256Sum = "591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225"
10+
gradleVersion = "8.10.1"
11+
distributionSha256Sum = "1541fa36599e12857140465f3c91a97409b4512501c26f9631fb113e392c5bd1"
1212
}
1313
}

‎gradle/libs.versions.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
[versions]
2-
agp = "8.2.0-beta06"
3-
kotlin = "1.9.0"
2+
agp = "8.6.0"
3+
kotlin = "2.0.20"
44

55
[libraries]
6-
androidx-activity-ktx = "androidx.activity:activity-ktx:1.8.0"
7-
androidx-annotation = "androidx.annotation:annotation:1.7.0"
8-
androidx-appcompat = "androidx.appcompat:appcompat:1.6.1"
6+
androidx-activity-ktx = "androidx.activity:activity-ktx:1.9.2"
7+
androidx-annotation = "androidx.annotation:annotation:1.8.2"
8+
androidx-appcompat = "androidx.appcompat:appcompat:1.7.0"
99
androidx-biometric = "androidx.biometric:biometric:1.1.0"
10-
androidx-collection = "androidx.collection:collection:1.3.0"
10+
androidx-collection = "androidx.collection:collection:1.4.3"
1111
androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"
1212
androidx-coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
13-
androidx-core-ktx = "androidx.core:core-ktx:1.12.0"
14-
androidx-datastore-preferences = "androidx.datastore:datastore-preferences:1.0.0"
15-
androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.6.1"
16-
androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
13+
androidx-core-ktx = "androidx.core:core-ktx:1.13.1"
14+
androidx-datastore-preferences = "androidx.datastore:datastore-preferences:1.1.1"
15+
androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.8.3"
16+
androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.5"
1717
androidx-preference-ktx = "androidx.preference:preference-ktx:1.2.1"
18-
desugarJdkLibs = "com.android.tools:desugar_jdk_libs:2.0.3"
19-
google-material = "com.google.android.material:material:1.10.0"
18+
desugarJdkLibs = "com.android.tools:desugar_jdk_libs:2.1.2"
19+
google-material = "com.google.android.material:material:1.12.0"
2020
jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
2121
junit = "junit:junit:4.13.2"
22-
kotlinx-coroutines-android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.0"
22+
kotlinx-coroutines-android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
2323
zxing-android-embedded = "com.journeyapps:zxing-android-embedded:4.3.0"
2424

2525
[plugins]

‎gradle/wrapper/gradle-wrapper.jar

-19.7 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
3+
distributionSha256Sum=1541fa36599e12857140465f3c91a97409b4512501c26f9631fb113e392c5bd1
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

‎gradlew

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum
@@ -145,15 +148,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
145148
case $MAX_FD in #(
146149
max*)
147150
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148-
# shellcheck disable=SC3045
151+
# shellcheck disable=SC2039,SC3045
149152
MAX_FD=$( ulimit -H -n ) ||
150153
warn "Could not query maximum file descriptor limit"
151154
esac
152155
case $MAX_FD in #(
153156
'' | soft) :;; #(
154157
*)
155158
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156-
# shellcheck disable=SC3045
159+
# shellcheck disable=SC2039,SC3045
157160
ulimit -n "$MAX_FD" ||
158161
warn "Could not set maximum file descriptor limit to $MAX_FD"
159162
esac
@@ -202,11 +205,11 @@ fi
202205
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203206
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204207

205-
# Collect all arguments for the java command;
206-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
207-
# shell script including quotes and variable substitutions, so put them in
208-
# double quotes to make sure that they get re-expanded; and
209-
# * put everything else in single quotes, so that it's not re-expanded.
208+
# Collect all arguments for the java command:
209+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210+
# and any embedded shellness will be escaped.
211+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212+
# treated as '${Hostname}' itself on the command line.
210213

211214
set -- \
212215
"-Dorg.gradle.appname=$APP_BASE_NAME" \

‎tunnel/tools/libwg-go/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module golang.zx2c4.com/wireguard/android
33
go 1.20
44

55
require (
6-
golang.org/x/sys v0.13.0
7-
golang.zx2c4.com/wireguard v0.0.0-20231022001213-2e0774f246fb
6+
golang.org/x/sys v0.25.0
7+
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173
88
)
99

1010
require (

‎tunnel/tools/libwg-go/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
33
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
44
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
55
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
6-
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
7-
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
6+
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
7+
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
88
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
99
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
1010
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
11-
golang.zx2c4.com/wireguard v0.0.0-20231022001213-2e0774f246fb h1:c5tyN8sSp8jSDxdCCDXVOpJwYXXhmTkNMt+g0zTSOic=
12-
golang.zx2c4.com/wireguard v0.0.0-20231022001213-2e0774f246fb/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA=
11+
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uIfPMv78iAJGcPKDeqAFnaLBropIC4=
12+
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA=
1313
gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259 h1:TbRPT0HtzFP3Cno1zZo7yPzEEnfu8EjLfl6IU9VfqkQ=

0 commit comments

Comments
 (0)