Skip to content

Commit 868b0d1

Browse files
Use non-deprecated syntax as of Gradle 8.12 (#78)
1 parent c65b306 commit 868b0d1

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
}
1111
}
1212
maven {
13-
url "${artifactory_contextUrl}/plugins-release-no-proxy"
13+
url = "${artifactory_contextUrl}/plugins-release-no-proxy"
1414
mavenContent {
1515
releasesOnly()
1616
}
@@ -23,7 +23,7 @@ buildscript {
2323
{
2424
mavenLocal()
2525
maven {
26-
url "${artifactory_contextUrl}/plugins-snapshot-local"
26+
url = "${artifactory_contextUrl}/plugins-snapshot-local"
2727
mavenContent {
2828
snapshotsOnly()
2929
}
@@ -50,7 +50,7 @@ plugins {
5050
repositories {
5151
mavenCentral()
5252
maven {
53-
url "${artifactory_contextUrl}/libs-release-no-proxy"
53+
url = "${artifactory_contextUrl}/libs-release-no-proxy"
5454

5555
if (hasProperty('artifactory_user') && hasProperty('artifactory_password'))
5656
{
@@ -69,9 +69,9 @@ repositories {
6969
}
7070
}
7171

72-
group "org.labkey.api"
72+
group = "org.labkey.api"
7373

74-
version "6.3.0-SNAPSHOT"
74+
version = "6.3.0-SNAPSHOT"
7575

7676
dependencies {
7777
api "org.json:json:${jsonObjectVersion}"
@@ -138,7 +138,7 @@ project.tasks.register('javadocJar', Jar) {
138138
Jar jar ->
139139
jar.description = "Generate jar file of javadoc files"
140140
jar.from project.tasks.javadoc.destinationDir
141-
jar.group GroupNames.DISTRIBUTION
141+
jar.group = GroupNames.DISTRIBUTION
142142
jar.archiveClassifier.set(LabKey.JAVADOC_CLASSIFIER)
143143
jar.dependsOn project.tasks.javadoc
144144
}
@@ -147,7 +147,7 @@ project.tasks.register('sourcesJar', Jar) {
147147
Jar jar ->
148148
jar.description = "Generate jar file of source files"
149149
jar.from project.sourceSets.main.allJava
150-
jar.group GroupNames.DISTRIBUTION
150+
jar.group = GroupNames.DISTRIBUTION
151151
jar.archiveClassifier.set(LabKey.SOURCES_CLASSIFIER)
152152
}
153153

@@ -200,18 +200,18 @@ project.publishing {
200200
if (project.hasProperty("sonatype_staging_url") && project.hasProperty("sonatype_username") && project.hasProperty("sonatype_password"))
201201
{
202202
maven {
203-
url sonatype_staging_url
203+
url = sonatype_staging_url
204204
credentials {
205-
username sonatype_username
206-
password sonatype_password
205+
username = sonatype_username
206+
password = sonatype_password
207207
}
208208
}
209209
}
210210

211211
if (project.hasProperty('artifactory_user') && project.hasProperty('artifactory_password'))
212212
{
213213
maven {
214-
url project.version.contains("SNAPSHOT") ? "${artifactory_contextUrl}/libs-snapshot-local" : "${artifactory_contextUrl}/libs-release-local"
214+
url = project.version.contains("SNAPSHOT") ? "${artifactory_contextUrl}/libs-snapshot-local" : "${artifactory_contextUrl}/libs-release-local"
215215
credentials {
216216
username = artifactory_user
217217
password = artifactory_password

gradlew

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum

0 commit comments

Comments
 (0)