Skip to content

Commit

Permalink
chore: upgrade Gradle and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
celcius112 committed Nov 6, 2023
1 parent 4591217 commit a339095
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 23 deletions.
24 changes: 12 additions & 12 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ plugins {
jacoco

id("org.jlleitschuh.gradle.ktlint") version "11.6.1"
id("io.gitlab.arturbosch.detekt") version "1.23.1"
id("io.gitlab.arturbosch.detekt") version "1.23.3"
id("com.gradle.plugin-publish") version "1.2.1"
}

group = "com.ekino.oss.plugin"
version = "4.2.0"
version = "4.2.0-SNAPSHOT"
findProperty("releaseVersion")?.let { version = it }

repositories {
Expand All @@ -21,13 +21,13 @@ repositories {
}

dependencies {
implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.0.0.2929")
implementation("org.jlleitschuh.gradle.ktlint:org.jlleitschuh.gradle.ktlint.gradle.plugin:11.3.1")
implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.1")
implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.4.1.3373")
implementation("org.jlleitschuh.gradle.ktlint:org.jlleitschuh.gradle.ktlint.gradle.plugin:11.6.1")
implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.3")

testImplementation(gradleTestKit())
testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.27.0")
testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
}

tasks {
Expand All @@ -38,27 +38,27 @@ tasks {

jacocoTestReport {
reports {
xml.required.set(true)
html.required.set(false)
xml.required = true
html.required = false
}
}
}

configure<DetektExtension> {
buildUponDefaultConfig = true
config = files("src/main/resources/detekt-config.yml")
config.setFrom(files("src/main/resources/detekt-config.yml"))
}

gradlePlugin {
website.set("https://github.com/ekino/kotlin-quality-plugin")
vcsUrl.set("https://github.com/ekino/kotlin-quality-plugin")
website = "https://github.com/ekino/kotlin-quality-plugin"
vcsUrl = "https://github.com/ekino/kotlin-quality-plugin"
plugins {
create("kotlin-quality") {
id = "com.ekino.oss.plugin.kotlin-quality"
implementationClass = "com.ekino.oss.plugin.KotlinQualityPlugin"
displayName = "Kotlin Quality plugin"
description = "Kotlin Quality plugin for Ekino projects"
tags.set(listOf("ekino", "kotlin", "quality", "ktlint", "detekt", "sonarqube"))
tags = listOf("ekino", "kotlin", "quality", "ktlint", "detekt", "sonarqube")
}
}
}
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.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
17 changes: 9 additions & 8 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 @@ -144,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 @@ -201,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
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class KotlinQualityPlugin : Plugin<Project> {
property("sonar.projectName", project.name)
property("sonar.sourceEncoding", "UTF-8")
property("sonar.host.url", extension.sonarUrl)
property("sonar.coverage.jacoco.xmlReportPaths", "$buildDir/reports/jacoco/test/jacocoTestReport.xml")
property("sonar.coverage.jacoco.xmlReportPaths", "${layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class GradleVersionsCompatibilityTest {
@TempDir
lateinit var tempDir: File

@ValueSource(strings = ["7.6.1", "8.1", "8.2.1"])
@ValueSource(strings = ["7.6.1", "8.4"])
@ParameterizedTest(name = "Gradle {0}")
@DisplayName("Should work in Gradle version")
fun shouldWorkInGradleVersion(gradleVersion: String) {
Expand Down

0 comments on commit a339095

Please sign in to comment.