Skip to content

Commit

Permalink
upgrade many dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
tribbloid committed Oct 19, 2023
1 parent ee6aa8b commit 1b7e68a
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 63 deletions.
2 changes: 2 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ plugins {
// base
`java-library`
`java-test-fixtures`
`jvm-ecosystem`

// kotlin("jvm") version "1.6.10" // TODO: remove?

Expand Down Expand Up @@ -54,6 +55,7 @@ if (sonatypeApiUser.isPresent && sonatypeApiKey.isPresent) {
allprojects {

apply(plugin = "java-library")
apply(plugin = "jvm-ecosystem")

// apply(plugin = "bloop")
// DO NOT enable! In VSCode it will cause the conflict:
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Versions(private val self: Project) {

val sparkV: String = self.properties.get("sparkVersion").toString()

val tikaV: String = "2.4.1"
val tikaV: String = "2.9.0"

val jacksonV: String = "2.12.3"
}
2 changes: 1 addition & 1 deletion dev/gradle-versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
CRDIR="$(cd "`dirname "$0"`"; pwd)"
FWDIR="$(cd "`dirname "$0"`"/..; pwd)"

${FWDIR}/gradlew wrapper --gradle-version=8.1.1
${FWDIR}/gradlew wrapper --gradle-version=8.4

${FWDIR}/gradlew dependencyUpdates "$@"
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
22 changes: 13 additions & 9 deletions 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 Expand Up @@ -130,26 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
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 @@ -198,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
6 changes: 3 additions & 3 deletions parent/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,13 @@ subprojects {
both("org.apache.spark:spark-sql_${vs.scala.binaryV}:${vs.sparkV}")
both("org.apache.spark:spark-mllib_${vs.scala.binaryV}:${vs.sparkV}")

api("org.scala-lang.modules:scala-collection-compat_${vs.scala.binaryV}:2.10.0")
api("org.scala-lang.modules:scala-collection-compat_${vs.scala.binaryV}:2.11.0")

testRuntimeOnly("org.apache.spark:spark-yarn_${vs.scala.binaryV}:${vs.sparkV}")

testFixturesApi("org.scalatest:scalatest_${vs.scala.binaryV}:${vs.scalaTestV}")
// testFixturesApi(project(":repack:scalatest-repack", configuration = "shadow"))
testFixturesApi("org.junit.jupiter:junit-jupiter:5.9.2")
testFixturesApi("org.junit.jupiter:junit-jupiter:5.10.0")

// TODO: alpha project, switch to mature solution once https://github.com/scalatest/scalatest/issues/1454 is solved
testRuntimeOnly("co.helmethair:scalatest-junit-runner:0.2.0")
Expand All @@ -196,7 +196,7 @@ subprojects {

// testImplementation("org.scalacheck:scalacheck_${vs.scala.binaryV}:1.17.0")

testImplementation("com.lihaoyi:fastparse_${vs.scala.binaryV}:2.3.3")
testImplementation("com.lihaoyi:fastparse_${vs.scala.binaryV}:3.0.2")

testImplementation("com.vladsch.flexmark:flexmark:0.64.8")
}
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion parent/mldsl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ val vs = versions()

dependencies {
api("org.scalameta:ascii-graphs_${vs.scala.binaryV}:0.1.2")
api("io.github.classgraph:classgraph:4.8.160")
api("io.github.classgraph:classgraph:4.8.162")

api("com.lihaoyi:pprint_${vs.scala.binaryV}:0.8.1")

Expand Down
3 changes: 2 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ include(
":parent:core",
":parent:web",
":parent:integration",
":spookystuff-showcase"
":spookystuff-showcase",
":spookystuff-showcase:showcase"
)

if (!isEnabled(noAssembly)) {
Expand Down

0 comments on commit 1b7e68a

Please sign in to comment.