Skip to content

Commit

Permalink
Merge branch 'main' into as-parmapnotnull-flow
Browse files Browse the repository at this point in the history
  • Loading branch information
serras authored Aug 23, 2023
2 parents 77b11ea + 7cbef61 commit 3eabbed
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ animalSniffer = "1.7.1"
arrowGradleConfig = "0.12.0-rc.5"
assertj = "3.24.2"
coroutines = "1.7.3"
classgraph = "4.8.161"
classgraph = "4.8.162"
dokka = "1.8.20"
jUnit = "4.13.2"
jUnitJupiter = "5.10.0"
Expand All @@ -15,8 +15,8 @@ kotlin = "1.9.0"
kotlinBinaryCompatibilityValidator = "0.13.2"
kotlinCompileTesting = "1.5.0"
knit = "0.4.0"
kspVersion = "1.9.0-1.0.12"
kotlinxSerialization = "1.5.1"
kspVersion = "1.9.0-1.0.13"
kotlinxSerialization = "1.6.0"
mockWebServer = "4.11.0"
retrofit = "2.9.0"
retrofitKotlinxSerialization = "1.0.0"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 2 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pluginManagement {

plugins {
id("com.gradle.enterprise") version "3.14.1"
id("org.gradle.toolchains.foojay-resolver-convention") version("0.6.0")
id("org.gradle.toolchains.foojay-resolver-convention") version("0.7.0")
}

dependencyResolutionManagement {
Expand Down

0 comments on commit 3eabbed

Please sign in to comment.