You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2019/09/30 11:55:35 UTC
[jmeter] branch master updated: Configure Spotless check and format
for *.gradle.kts files
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new 09c297f Configure Spotless check and format for *.gradle.kts files
09c297f is described below
commit 09c297fcd2b87dddd03bdc90486481402b477c89
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Mon Sep 30 14:49:02 2019 +0300
Configure Spotless check and format for *.gradle.kts files
---
.editorconfig | 2 ++
build.gradle.kts | 12 ++++++--
buildSrc/build.gradle.kts | 18 ++++++++++--
buildSrc/checksum.xml | 23 ++++++++++++++++
buildSrc/settings.gradle.kts | 4 ---
.../jmeter/buildtools/batchtest/BatchTest.kt | 10 +++++--
.../jmeter/buildtools/batchtest/BatchtestPlugin.kt | 2 +-
settings.gradle.kts | 2 +-
src/config/build.gradle.kts | 2 --
src/dist/build.gradle.kts | 32 ++++++++++++++--------
src/licenses/build.gradle.kts | 7 ++++-
src/protocol/build.gradle.kts | 1 -
12 files changed, 86 insertions(+), 29 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index 0107a0f..018a717 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,6 +14,8 @@ end_of_line = crlf
[{*.kts,*.kt}]
ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
+ij_kotlin_name_count_to_use_star_import = 999
+ij_kotlin_name_count_to_use_star_import_for_members = 999
[*.java]
# Doc: https://youtrack.jetbrains.com/issue/IDEA-170643#focus=streamItem-27-3708697.0-0
diff --git a/build.gradle.kts b/build.gradle.kts
index 7753778..3a871ae 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -58,7 +58,6 @@ fun Project.boolProp(name: String) =
?.let { it as? String }
?.equals("false", ignoreCase = true)?.not()
-
// Release candidate index
val String.v: String get() = rootProject.extra["$this.version"] as String
version = "jmeter".v + releaseParams.snapshotSuffix
@@ -252,6 +251,16 @@ allprojects {
// JMeter ClassFinder parses "class.path" and tries to find jar names there,
// so we should produce jars without versions names for now
// version = rootProject.version
+ if (!skipSpotless) {
+ apply(plugin = "com.diffplug.gradle.spotless")
+ spotless {
+ kotlinGradle {
+ ktlint()
+ trimTrailingWhitespace()
+ endWithNewline()
+ }
+ }
+ }
plugins.withType<JavaPlugin> {
// We don't intend to resolve that configuration
// It is in line with further Gradle versions: https://github.com/gradle/gradle/issues/8585
@@ -285,7 +294,6 @@ allprojects {
}
if (!skipSpotless) {
- apply(plugin = "com.diffplug.gradle.spotless")
spotless {
java {
licenseHeaderFile(licenseHeaderFile)
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 942feed..f550654 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,9 +16,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
*
*/
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
plugins {
java
`kotlin-dsl` apply false
+ id("com.diffplug.gradle.spotless") version "3.24.3"
}
repositories {
@@ -52,6 +53,19 @@ fun Project.applyKotlinProjectConventions() {
jvmTarget = "1.8"
}
}
+ apply(plugin = "com.diffplug.gradle.spotless")
+ spotless {
+ kotlin {
+ ktlint()
+ trimTrailingWhitespace()
+ endWithNewline()
+ }
+ kotlinGradle {
+ ktlint()
+ trimTrailingWhitespace()
+ endWithNewline()
+ }
+ }
}
dependencies {
diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
index 75d18bc..c1b9f52 100644
--- a/buildSrc/checksum.xml
+++ b/buildSrc/checksum.xml
@@ -3,15 +3,29 @@
<trust-requirement pgp='GROUP' checksum='NONE' />
<ignored-keys />
<trusted-keys>
+ <trusted-key id='379ce192d401ab61' group='com.diffplug.durian' />
+ <trusted-key id='379ce192d401ab61' group='com.diffplug.spotless' />
+ <trusted-key id='461a804f2609fd89' group='com.github.shyiko.klob' />
<trusted-key id='7a01b0f236e5430f' group='com.google.code.gson' />
+ <trusted-key id='abe9f3126bb741c1' group='com.google.guava' />
+ <trusted-key id='7eb97d110dfadd60' group='com.googlecode.concurrent-trees' />
<trusted-key id='72475fd306b9cab7' group='com.googlecode.javaewah' />
<trusted-key id='a50569c7ca7fa1f0' group='com.jcraft' />
+ <trusted-key id='aa49c633b4734832' group='com.pinterest' />
+ <trusted-key id='aa49c633b4734832' group='com.pinterest.ktlint' />
<trusted-key id='86fdc7e2a11262cb' group='commons-codec' />
<trusted-key id='a41f13c999945293' group='commons-logging' />
<trusted-key id='6449005f96bc97a3' group='de.undercouch' />
+ <trusted-key id='379ce192d401ab61' group='info.picocli' />
<trusted-key id='c84125c13bf6f2f2' group='org.ajoberstar.grgit' />
+ <trusted-key id='9daadc1c9fcc82d0' group='org.apache.commons' />
<trusted-key id='7c25280eae63ebe5' group='org.apache.httpcomponents' />
+ <trusted-key id='c7bf26d0bb617866' group='org.apache.maven' />
+ <trusted-key id='e2b3d84202b812d9' group='org.assertj' />
<trusted-key id='b341ddb020fcb6ab' group='org.bouncycastle' />
+ <trusted-key id='41321490758aad6f' group='org.codehaus.groovy' />
+ <trusted-key id='466caed6e0747d50' group='org.codehaus.plexus' />
+ <trusted-key id='c7bf26d0bb617866' group='org.eclipse.aether' />
<trusted-key id='5b05ccde140c2876' group='org.eclipse.jgit' />
<trusted-key id='bcf4173966770193' group='org.jetbrains' />
<trusted-key id='379ce192d401ab61' group='org.jetbrains.intellij.deps' />
@@ -26,5 +40,14 @@
<dependency group='org.gradle.kotlin' module='plugins' version='1.2.9'>
<sha512>F672FEB39919B2A78E0AEFA95E8BE023C856EA802FBB652EE97FF6BC935BB6E29B9E5E36CC62B9B52D970DE6C49AC0D07C1EC5588771FC2B89787AB94CAE6AC7</sha512>
</dependency>
+ <dependency group='org.slf4j' module='jcl-over-slf4j' version='1.6.2'>
+ <sha512>3BA508C96EE0985865C9E86EBE803D1903835F7C198EB15723CDC86B028D6C82DBB7E96ECB01CEFAD7CC6EC7023155676D034B6B730A911D0FFE9F91FE532592</sha512>
+ </dependency>
+ <dependency group='org.slf4j' module='slf4j-api' version='1.6.2'>
+ <sha512>F520620AA2DF7856DEA11E8B310F5F48C7A53444867112F734FFEF6726DF6EB469BF068564AF79B7DE30845906E7B5772CA064A3CC0DA18918E6DE46BD02D6E6</sha512>
+ </dependency>
+ <dependency group='org.slf4j' module='slf4j-nop' version='1.6.2'>
+ <sha512>89F8559C281F6BCEA4EB193C49AA8C960A5FE6762DCA0198A7BB04B9D8A846AC52231F77EC16B2E9C0B48D0F6011517B641B5B93279B24EEF65EE22E2C1167F3</sha512>
+ </dependency>
</dependencies>
</dependency-verification>
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index a38ca7c..e704fea 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -1,7 +1,3 @@
-import org.gradle.api.internal.artifacts.result.DefaultResolvedDependencyResult
-import java.security.MessageDigest
-import java.util.*
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
index bd4386f..22fba7d 100644
--- a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
+++ b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
@@ -25,8 +25,12 @@ import org.eclipse.jgit.diff.RawTextComparator
import org.eclipse.jgit.util.io.AutoCRLFInputStream
import org.gradle.api.GradleException
import org.gradle.api.model.ObjectFactory
-import org.gradle.api.tasks.*
-import org.gradle.kotlin.dsl.configure
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.JavaExec
import org.gradle.kotlin.dsl.property
import java.io.File
import java.net.InetAddress
@@ -149,7 +153,7 @@ open class BatchTest @Inject constructor(objects: ObjectFactory) : JavaExec() {
val diffAlgorithm = DiffAlgorithm.getAlgorithm(DiffAlgorithm.SupportedAlgorithm.HISTOGRAM)
val edits = diffAlgorithm.diff(RawTextComparator.DEFAULT, e, a)
DiffFormatter(System.out).format(edits, e, a)
- return false;
+ return false
}
override fun exec() {
diff --git a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchtestPlugin.kt b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchtestPlugin.kt
index 4f5dc7d..370edb0 100644
--- a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchtestPlugin.kt
+++ b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchtestPlugin.kt
@@ -21,7 +21,7 @@ package org.apache.jmeter.buildtools.batchtest
import org.gradle.api.Plugin
import org.gradle.api.Project
-open class BatchtestPlugin: Plugin<Project> {
+open class BatchtestPlugin : Plugin<Project> {
override fun apply(target: Project) {
}
}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b04ae53..2c78a23 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -65,7 +65,7 @@ fun String?.toBool(nullAs: Boolean, blankAs: Boolean, default: Boolean) =
}
fun property(name: String) =
- when(extra.has(name)) {
+ when (extra.has(name)) {
true -> extra.get(name) as? String
else -> null
}
diff --git a/src/config/build.gradle.kts b/src/config/build.gradle.kts
index 5f50626..3cf6cd8 100644
--- a/src/config/build.gradle.kts
+++ b/src/config/build.gradle.kts
@@ -18,8 +18,6 @@
import com.github.vlsi.gradle.crlf.CrLfSpec
import com.github.vlsi.gradle.crlf.LineEndings
-import com.github.vlsi.gradle.release.dsl.dependencyLicenses
-import com.github.vlsi.gradle.release.dsl.licensesCopySpec
plugins {
id("com.github.vlsi.crlf")
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 0502298..bbf72da 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -34,7 +34,7 @@ var jars = arrayOf(
":src:launcher",
":src:components",
":src:core",
- //":src:examples",
+ // ":src:examples",
":src:functions",
":src:jorphan",
":src:protocol:ftp",
@@ -174,10 +174,16 @@ val createDist by tasks.registering {
// source/binary artifacts with the appropriate eol/executable file flags
val gitProps by rootProject.tasks.existing(FindGitAttributes::class)
-fun createAnakiaTask(taskName: String,
- baseDir: String, extension: String = ".html", style: String,
- velocityProperties: String, projectFile: String, excludes: Array<String>,
- includes: Array<String>): TaskProvider<Task> {
+fun createAnakiaTask(
+ taskName: String,
+ baseDir: String,
+ extension: String = ".html",
+ style: String,
+ velocityProperties: String,
+ projectFile: String,
+ excludes: Array<String>,
+ includes: Array<String>
+): TaskProvider<Task> {
val outputDir = "$buildDir/docs/$taskName"
val prepareProps = tasks.register("prepareProperties$taskName") {
@@ -206,7 +212,7 @@ fun createAnakiaTask(taskName: String,
writer().use {
it.appendln("# Auto-generated from $velocityProperties to pass absolute path to Velocity")
- for(line in lines) {
+ for (line in lines) {
it.appendln(line)
}
}
@@ -290,10 +296,12 @@ val previewPrintableDocs by tasks.registering(Copy::class) {
val lastEditYear: String by rootProject.extra
-fun xslt(subdir: String,
- outputDir: String,
- includes: Array<String> = arrayOf("*.xml"),
- excludes: Array<String> = arrayOf("extending.xml")) {
+fun xslt(
+ subdir: String,
+ outputDir: String,
+ includes: Array<String> = arrayOf("*.xml"),
+ excludes: Array<String> = arrayOf("extending.xml")
+) {
val relativePath = if (subdir.isEmpty()) "." else ".."
ant.withGroovyBuilder {
@@ -317,10 +325,10 @@ val processSiteXslt by tasks.registering {
outputs.dir(outputDir)
doLast {
- for(f in (outputs as TaskOutputsInternal).previousOutputFiles) {
+ for (f in (outputs as TaskOutputsInternal).previousOutputFiles) {
f.delete()
}
- for(i in arrayOf("", "usermanual", "localising")) {
+ for (i in arrayOf("", "usermanual", "localising")) {
xslt(i, outputDir)
}
}
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 26631bf..4437e87 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -17,7 +17,12 @@
*/
import com.github.vlsi.gradle.license.GatherLicenseTask
-import com.github.vlsi.gradle.license.api.*
+import com.github.vlsi.gradle.license.api.SimpleLicense
+import com.github.vlsi.gradle.license.api.SpdxLicense
+import com.github.vlsi.gradle.license.api.SpdxLicenseException
+import com.github.vlsi.gradle.license.api.and
+import com.github.vlsi.gradle.license.api.asExpression
+import com.github.vlsi.gradle.license.api.with
import com.github.vlsi.gradle.release.Apache2LicenseRenderer
import com.github.vlsi.gradle.release.ArtifactType
import com.github.vlsi.gradle.release.AsfLicenseCategory
diff --git a/src/protocol/build.gradle.kts b/src/protocol/build.gradle.kts
index b589b3d..88b8da0 100644
--- a/src/protocol/build.gradle.kts
+++ b/src/protocol/build.gradle.kts
@@ -78,7 +78,6 @@ project("http") {
testImplementation(testFixtures(project(":src:testkit-wiremock")))
testImplementation("com.github.tomakehurst:wiremock-jre8")
}
-
}
project("java") {