Skip to content

Commit

Permalink
Gradle 8.2.1
Browse files Browse the repository at this point in the history
* Update dependency gradle to v8.2.1

* Simple property assignments in KTS

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Goooler <wangzongler@gmail.com>
  • Loading branch information
renovate[bot] and Goooler committed Jul 31, 2023
1 parent 851dcef commit 777035a
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,32 +63,32 @@ publishing {
create<MavenPublication>("mavenJava") {
from(components["java"])
pom {
name.set("Gradle Plugin for JMH")
description.set(properties.getting("project_description"))
url.set(properties.getting("project_website"))
name = "Gradle Plugin for JMH"
description = properties.getting("project_description")
url = properties.getting("project_website")
issueManagement {
system.set("GitHub")
url.set(properties.getting("project_issues"))
system = "GitHub"
url = properties.getting("project_issues")
}
scm {
url.set(properties.getting("project_website"))
connection.set(properties.getting("project_vcs").map { "scm:git:$it" })
developerConnection.set("scm:git:git@github.com:melix/jmh-gradle-plugin.git")
url = properties.getting("project_website")
connection = properties.getting("project_vcs").map { "scm:git:$it" }
developerConnection = "scm:git:git@github.com:melix/jmh-gradle-plugin.git"
}
licenses {
license {
name.set("The Apache Software License, Version 2.0")
url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
distribution.set("repo")
name = "The Apache Software License, Version 2.0"
url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
distribution = "repo"
}
}
developers {
developer {
id.set("melix")
name.set("Cédric Champeau")
id = "melix"
name = "Cédric Champeau"
organization {
name.set("Personal")
url.set("https://melix.github.io/blog")
name = "Personal"
url = "https://melix.github.io/blog"
}
}
}
Expand All @@ -113,15 +113,15 @@ tasks.withType<Sign>().configureEach {
}

gradlePlugin {
website.set(properties.get("project_website").toString())
vcsUrl.set(properties.get("project_vcs").toString())
website = properties.get("project_website").toString()
vcsUrl = properties.get("project_vcs").toString()

plugins.create("jmh") {
id = "me.champeau.jmh"
implementationClass = "me.champeau.jmh.JMHPlugin"
displayName = properties.get("project_description").toString()
description = properties.get("project_description").toString()
tags.set(listOf("jmh"))
tags = listOf("jmh")
}
}

Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dependencies {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
languageVersion = JavaLanguageVersion.of(8)
}
withSourcesJar()
withJavadocJar()
Expand Down
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.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 8 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ 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 @@ -133,10 +130,13 @@ 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.
Expand Down Expand Up @@ -197,6 +197,10 @@ 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
6 changes: 3 additions & 3 deletions samples/simple-java/kotlin-dsl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ tasks.test {
}

jmh {
warmupIterations.set(2)
iterations.set(2)
fork.set(2)
warmupIterations = 2
iterations = 2
fork = 2
}

0 comments on commit 777035a

Please sign in to comment.