From 70fc5d2e6b676988f9ef94b099977abff8bb738b Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Sat, 16 Nov 2024 12:46:48 -0500 Subject: [PATCH 1/3] Upgrade Gradle Shellcheck plugin We plan to upgrade to Gradle 8.11 soon, but that version apparently is incompatible with the version of the Shellcheck plugin that we had been using previously. --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a726e3a50..792201a6b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -49,7 +49,7 @@ dependency-analysis = "com.autonomousapps.dependency-analysis:1.32.0" file-lister = "all.shared.gradle.file-lister:1.0.2" google-java-format = "com.github.sherter.google-java-format:0.9" markdown = "com.appmattus.markdown:0.6.0" -shellcheck = "com.felipefzdz.gradle.shellcheck:1.4.6" +shellcheck = "com.felipefzdz.gradle.shellcheck:1.5.0" spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } task-tree = "com.dorongold.task-tree:3.0.0" version-catalog-update = "nl.littlerobots.version-catalog-update:0.8.4" From 21ab72081c40b345729c3e30e4e53416ae76521a Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Sat, 16 Nov 2024 12:21:03 -0500 Subject: [PATCH 2/3] Upgrade to Gradle 8.11 --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e955ee28d..425bc3933 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=fdfca5dbc2834f0ece5020465737538e5ba679deeff5ab6c09621d67f8bb1a15 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-all.zip +distributionSha256Sum=73d2d553933194d8eefed0a291acbe45392ca3572ba13834cbbf373da375276d +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From f3624a484c64d08b379c96fae503efa237c6e957 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Sat, 16 Nov 2024 12:24:29 -0500 Subject: [PATCH 3/3] Enable configuration cache for C++ tasks Gradle 3.11 supports the configuration cache for C++ [applications](https://github.com/gradle/gradle/issues/13484) and [libraries](https://github.com/gradle/gradle/issues/13485). Hooray! --- .../main/kotlin/com/ibm/wala/gradle/cast/native.gradle.kts | 5 ----- cast/cast/build.gradle.kts | 1 - cast/smoke_main/build.gradle.kts | 2 -- cast/xlator_test/build.gradle.kts | 1 - 4 files changed, 9 deletions(-) delete mode 100644 build-logic/src/main/kotlin/com/ibm/wala/gradle/cast/native.gradle.kts diff --git a/build-logic/src/main/kotlin/com/ibm/wala/gradle/cast/native.gradle.kts b/build-logic/src/main/kotlin/com/ibm/wala/gradle/cast/native.gradle.kts deleted file mode 100644 index 8c7063103..000000000 --- a/build-logic/src/main/kotlin/com/ibm/wala/gradle/cast/native.gradle.kts +++ /dev/null @@ -1,5 +0,0 @@ -package com.ibm.wala.gradle.cast - -tasks.withType { - notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/13485") -} diff --git a/cast/cast/build.gradle.kts b/cast/cast/build.gradle.kts index 454bc055c..3b087904d 100644 --- a/cast/cast/build.gradle.kts +++ b/cast/cast/build.gradle.kts @@ -4,7 +4,6 @@ import com.ibm.wala.gradle.cast.nativeLibraryOutput plugins { `cpp-library` - id("com.ibm.wala.gradle.cast.native") id("com.ibm.wala.gradle.subproject") } diff --git a/cast/smoke_main/build.gradle.kts b/cast/smoke_main/build.gradle.kts index 7b370eae1..92ccde537 100644 --- a/cast/smoke_main/build.gradle.kts +++ b/cast/smoke_main/build.gradle.kts @@ -10,7 +10,6 @@ import org.gradle.language.cpp.CppBinary.OPTIMIZED_ATTRIBUTE plugins { `cpp-application` - id("com.ibm.wala.gradle.cast.native") id("com.ibm.wala.gradle.subproject") } @@ -72,7 +71,6 @@ application { if (isDebuggable && !isOptimized) { val checkSmokeMain by tasks.registering(Exec::class) { - notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/13485") // main executable to run for test inputs.file(linkedFile) diff --git a/cast/xlator_test/build.gradle.kts b/cast/xlator_test/build.gradle.kts index d5aeee3e9..a97249f92 100644 --- a/cast/xlator_test/build.gradle.kts +++ b/cast/xlator_test/build.gradle.kts @@ -2,7 +2,6 @@ import com.ibm.wala.gradle.cast.addCastLibrary plugins { `cpp-library` - id("com.ibm.wala.gradle.cast.native") id("com.ibm.wala.gradle.subproject") }