Use new API for updating collection properties

More details [here](better-api-for-updating-collection-properties).
wala · Mar 24, 2024 · 3a2ca2e · 3a2ca2e
1 parent d7bd366
commit 3a2ca2e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/build-logic/src/main/kotlin/com/ibm/wala/gradle/NullAway.gradle.kts b/build-logic/src/main/kotlin/com/ibm/wala/gradle/NullAway.gradle.kts
@@ -16,7 +16,7 @@ tasks.withType<JavaCompile>().configureEach {
   options.errorprone {
     if (!name.contains("test", true)) {
       error("NullAway")
-      errorproneArgs.addAll(
+      errorproneArgs.appendAll(
           "-XepOpt:NullAway:AnnotatedPackages=com.ibm.wala",
           "-XepOpt:NullAway:JSpecifyMode=true",
       )

diff --git a/build-logic/src/main/kotlin/com/ibm/wala/gradle/cast/helpers.kt b/build-logic/src/main/kotlin/com/ibm/wala/gradle/cast/helpers.kt
@@ -85,7 +85,7 @@ fun addJvmLibrary(binary: CppBinary, linkTask: AbstractLinkTask, project: Projec
 
 fun addRpath(linkTask: AbstractLinkTask, library: File) {
   if (!(linkTask.project.rootProject.extra["isWindows"] as Boolean)) {
-    linkTask.linkerArgs.add("-Wl,-rpath,${library.parent}")
+    linkTask.linkerArgs.append("-Wl,-rpath,${library.parent}")
   }
 }
 

diff --git a/build-logic/src/main/kotlin/com/ibm/wala/gradle/java.gradle.kts b/build-logic/src/main/kotlin/com/ibm/wala/gradle/java.gradle.kts
@@ -70,7 +70,7 @@ tasks.withType<JavaCompile>().configureEach {
     disable("ReferenceEquality")
     // Example for running Error Prone's auto-patcher.  To run, uncomment and change the
     // check name to the one you want to patch
-    //			errorproneArgs.addAll(
+    //			errorproneArgs.appendAll(
     //					"-XepPatchChecks:UnnecessaryParentheses",
     //					"-XepPatchLocation:IN_PLACE"
     //			)

diff --git a/cast/cast/build.gradle.kts b/cast/cast/build.gradle.kts
@@ -12,7 +12,7 @@ library {
   // https://github.com/gradle/gradle/issues/18876
   // is fixed
   if (rootProject.extra["osName"] == "Mac OS X" && rootProject.extra["archName"] == "aarch64") {
-    targetMachines.add(machines.macOS.x86_64)
+    targetMachines.append(machines.macOS.x86_64)
   }
 
   binaries.whenElementFinalized {
@@ -24,7 +24,7 @@ library {
         .configure(
             closureOf<LinkSharedLibrary> {
               if (targetMachine.operatingSystemFamily.isMacOs) {
-                linkerArgs.add("-Wl,-install_name,@rpath/${nativeLibraryOutput.name}")
+                linkerArgs.append("-Wl,-install_name,@rpath/${nativeLibraryOutput.name}")
               }
               addJvmLibrary(this@whenElementFinalized, this, project)
             })

diff --git a/cast/smoke_main/build.gradle.kts b/cast/smoke_main/build.gradle.kts
@@ -51,7 +51,7 @@ application {
   // https://github.com/gradle/gradle/issues/18876
   // is fixed
   if (rootProject.extra["osName"] == "Mac OS X" && rootProject.extra["archName"] == "aarch64") {
-    targetMachines.add(machines.macOS.x86_64)
+    targetMachines.append(machines.macOS.x86_64)
   }
 
   dependencies {
@@ -95,15 +95,16 @@ application {
 
                       // xlator Java bytecode + implementation of native methods
                       val pathElements = project.objects.listProperty<File>()
-                      pathElements.addAll(files("../build/classes/java/test", libxlatorTest.parent))
+                      pathElements.appendAll(
+                          files("../build/classes/java/test", libxlatorTest.parent))
 
                       // "primordial.txt" resource loaded during test
-                      pathElements.add(coreResources.singleFile)
+                      pathElements.append(coreResources.singleFile)
                       inputs.files(coreResources)
 
                       // additional supporting Java class files
                       inputs.files(smokeMainExtraPathElements)
-                      pathElements.addAll(smokeMainExtraPathElements)
+                      pathElements.appendAll(smokeMainExtraPathElements)
 
                       // all combined as a colon-delimited path list
                       argumentProviders.add { listOf(pathElements.get().joinToString(":")) }

diff --git a/cast/xlator_test/build.gradle.kts b/cast/xlator_test/build.gradle.kts
@@ -17,7 +17,7 @@ library {
   // https://github.com/gradle/gradle/issues/18876
   // is fixed
   if (rootProject.extra["osName"] == "Mac OS X" && rootProject.extra["archName"] == "aarch64") {
-    targetMachines.add(machines.macOS.x86_64)
+    targetMachines.append(machines.macOS.x86_64)
   }
   privateHeaders.from(castHeaderDirectory)