diff --git a/build.gradle b/build.gradle index e75beef..9927778 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ buildscript { repositories { - maven { url "https://repo.grails.org/grails/core" } + maven { url = 'https://repo.grails.org/grails/core' } } dependencies { classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" } } -version projectVersion -group "org.grails.plugins" +version = projectVersion +group = 'org.grails.plugins' apply plugin: 'java-library' apply plugin: 'java-test-fixtures' @@ -23,7 +23,7 @@ java { } repositories { - maven { url "https://repo.grails.org/grails/core" } + maven { url = 'https://repo.grails.org/grails/core' } } configurations { @@ -31,19 +31,22 @@ configurations { } dependencies { - compileOnly "org.grails:grails-core:$grailsVersion" // Provided as this is a Grails plugin + + implementation(platform("org.grails:grails-bom:$grailsVersion")) + + compileOnly 'org.grails:grails-core' // Provided as this is a Grails plugin testFixturesCompileOnly "jakarta.servlet:jakarta.servlet-api:$servletApiVersion" testFixturesApi "org.gebish:geb-spock:$gebSpock" - testFixturesApi "org.grails:grails-testing-support:$testingSupportVersion" - testFixturesApi "org.grails:grails-datastore-gorm:$datastoreVersion" + testFixturesApi "org.grails:grails-testing-support" + testFixturesApi "org.grails:grails-datastore-gorm" testFixturesApi "org.testcontainers:selenium:$testcontainersVersion" testFixturesApi "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion" testFixturesApi "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion" - documentation "org.apache.groovy:groovy:$groovyVersion" - documentation "org.apache.groovy:groovy-ant:$groovyVersion" - documentation "org.apache.groovy:groovy-templates:$groovyVersion" + documentation "org.apache.groovy:groovy" + documentation "org.apache.groovy:groovy-ant" + documentation "org.apache.groovy:groovy-templates" documentation "com.github.javaparser:javaparser-core:$javaParserCoreVersion" } @@ -53,8 +56,8 @@ grailsPublish { license { name = 'Apache-2.0' } - title = "Grails Geb Plugin" - desc = "Provides Integration with Geb for Functional Testing" + title = 'Grails Geb Plugin' + desc = 'Provides Integration with Geb for Functional Testing' developers = [ graemerocher: 'Graeme Rocher', puneetbehl: 'Puneet Behl', @@ -69,10 +72,6 @@ tasks.withType(Groovydoc).configureEach { classpath = configurations.documentation } -tasks.withType(GroovyCompile).configureEach { - groovyOptions.forkOptions.jvmArgs = ['-Xmx1024m'] -} - tasks.withType(Test).configureEach { useJUnitPlatform() testLogging { @@ -84,6 +83,7 @@ tasks.withType(Test).configureEach { } } -tasks.named('bootJar').configure { enabled = false } -tasks.named('bootRun').configure { enabled = false } -tasks.named('bootTestRun').configure { enabled = false } \ No newline at end of file +tasks.named('bootJar') { enabled = false } +tasks.named('bootRun') { enabled = false } +tasks.named('bootTestRun') { enabled = false } +tasks.named('findMainClass') { enabled = false } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 6789e47..53894c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,16 +2,13 @@ projectVersion=5.0.0-SNAPSHOT title=Grails Geb Plugin developers=Puneet Behl -datastoreVersion=9.0.0-SNAPSHOT gebSpock=7.0 grailsVersion=7.0.0-SNAPSHOT grailsGradlePluginVersion=7.0.0-SNAPSHOT -groovyVersion=4.0.23 javaParserCoreVersion=3.26.2 seleniumVersion=4.25.0 servletApiVersion=6.0.0 testcontainersVersion=1.20.2 -testingSupportVersion=4.0.0-SNAPSHOT # This prevents the Grails Gradle Plugin from unnecessarily excluding slf4j-simple in the generated POMs # https://github.com/grails/grails-gradle-plugin/issues/222