Skip to content

Commit

Permalink
Merge pull request #1715 from Netflix/gradle-8.0.2
Browse files Browse the repository at this point in the history
Update to gradle 8.0.2
  • Loading branch information
paulbakker authored Nov 16, 2023
2 parents 7be2b59 + 94ac4d2 commit ad9fe65
Show file tree
Hide file tree
Showing 32 changed files with 1,112 additions and 1,923 deletions.
22 changes: 11 additions & 11 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ configure(subprojects.filterNot { it in internalBomModules }) {
apply {
plugin("java-library")
plugin("kotlin")
plugin("kotlin-kapt")
// plugin("kotlin-kapt")
plugin("org.jmailen.kotlinter")
plugin("me.champeau.jmh")
}
Expand Down Expand Up @@ -107,9 +107,9 @@ configure(subprojects.filterNot { it in internalBomModules }) {
// Produce Config Metadata for properties used in Spring Boot
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
// Speed up processing of AutoConfig's produced by Spring Boot for Kotlin
kapt("org.springframework.boot:spring-boot-autoconfigure-processor:${springBootVersion}")
// kapt("org.springframework.boot:spring-boot-autoconfigure-processor:${springBootVersion}")
// Produce Config Metadata for properties used in Spring Boot for Kotlin
kapt("org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}")
// kapt("org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}")

// Sets the JMH version to use across modules.
// Please refer to the following links for further reference.
Expand All @@ -130,14 +130,14 @@ configure(subprojects.filterNot { it in internalBomModules }) {
}
}

kapt {
arguments {
arg(
"org.springframework.boot.configurationprocessor.additionalMetadataLocations",
"$projectDir/src/main/resources"
)
}
}
// kapt {
// arguments {
// arg(
// "org.springframework.boot.configurationprocessor.additionalMetadataLocations",
// "$projectDir/src/main/resources"
// )
// }
// }

jmh {
includeTests.set(true)
Expand Down
93 changes: 55 additions & 38 deletions dependencies.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 1 addition & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=6147605a23b4eff6c334927a86ff3508cb5d6722cd624c97ded4c2e8640f1f87
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
16 changes: 6 additions & 10 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ done
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# 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"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

Expand Down Expand Up @@ -130,29 +133,26 @@ location of your Java installation."
fi
else
JAVACMD=java
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.
which java >/dev/null 2>&1 || 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=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=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -197,10 +197,6 @@ if "$cygwin" || "$msys" ; then
done
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
Expand Down
Loading

0 comments on commit ad9fe65

Please sign in to comment.