Skip to content

Update to Gradle 9.6.0 and make minor adjustments for deprecated features #247

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

Open
labkey-susanh wants to merge 3 commits into
base: develop
Choose a base branch
from
+8 −3
Open

Update to Gradle 9.6.0 and make minor adjustments for deprecated features #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95d7f78
Gradle 9.6.0
labkey-susanh Jun 23, 2026
1319104
Update isModuleContainer to use hasProperty instead of findProperty f…
labkey-susanh Jun 23, 2026
815919a
Gradle version
labkey-susanh Jun 23, 2026
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
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ on how to do that, including how to develop and test locally and the versioning

## Release Notes

### TBD
*Released*: TBD
(Earliest compatible LabKey version: 26.6.0)
- Update `ModuleFinder.isModuleContainer` to use `hasProperty` instead of `findProperty` for better future compatibility

### 9.0.0
*Released*: 20 May 2026
(Earliest compatible LabKey version: 26.6.0)
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ dependencies {
}

group = 'org.labkey.build'
project.version = "9.1.0-SNAPSHOT"
project.version = "9.1.0-gradle960-SNAPSHOT"

gradlePlugin {
plugins {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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-9.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/org/labkey/gradle/util/ModuleFinder.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class ModuleFinder extends SimpleFileVisitor<Path>

static boolean isModuleContainer(Project p)
{
return (p.findProperty("moduleContainer") && p.path.equalsIgnoreCase((String) p.property("moduleContainer")))
return (p.hasProperty("moduleContainer") && p.path.equalsIgnoreCase((String) p.property("moduleContainer")))
}

static boolean isPotentialModule(Project p)
Expand Down