Skip to content

Commit 4fc1ebb

Browse files
authored
Merge pull request #27 from skydoves/paging/3.2.1
Bump Paging to 3.2.1, AGP to 8.1.2, Gradle to 8.4
2 parents a117c44 + 8fa6125 commit 4fc1ebb

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

gradle/libs.versions.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
[versions]
2-
agp = "8.1.1"
2+
agp = "8.1.2"
33
kotlin = "1.9.10"
4-
dokka = "1.8.20"
4+
dokka = "1.9.0"
55
jvmTarget = "11"
66
nexusPlugin = "0.25.3"
77
binaryCompatibility = "0.13.2"
88
appcompat = "1.6.1"
9-
material = "1.9.0"
9+
material = "1.10.0"
1010
retrofit = "2.9.0"
1111
okhttp = "4.11.0"
1212
coroutines = "1.7.3"
1313
kotlinSerialization = "1.6.0"
1414
arrow = "1.2.0"
15-
paging = "3.1.1"
15+
paging = "3.2.1"
1616
ksp = "1.9.10-1.0.13"
1717
moshi = "1.15.0"
1818
glide = "4.16.0"
19-
androidxLifecycle = "2.6.1"
20-
androidxMacroBenchmark = "1.2.0-beta04"
19+
androidxLifecycle = "2.6.2"
20+
androidxMacroBenchmark = "1.2.0-rc02"
2121
androidxProfileinstaller = "1.3.1"
2222
androidxUiAutomator = "2.3.0-alpha04"
2323
junit = "4.13.2"

gradle/wrapper/gradle-wrapper.jar

2.06 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
86+
# 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
9088

9189
# Use the maximum available, or set MAX_FD != -1 to use that value.
9290
MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
133131
fi
134132
else
135133
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137137
138138
Please set the JAVA_HOME variable in your environment to match the
139139
location of your Java installation."
140+
fi
140141
fi
141142

142143
# Increase the maximum file descriptors if we can.
@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
197198
done
198199
fi
199200

201+
202+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204+
200205
# Collect all arguments for the java command;
201206
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202207
# shell script including quotes and variable substitutions, so put them in

0 commit comments

Comments
 (0)