Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
id 'com.jfrog.artifactory' version '5.2.5'
id 'org.sonarqube' version '7.1.0.6387'
id 'de.thetaphi.forbiddenapis' version '3.0' apply false
id 'com.diffplug.spotless' version '6.15.0'
id 'com.diffplug.spotless' version '7.0.2'
}

allprojects {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 1 addition & 4 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion jruby-repackaged/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'com.github.johnrengelman.shadow' version '7.1.0'
id 'com.gradleup.shadow' version '9.0.1'
}

ext {
Expand All @@ -11,6 +11,7 @@ dependencies {
}

shadowJar {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would help to add a comment about why we add this parameter. We discussed about this in other repos, but it would help not having to jump around to find the why

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added the comment explaining why this duplicateStrategy was added

exclude 'com/headius/options/example/**'
exclude 'com/headius/racc/**'
exclude 'com/jcraft/**'
Expand Down
2 changes: 1 addition & 1 deletion mise.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[tools]
java = "corretto-21"
gradle = "8.14"
gradle = "9.3.1"
2 changes: 1 addition & 1 deletion sonar-ruby-plugin/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'com.github.johnrengelman.shadow' version '7.1.0'
id 'com.gradleup.shadow' version '9.0.1'
}

ext {
Expand Down
Loading