Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Gradle 8.13 #1488

Merged
merged 2 commits into from
Mar 17, 2025
+5 −4
Merged

Upgrade to Gradle 8.13 #1488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20f04e0
Upgrade to Gradle 8.13
liblit Mar 16, 2025
2b5c9a5
Merge branch 'master' into upgrade-to-Gradle-8.13
liblit Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build-logic/src/main/kotlin/com/ibm/wala/gradle/JavaCompileUsingEcj.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.kotlin.dsl.named
import org.gradle.kotlin.dsl.the
import org.gradle.process.ExecOperations
import org.gradle.work.InputChanges

/**
* Compiles some Java {@link SourceSet} using ECJ, but otherwise imitating the standard {@link
Expand Down Expand Up @@ -63,7 +64,7 @@ abstract class JavaCompileUsingEcj : JavaCompile() {
}

@TaskAction
fun compile() {
protected override fun compile(inputs: InputChanges) {
execOperations.javaexec {
classpath(ecjJar.absolutePath)
executable(javaLauncherPath.get())
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=73d2d553933194d8eefed0a291acbe45392ca3572ba13834cbbf373da375276d
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ buildscript { dependencies { classpath("com.diffplug.spotless:spotless-lib-extra

plugins {
id("com.diffplug.configuration-cache-for-platform-specific-build") version "3.44.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
}

enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
Expand Down
Loading