From 541919c891313a64401ec1557e478688117320f1 Mon Sep 17 00:00:00 2001 From: JeremyStarTM Date: Mon, 8 Jul 2024 12:39:04 +0200 Subject: [PATCH] Update build.gradle syntax --- base/build.gradle | 36 +++++++++---------- build.gradle | 20 +++++------ gradle.properties | 2 +- graphics/build.gradle | 26 +++++++------- graphics/opengl/build.gradle | 70 ++++++++++++++++++------------------ graphics/vulkan/build.gradle | 64 ++++++++++++++++----------------- slf4j-compat/build.gradle | 20 +++++------ testapp/build.gradle | 24 ++++++------- 8 files changed, 131 insertions(+), 131 deletions(-) diff --git a/base/build.gradle b/base/build.gradle index b610054c..d93f9cb2 100644 --- a/base/build.gradle +++ b/base/build.gradle @@ -18,44 +18,44 @@ */ plugins { - id 'java' - id 'io.freefair.lombok' version "${pluginLombok}" + id("java") + id("io.freefair.lombok") version("${pluginLombok}") id "com.gorylenko.gradle-git-properties" version "${pluginGitProperties}" - id 'maven-publish' + id("maven-publish") } dependencies { // -> Runtime <- // Lombok - compileOnly 'org.projectlombok:lombok:' + project.dependencyLombok - annotationProcessor 'org.projectlombok:lombok:' + project.dependencyLombok + compileOnly("org.projectlombok:lombok:${dependencyLombok}") + annotationProcessor("org.projectlombok:lombok:${dependencyLombok}") // JetBrains Annotations - compileOnly 'org.jetbrains:annotations:' + project.dependencyJetbrainsAnnotations + compileOnly("org.jetbrains:annotations:${dependencyJetbrainsAnnotations}") // ANSI support - implementation 'org.fusesource.jansi:jansi:' + project.dependencyJansi + implementation("org.fusesource.jansi:jansi:${dependencyJansi}") // Reflections - implementation 'org.reflections:reflections:' + project.dependencyReflections + implementation "org.reflections:reflections:" + project.dependencyReflections // -> Testing <- // Jetbrains Annotations - testCompileOnly 'org.jetbrains:annotations:' + project.dependencyJetbrainsAnnotations + testCompileOnly("org.jetbrains:annotations:${dependencyJetbrainsAnnotations}") // JUnit - testImplementation platform('org.junit:junit-bom:5.' + project.dependencyJunit) - testImplementation 'org.junit.jupiter:junit-jupiter' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + testImplementation(platform("org.junit:junit-bom:${dependencyJunit}")) + testImplementation("org.junit.jupiter:junit-jupiter") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") // jOOR - testImplementation 'org.jooq:joor:' + project.dependencyJoor + testImplementation("org.jooq:joor:${dependencyJoor}") } gitProperties { dotGitDirectory = file("${rootProject.rootDir}/.git") failOnNoGitDirectory = false - extProperty = 'gitProps' + extProperty = "gitProps" dateFormat = "yyyy-MM-dd'T'HH:mmZ" dateFormatTimeZone = "UTC" @@ -70,10 +70,10 @@ tasks.register("writeGitProperties") { source.renameTo(target) } - outputs.upToDateWhen { false } + outputs.upToDateWhen({ false }) } -generateGitProperties.outputs.upToDateWhen { false } -processResources.dependsOn 'writeGitProperties' +generateGitProperties.outputs.upToDateWhen({ false }) +processResources.dependsOn(writeGitProperties) javadoc.options { setMemberLevel(JavadocMemberLevel.PUBLIC) @@ -88,7 +88,7 @@ javadoc.options { test { useJUnitPlatform() testLogging { - events "passed", "skipped", "failed" + events("passed", "skipped", "failed") } } diff --git a/build.gradle b/build.gradle index 71bc3908..33e9eeeb 100644 --- a/build.gradle +++ b/build.gradle @@ -18,22 +18,22 @@ */ plugins { - id 'java' - id 'io.freefair.lombok' version "${pluginLombok}" - id 'maven-publish' + id("java") + id("io.freefair.lombok") version("${pluginLombok}") + id("maven-publish") } -tasks.register('javadocAll', Javadoc) { +tasks.register("javadocAll", Javadoc) { setDescription("Generates Javadoc API documentation for all subprojects.") setGroup("documentation") def subprojects= [ - ':base', - ':testapp', + ":base", + ":testapp", ] - setSource(subprojects.collect { project(it).sourceSets.main.allJava }) - setClasspath(files(subprojects.collect { project(it).sourceSets.main.compileClasspath })) + setSource(subprojects.collect({ project(it).sourceSets.main.allJava })) + setClasspath(files(subprojects.collect({ project(it).sourceSets.main.compileClasspath }))) setDestinationDir(file("build/docs/javadoc")) options { @@ -46,12 +46,12 @@ tasks.register('javadocAll', Javadoc) { ]) } - dependsOn delombok + dependsOn(delombok) } allprojects { group = project.group - version = project.versioningVersion + '-' + project.versioningType + project.versioningTyperelease + project.versioningFork + version = project.versioningVersion + "-" + project.versioningType + project.versioningTyperelease + project.versioningFork repositories { mavenCentral() diff --git a/gradle.properties b/gradle.properties index de6332aa..89a53574 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,7 +35,7 @@ dependencyLwjgl=3.3.3 dependencyLwjglNatives= # Test dependencies -dependencyJunit=11.0-M2 +dependencyJunit=5.11.0-M2 dependencyJoor=0.9.14 # Plugins diff --git a/graphics/build.gradle b/graphics/build.gradle index a90de793..8a12ad2a 100644 --- a/graphics/build.gradle +++ b/graphics/build.gradle @@ -18,34 +18,34 @@ */ plugins { - id 'java' - id 'io.freefair.lombok' version "${pluginLombok}" + id("java") + id("io.freefair.lombok") version("${pluginLombok}") } dependencies { // -> Runtime <- // Lombok - compileOnly 'org.projectlombok:lombok:' + project.dependencyLombok - annotationProcessor 'org.projectlombok:lombok:' + project.dependencyLombok + compileOnly("org.projectlombok:lombok:${dependencyLombok}") + annotationProcessor("org.projectlombok:lombok:${dependencyLombok}") // JetBrains Annotations - compileOnly 'org.jetbrains:annotations:' + project.dependencyJetbrainsAnnotations + compileOnly("org.jetbrains:annotations:${dependencyJetbrainsAnnotations}") // -> Testing <- // Jetbrains Annotations - testCompileOnly 'org.jetbrains:annotations:' + project.dependencyJetbrainsAnnotations + testCompileOnly("org.jetbrains:annotations:${dependencyJetbrainsAnnotations}") // JUnit - testImplementation platform('org.junit:junit-bom:5.' + project.dependencyJunit) - testImplementation 'org.junit.jupiter:junit-jupiter' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + testImplementation(platform("org.junit:junit-bom:${dependencyJunit}")) + testImplementation("org.junit.jupiter:junit-jupiter") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") // jOOR - testImplementation 'org.jooq:joor:' + project.dependencyJoor + testImplementation("org.jooq:joor:${dependencyJoor}") // -> Project <- - implementation project(":base") - implementation 'org.fusesource.jansi:jansi:' + project.dependencyJansi // for some reason required or the build fails don't ask me why + implementation(project(":base")) + implementation("org.fusesource.jansi:jansi:${dependencyJansi}") // for some reason required or the build fails don"t ask me why } javadoc.options { @@ -61,6 +61,6 @@ javadoc.options { test { useJUnitPlatform() testLogging { - events "passed", "skipped", "failed" + events("passed", "skipped", "failed") } } diff --git a/graphics/opengl/build.gradle b/graphics/opengl/build.gradle index 00e730f4..29422fa3 100644 --- a/graphics/opengl/build.gradle +++ b/graphics/opengl/build.gradle @@ -20,8 +20,8 @@ import org.gradle.internal.os.OperatingSystem plugins { - id 'java' - id 'io.freefair.lombok' version "${pluginLombok}" + id("java") + id("io.freefair.lombok") version("${pluginLombok}") } // Determine LWJGL native stuff @@ -51,51 +51,51 @@ switch (OperatingSystem.current()) { dependencies { // -> Runtime <- // Lombok - compileOnly 'org.projectlombok:lombok:' + project.dependencyLombok - annotationProcessor 'org.projectlombok:lombok:' + project.dependencyLombok + compileOnly("org.projectlombok:lombok:${dependencyLombok}") + annotationProcessor("org.projectlombok:lombok:${dependencyLombok}") // JetBrains Annotations - compileOnly 'org.jetbrains:annotations:' + project.dependencyJetbrainsAnnotations + compileOnly("org.jetbrains:annotations:${dependencyJetbrainsAnnotations}") // LWJGL - implementation platform("org.lwjgl:lwjgl-bom:${dependencyLwjgl}") - implementation "org.lwjgl:lwjgl" - implementation "org.lwjgl:lwjgl-bgfx" - implementation "org.lwjgl:lwjgl-egl" - implementation "org.lwjgl:lwjgl-glfw" - implementation "org.lwjgl:lwjgl-ktx" - implementation "org.lwjgl:lwjgl-opengl" - implementation "org.lwjgl:lwjgl-opengles" - implementation "org.lwjgl:lwjgl-shaderc" - implementation "org.lwjgl:lwjgl-sse" - implementation "org.lwjgl:lwjgl-vma" - runtimeOnly "org.lwjgl:lwjgl::${dependencyLwjglNatives}" - runtimeOnly "org.lwjgl:lwjgl-bgfx::${dependencyLwjglNatives}" - runtimeOnly "org.lwjgl:lwjgl-glfw::${dependencyLwjglNatives}" - runtimeOnly "org.lwjgl:lwjgl-ktx::${dependencyLwjglNatives}" - runtimeOnly "org.lwjgl:lwjgl-opengl::${dependencyLwjglNatives}" - runtimeOnly "org.lwjgl:lwjgl-opengles::${dependencyLwjglNatives}" - runtimeOnly "org.lwjgl:lwjgl-shaderc::${dependencyLwjglNatives}" - runtimeOnly "org.lwjgl:lwjgl-sse::${dependencyLwjglNatives}" - runtimeOnly "org.lwjgl:lwjgl-vma::${dependencyLwjglNatives}" - if (project.dependencyLwjglNatives == "natives-macos" || project.dependencyLwjglNatives == "natives-macos-arm64") runtimeOnly "org.lwjgl:lwjgl-vulkan::${dependencyLwjglNatives}" + implementation(platform("org.lwjgl:lwjgl-bom:${dependencyLwjgl}")) + implementation("org.lwjgl:lwjgl") + implementation("org.lwjgl:lwjgl-bgfx") + implementation("org.lwjgl:lwjgl-egl") + implementation("org.lwjgl:lwjgl-glfw") + implementation("org.lwjgl:lwjgl-ktx") + implementation("org.lwjgl:lwjgl-opengl") + implementation("org.lwjgl:lwjgl-opengles") + implementation("org.lwjgl:lwjgl-shaderc") + implementation("org.lwjgl:lwjgl-sse") + implementation("org.lwjgl:lwjgl-vma") + runtimeOnly("org.lwjgl:lwjgl::${dependencyLwjglNatives}") + runtimeOnly("org.lwjgl:lwjgl-bgfx::${dependencyLwjglNatives}") + runtimeOnly("org.lwjgl:lwjgl-glfw::${dependencyLwjglNatives}") + runtimeOnly("org.lwjgl:lwjgl-ktx::${dependencyLwjglNatives}") + runtimeOnly("org.lwjgl:lwjgl-opengl::${dependencyLwjglNatives}") + runtimeOnly("org.lwjgl:lwjgl-opengles::${dependencyLwjglNatives}") + runtimeOnly("org.lwjgl:lwjgl-shaderc::${dependencyLwjglNatives}") + runtimeOnly("org.lwjgl:lwjgl-sse::${dependencyLwjglNatives}") + runtimeOnly("org.lwjgl:lwjgl-vma::${dependencyLwjglNatives}") + if (project.dependencyLwjglNatives == "natives-macos" || project.dependencyLwjglNatives == "natives-macos-arm64") runtimeOnly("org.lwjgl:lwjgl-vulkan::${dependencyLwjglNatives}") // -> Testing <- // Jetbrains Annotations - testCompileOnly 'org.jetbrains:annotations:' + project.dependencyJetbrainsAnnotations + testCompileOnly("org.jetbrains:annotations:${dependencyJetbrainsAnnotations}") // JUnit - testImplementation platform('org.junit:junit-bom:5.' + project.dependencyJunit) - testImplementation 'org.junit.jupiter:junit-jupiter' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + testImplementation(platform("org.junit:junit-bom:${dependencyJunit}")) + testImplementation("org.junit.jupiter:junit-jupiter") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") // jOOR - testImplementation 'org.jooq:joor:' + project.dependencyJoor + testImplementation("org.jooq:joor:${dependencyJoor}") // -> Project <- - implementation project(":base") - implementation project(":graphics") - implementation 'org.fusesource.jansi:jansi:' + project.dependencyJansi // for some reason required or the build fails don't ask me why + implementation(project(":base")) + implementation(project(":graphics")) + implementation("org.fusesource.jansi:jansi:${dependencyJansi}") // for some reason required or the build fails don"t ask me why } javadoc.options { @@ -111,6 +111,6 @@ javadoc.options { test { useJUnitPlatform() testLogging { - events "passed", "skipped", "failed" + events("passed", "skipped", "failed") } } diff --git a/graphics/vulkan/build.gradle b/graphics/vulkan/build.gradle index 2db3d8ed..d3b878f8 100644 --- a/graphics/vulkan/build.gradle +++ b/graphics/vulkan/build.gradle @@ -20,8 +20,8 @@ import org.gradle.internal.os.OperatingSystem plugins { - id 'java' - id 'io.freefair.lombok' version "${pluginLombok}" + id("java") + id("io.freefair.lombok") version("${pluginLombok}") } // Determine LWJGL native stuff @@ -51,48 +51,48 @@ switch (OperatingSystem.current()) { dependencies { // -> Runtime <- // Lombok - compileOnly 'org.projectlombok:lombok:' + project.dependencyLombok - annotationProcessor 'org.projectlombok:lombok:' + project.dependencyLombok + compileOnly("org.projectlombok:lombok:${dependencyLombok}") + annotationProcessor("org.projectlombok:lombok:${dependencyLombok}") // JetBrains Annotations - compileOnly 'org.jetbrains:annotations:' + project.dependencyJetbrainsAnnotations + compileOnly("org.jetbrains:annotations:${dependencyJetbrainsAnnotations}") // LWJGL - implementation platform("org.lwjgl:lwjgl-bom:${dependencyLwjgl}") - implementation "org.lwjgl:lwjgl" - implementation "org.lwjgl:lwjgl-bgfx" - implementation "org.lwjgl:lwjgl-egl" - implementation "org.lwjgl:lwjgl-glfw" - implementation "org.lwjgl:lwjgl-ktx" - implementation "org.lwjgl:lwjgl-shaderc" - implementation "org.lwjgl:lwjgl-sse" - implementation "org.lwjgl:lwjgl-vma" - implementation "org.lwjgl:lwjgl-vulkan" - runtimeOnly "org.lwjgl:lwjgl::${dependencyLwjglNatives}" - runtimeOnly "org.lwjgl:lwjgl-bgfx::${dependencyLwjglNatives}" - runtimeOnly "org.lwjgl:lwjgl-glfw::${dependencyLwjglNatives}" - runtimeOnly "org.lwjgl:lwjgl-ktx::${dependencyLwjglNatives}" - runtimeOnly "org.lwjgl:lwjgl-shaderc::${dependencyLwjglNatives}" - runtimeOnly "org.lwjgl:lwjgl-sse::${dependencyLwjglNatives}" - runtimeOnly "org.lwjgl:lwjgl-vma::${dependencyLwjglNatives}" - if (project.dependencyLwjglNatives == "natives-macos" || project.dependencyLwjglNatives == "natives-macos-arm64") runtimeOnly "org.lwjgl:lwjgl-vulkan::${dependencyLwjglNatives}" + implementation(platform("org.lwjgl:lwjgl-bom:${dependencyLwjgl}")) + implementation("org.lwjgl:lwjgl") + implementation("org.lwjgl:lwjgl-bgfx") + implementation("org.lwjgl:lwjgl-egl") + implementation("org.lwjgl:lwjgl-glfw") + implementation("org.lwjgl:lwjgl-ktx") + implementation("org.lwjgl:lwjgl-shaderc") + implementation("org.lwjgl:lwjgl-sse") + implementation("org.lwjgl:lwjgl-vma") + implementation("org.lwjgl:lwjgl-vulkan") + runtimeOnly("org.lwjgl:lwjgl::${dependencyLwjglNatives}") + runtimeOnly("org.lwjgl:lwjgl-bgfx::${dependencyLwjglNatives}") + runtimeOnly("org.lwjgl:lwjgl-glfw::${dependencyLwjglNatives}") + runtimeOnly("org.lwjgl:lwjgl-ktx::${dependencyLwjglNatives}") + runtimeOnly("org.lwjgl:lwjgl-shaderc::${dependencyLwjglNatives}") + runtimeOnly("org.lwjgl:lwjgl-sse::${dependencyLwjglNatives}") + runtimeOnly("org.lwjgl:lwjgl-vma::${dependencyLwjglNatives}") + if (project.dependencyLwjglNatives == "natives-macos" || project.dependencyLwjglNatives == "natives-macos-arm64") runtimeOnly("org.lwjgl:lwjgl-vulkan::${dependencyLwjglNatives}") // -> Testing <- // Jetbrains Annotations - testCompileOnly 'org.jetbrains:annotations:' + project.dependencyJetbrainsAnnotations + testCompileOnly("org.jetbrains:annotations:${dependencyJetbrainsAnnotations}") // JUnit - testImplementation platform('org.junit:junit-bom:5.' + project.dependencyJunit) - testImplementation 'org.junit.jupiter:junit-jupiter' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + testImplementation(platform("org.junit:junit-bom:${dependencyJunit}")) + testImplementation("org.junit.jupiter:junit-jupiter") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") // jOOR - testImplementation 'org.jooq:joor:' + project.dependencyJoor + testImplementation("org.jooq:joor:${dependencyJoor}") // -> Project <- - implementation project(":base") - implementation project(":graphics") - implementation 'org.fusesource.jansi:jansi:' + project.dependencyJansi // for some reason required or the build fails don't ask me why + implementation(project(":base")) + implementation(project(":graphics")) + implementation("org.fusesource.jansi:jansi:${dependencyJansi}") // for some reason required or the build fails don"t ask me why } javadoc.options { @@ -108,6 +108,6 @@ javadoc.options { test { useJUnitPlatform() testLogging { - events "passed", "skipped", "failed" + events("passed", "skipped", "failed") } } diff --git a/slf4j-compat/build.gradle b/slf4j-compat/build.gradle index 47886750..c4bc3e3b 100644 --- a/slf4j-compat/build.gradle +++ b/slf4j-compat/build.gradle @@ -18,26 +18,26 @@ */ plugins { - id 'java' - id 'io.freefair.lombok' version "${pluginLombok}" - id 'maven-publish' + id("java") + id("io.freefair.lombok") version("${pluginLombok}") + id("maven-publish") } dependencies { // -> Runtime <- // Lombok - compileOnly 'org.projectlombok:lombok:' + project.dependencyLombok - annotationProcessor 'org.projectlombok:lombok:' + project.dependencyLombok + compileOnly("org.projectlombok:lombok:${dependencyLombok}") + annotationProcessor("org.projectlombok:lombok:${dependencyLombok}") // JetBrains Annotations - compileOnly 'org.jetbrains:annotations:' + project.dependencyJetbrainsAnnotations + compileOnly("org.jetbrains:annotations:${dependencyJetbrainsAnnotations}") // SLF4J - implementation 'org.slf4j:slf4j-api:' + project.dependencySlf4j + implementation("org.slf4j:slf4j-api:${dependencySlf4j}") // -> Project <- - implementation project(":base") - implementation 'org.fusesource.jansi:jansi:' + project.dependencyJansi // for some reason required or the build fails don't ask me why + implementation(project(":base")) + implementation("org.fusesource.jansi:jansi:${dependencyJansi}") // for some reason required or the build fails don"t ask me why } javadoc.options { @@ -53,7 +53,7 @@ javadoc.options { test { useJUnitPlatform() testLogging { - events "passed", "skipped", "failed" + events("passed", "skipped", "failed") } } diff --git a/testapp/build.gradle b/testapp/build.gradle index d0f94ae3..d00d4321 100644 --- a/testapp/build.gradle +++ b/testapp/build.gradle @@ -18,28 +18,28 @@ */ plugins { - id 'java' - id 'application' - id 'io.freefair.lombok' version "${pluginLombok}" - id 'io.github.goooler.shadow' version "${pluginShadow}" + id("java") + id "application" + id("io.freefair.lombok") version("${pluginLombok}") + id("io.github.goooler.shadow") version("${pluginShadow}") } dependencies { // -> Runtime <- // Lombok - compileOnly 'org.projectlombok:lombok:' + project.dependencyLombok - annotationProcessor 'org.projectlombok:lombok:' + project.dependencyLombok + compileOnly("org.projectlombok:lombok:${dependencyLombok}") + annotationProcessor("org.projectlombok:lombok:${dependencyLombok}") // JetBrains Annotations - compileOnly 'org.jetbrains:annotations:' + project.dependencyJetbrainsAnnotations + compileOnly("org.jetbrains:annotations:${dependencyJetbrainsAnnotations}") // -> Project <- - implementation project(":base") - implementation project(":slf4j-compat") - implementation project(":graphics") + implementation(project(":base")) + implementation(project(":slf4j-compat")) + implementation(project(":graphics")) implementation project(":graphics:vulkan") implementation project(":graphics:opengl") - implementation 'org.fusesource.jansi:jansi:' + project.dependencyJansi // for some reason required or the build fails don't ask me why + implementation("org.fusesource.jansi:jansi:${dependencyJansi}") // for some reason required or the build fails don"t ask me why } javadoc.options { @@ -55,7 +55,7 @@ javadoc.options { jar { manifest { attributes( - 'Main-Class': 'de.staropensource.sosengine.testapp.Main' + "Main-Class": "de.staropensource.sosengine.testapp.Main" ) } }