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 index 0ac94b2a68..298d434f18 100644 --- 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().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 index 2a04ca19ce..a9798ba3f1 100644 --- 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 index 7d72aefe7f..767f2f7974 100644 --- 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().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 index bad299621e..8370ec0501 100644 --- 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 { 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 index 7eea263c95..66c0918c9c 100644 --- 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() - 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 index a5a142e851..92e4a8e32c 100644 --- 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)