Skip to content

Commit

Permalink
Update all dependencies (#3132)
Browse files Browse the repository at this point in the history
* Update all dependencies

| datasource     | package                                                               | from    | to      |
| -------------- | --------------------------------------------------------------------- | ------- | ------- |
| gradle-version | gradle                                                                | 8.3     | 8.4     |
| maven          | com.diffplug.spotless:com.diffplug.spotless.gradle.plugin             | 6.21.0  | 6.22.0  |
| maven          | com.squareup.okhttp3:mockwebserver                                    | 4.11.0  | 4.12.0  |
| maven          | com.gradle.enterprise:com.gradle.enterprise.gradle.plugin             | 3.15    | 3.15.1  |
| maven          | org.jetbrains.kotlinx.kover:org.jetbrains.kotlinx.kover.gradle.plugin | 0.7.3   | 0.7.4   |
| maven          | org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin                 | 1.9.0   | 1.9.10  |
| maven          | io.github.classgraph:classgraph                                       | 4.8.162 | 4.8.163 |

* Update EvalJvmTest.kt

* Update EvalJvmTest.kt

* Fix remaining Spotless problems

* Upgrade yarn.lock

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Alejandro Serrano <[email protected]>
  • Loading branch information
renovate[bot] and serras authored Oct 19, 2023
1 parent 42c9245 commit ac8e7df
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 313 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class EvalJvmTest : StringSpec({
try {
d.eval.value()
} catch (e: StackOverflowError) {
fail("stack overflowed with eval-depth ${DeepEval.maxDepth}")
fail("stack overflowed with eval-depth ${DeepEval.MAX_DEPTH}")
}
}
}
Expand All @@ -38,7 +38,7 @@ private data class DeepEval(val eval: Eval<Int>) {
}

companion object {
const val maxDepth = 10000
const val MAX_DEPTH = 10000

fun build(leaf: () -> Eval<Int>, os: List<O>) = run {
tailrec fun step(i: Int, leaf: () -> Eval<Int>, cbs: MutableList<(Eval<Int>) -> Eval<Int>>): Eval<Int> =
Expand All @@ -62,7 +62,7 @@ private data class DeepEval(val eval: Eval<Int>) {

val gen = arbitrary { rs ->
val leaf = { Eval.Now(0) }
val eval = build(leaf, O.gen.samples().map(Sample<O>::value).take(maxDepth).toList())
val eval = build(leaf, O.gen.samples().map(Sample<O>::value).take(MAX_DEPTH).toList())
DeepEval(eval)
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@file:Suppress("ktlint:standard:property-naming")

package arrow.optics.plugin.internals

import arrow.optics.plugin.companionObject
Expand Down Expand Up @@ -28,6 +30,7 @@ data class ADT(val pckg: KSName, val declaration: KSClassDeclaration, val target
copy(imports = imports + snippet.imports, content = "$content\n${snippet.content}")
}

@Suppress("RecursivePropertyAccessor")
val KSClassDeclaration.nameWithParentClass: String
get() = when (val parent = parentDeclaration) {
is KSClassDeclaration -> parent.nameWithParentClass + "." + simpleName.asString()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ fun String.plusIfNotBlank(prefix: String = "", postfix: String = "") =
* Sanitizes each delimited section if it matches with Kotlin reserved keywords.
*/
fun KSName.asSanitizedString(delimiter: String = ".", prefix: String = "") =
asString().splitToSequence(delimiter).joinToString(delimiter, prefix) { if (it in kotlinKeywords) "`$it`" else it }
asString().splitToSequence(delimiter).joinToString(delimiter, prefix) { if (it in KOTLIN_KEYWORDS) "`$it`" else it }

private val kotlinKeywords = setOf(
private val KOTLIN_KEYWORDS = setOf(
// Hard keywords
"as",
"break",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@file:Suppress("ktlint:standard:property-naming")

package arrow.optics.plugin

const val `package` = "package `if`.`this`.`object`.`is`.`finally`.`null`.`expect`.`annotation`"
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@ animalSniffer = "1.7.1"
arrowGradleConfig = "0.12.0-rc.6"
assertj = "3.24.2"
coroutines = "1.7.3"
classgraph = "4.8.162"
dokka = "1.9.0"
classgraph = "4.8.163"
dokka = "1.9.10"
jUnit = "4.13.2"
jUnitJupiter = "5.10.0"
jUnitVintage = "5.10.0"
kotest = "5.7.2"
kotestGradle = "5.7.2"
kover = "0.7.3"
kover = "0.7.4"
kotlin = "1.9.10"
kotlinxSerializationPlugin = "1.9.10"
kotlinBinaryCompatibilityValidator = "0.13.2"
kotlinCompileTesting = "1.5.0"
knit = "0.4.0"
kspVersion = "1.9.10-1.0.13"
kotlinxSerialization = "1.6.0"
mockWebServer = "4.11.0"
mockWebServer = "4.12.0"
retrofit = "2.9.0"
retrofitKotlinxSerialization = "1.0.0"
spotlessVersion = "6.21.0"
spotlessVersion = "6.22.0"

[libraries]
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
Expand Down
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.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
14 changes: 7 additions & 7 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -202,11 +202,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

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

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
Loading

0 comments on commit ac8e7df

Please sign in to comment.