minor build clean up (and buildDir was deprecated)

ben-manes · Jul 22, 2023 · 0bedba1 · 0bedba1
1 parent 1640b25
commit 0bedba1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/gradle/plugins/src/main/kotlin/analyze/jmh-caffeine-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/analyze/jmh-caffeine-conventions.gradle.kts
@@ -39,9 +39,9 @@ jmh {
 
   val jvmArguments = mutableListOf("-Xmx2G")
   if (System.getenv("GRAALVM") == "true") {
-    jvmArguments.addAll(listOf(
+    jvmArguments += listOf(
       "-XX:+UnlockExperimentalVMOptions", "-Dgraal.ShowConfiguration=info",
-      "-XX:+EnableJVMCI", "-XX:+UseJVMCICompiler", "-XX:+EagerJVMCI"))
+      "-XX:+EnableJVMCI", "-XX:+UseJVMCICompiler", "-XX:+EagerJVMCI")
   }
   jvmArgs = jvmArguments
 

diff --git a/gradle/plugins/src/main/kotlin/lifecycle/dependency-versions-caffeine-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/lifecycle/dependency-versions-caffeine-conventions.gradle.kts
@@ -24,7 +24,7 @@ tasks.named<DependencyUpdatesTask>("dependencyUpdates").configure {
     val reporter = PlainTextReporter(project, revision, gradleReleaseChannel)
     exceeded.dependencies.removeAll { dependency ->
       if (dependency.group?.startsWith("org.ops4j") == true) {
-        current.dependencies.add(dependency)
+        current.dependencies += dependency
         true
       } else {
         false

diff --git a/gradle/plugins/src/main/kotlin/lifecycle/eclipse-caffeine-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/lifecycle/eclipse-caffeine-conventions.gradle.kts
@@ -27,9 +27,9 @@ fun excludeInfoFiles() {
       if (this is Classpath) {
         entries.filterIsInstance<SourceFolder>().forEach { sourceFolder ->
           val excludes = sourceFolder.excludes.toMutableList()
-          excludes.add("module-info.java")
+          excludes += "module-info.java"
           if (sourceFolder.path != "src/main/java") {
-            excludes.add("**/package-info.java")
+            excludes += "**/package-info.java"
           }
           sourceFolder.excludes = excludes
         }

diff --git a/simulator/build.gradle.kts b/simulator/build.gradle.kts
@@ -99,8 +99,8 @@ tasks.register<Rewrite>("rewrite") {
 
 eclipse.classpath.file.beforeMerged {
   if (this is EclipseClasspath) {
-    entries.add(SourceFolder(
-      relativePath("$buildDir/generated/sources/annotationProcessor/java/main"), "bin/main"))
+    val absolutePath = layout.buildDirectory.dir("generated/sources/annotationProcessor/java/main")
+    entries.add(SourceFolder(relativePath(absolutePath), "bin/main"))
   }
 }