Skip to content

Commit

Permalink
updated Gradle to 8.12 and removed deprecated stuff in build scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
clausnagel committed Jan 3, 2025
1 parent 39efaa9 commit e35568b
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 22 deletions.
30 changes: 15 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ plugins {

apply from: 'properties.gradle'

version '0.10.0-beta'
version = '0.10.1-beta'

allprojects {
group 'org.citydb'
group = 'org.citydb'
}

subprojects {
Expand All @@ -18,7 +18,7 @@ subprojects {
apply plugin: 'org.gradlex.extra-java-module-info'
apply plugin: 'idea'

version parent.version
version = parent.version

java {
toolchain {
Expand All @@ -34,20 +34,20 @@ subprojects {

repositories {
maven {
url 'https://repo.osgeo.org/repository/release/'
url = 'https://repo.osgeo.org/repository/release/'
}
maven {
url 'https://oss.sonatype.org/content/repositories/snapshots/'
url = 'https://oss.sonatype.org/content/repositories/snapshots/'
}
maven {
url 'https://3dcitydb.org/maven'
url = 'https://3dcitydb.org/maven'
}
mavenCentral()
}

dependencies {
testImplementation(platform('org.junit:junit-bom:5.9.2'))
testImplementation('org.junit.jupiter:junit-jupiter')
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}

test {
Expand All @@ -66,11 +66,11 @@ subprojects {

idea {
module {
outputDir file('out/production/classes')
outputDir = file('out/production/classes')
}
}

task processLicense(type: Copy) {
tasks.register('processLicense', Copy) {
from("$rootDir/resources/license/LICENSE.txt") {
filteringCharset = 'UTF-8'
filter(ReplaceTokens, tokens: [
Expand Down Expand Up @@ -102,9 +102,9 @@ subprojects {
from("$rootDir/resources/javadoc/overview.html") {
filteringCharset = 'UTF-8'
filter(ReplaceTokens, tokens: [
name: project.name,
version: project.version,
appName: project.appName,
name: name,
version: version,
appName: appName,
])
}
into "$projectDir/build/tmp/javadoc"
Expand Down Expand Up @@ -141,8 +141,8 @@ subprojects {
}
repositories {
maven {
url project.hasProperty('gitLab_maven_url') ? project.property('gitLab_maven_url') : System.getenv('GITLAB_MAVEN_URL')
name 'gitlab-maven'
url = project.hasProperty('gitLab_maven_url') ? project.property('gitLab_maven_url') : System.getenv('GITLAB_MAVEN_URL')
name = 'gitlab-maven'
credentials(HttpHeaderCredentials) {
name = 'Private-Token'
value = project.hasProperty('gitLab_private_token') ? project.property('gitLab_private_token') : System.getenv('GITLAB_PRIVATE_TOKEN')
Expand Down
8 changes: 4 additions & 4 deletions citydb-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ processResources {
filteringCharset = 'ISO-8859-1'
filesMatching('**/application.properties') {
filter(ReplaceTokens, tokens: [
name: project.appName,
version: project.version,
copyrightYear: project.appCopyrightYear,
vendor: project.vendorName
name: appName,
version: version,
copyrightYear: appCopyrightYear,
vendor: vendorName
])
}
}
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.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

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

0 comments on commit e35568b

Please sign in to comment.