Skip to content
This repository was archived by the owner on Mar 10, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 21 additions & 20 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
buildscript {
repositories {
mavenLocal()
mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
maven { url "https://repo.grails.org/grails/core" }
}
dependencies {
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
classpath 'io.github.groovylang.groovydoc:groovydoc-gradle-plugin:1.0.1'
classpath "io.github.gradle-nexus:publish-plugin:1.1.0"
}
Expand Down Expand Up @@ -33,26 +33,23 @@ repositories {
}

dependencies {
provided 'org.springframework.boot:spring-boot-starter-logging'
provided "org.springframework.boot:spring-boot-starter-actuator"
provided "org.springframework.boot:spring-boot-autoconfigure"
provided "org.springframework.boot:spring-boot-starter-tomcat"
compileOnly 'org.springframework.boot:spring-boot-starter-logging'
compileOnly "org.springframework.boot:spring-boot-starter-actuator"
compileOnly "org.springframework.boot:spring-boot-autoconfigure"
compileOnly "org.springframework.boot:spring-boot-starter-tomcat"

provided "org.grails:grails-web-boot"
provided "org.grails:grails-dependencies"
provided "javax.servlet:javax.servlet-api:$servletApiVersion"
compileOnly "org.grails:grails-web-boot"
compileOnly "org.grails:grails-dependencies"

compile "org.grails:scaffolding-core"
implementation "org.grails:scaffolding-core"

testCompile "org.grails:grails-web-testing-support"
testCompile "org.grails:grails-gorm-testing-support"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.grails:grails-gorm-testing-support"

console "org.grails:grails-console"

testCompile 'org.javassist:javassist:3.29.0-GA'
testCompile "org.codehaus.groovy:groovy-dateutil"
testCompile "cglib:cglib-nodep:2.2.2"
testCompile("org.jodd:jodd-wot:$joddWotVersion") {
testImplementation 'org.javassist:javassist:3.29.0-GA'
testImplementation "org.codehaus.groovy:groovy-dateutil"
testImplementation "cglib:cglib-nodep:2.2.2"
testImplementation("org.jodd:jodd-wot:$joddWotVersion") {
exclude module: 'slf4j-api'
exclude module: 'asm'
}
Expand All @@ -64,6 +61,10 @@ tasks.withType(GroovyCompile) {
}
}

tasks.withType(Test) {
useJUnitPlatform()
}

publishing {
publications {
maven(MavenPublication) {
Expand Down Expand Up @@ -182,14 +183,14 @@ asciidoctor {
outputDir = "${buildDir}/asciidoc"
}

task apiDocs(type: Copy) {
tasks.register('apiDocs', Copy) {
from groovydoc.outputs.files
into file("${buildDir}/asciidoc/api")
}

asciidoctor.dependsOn(apiDocs)

task snapshotVersion {
tasks.register('snapshotVersion') {
doLast {
if (isReleaseVersion) {
ant.propertyfile(file: "gradle.properties") {
Expand Down
6 changes: 2 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#Tue, 02 Jan 2024 08:12:44 +0000
version=4.0.1-SNAPSHOT
grailsVersion=4.1.3
scaffoldingVersion=2.0.0.RC1
cglibNodepVersion=3.2.9
grailsVersion=5.3.5
grailsGradlePluginVersion=5.3.1
joddWotVersion=3.3.8
servletApiVersion=4.0.1
asciidoc=true
githubSlug=gpc/fields
githubBranch=master
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Tue Nov 27 07:46:21 CET 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
53 changes: 33 additions & 20 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 24 additions & 19 deletions gradlew.bat
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion src/docs/asciidoc/changelog.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
== Changelog

=== Version 5.0.0 - Grails 5.3.x

In your `build.gradle` file, use:

[source,groovy]
----
implementation 'io.github.gpc:fields:5.0.0'
----

Changelog:
https://github.com/gpc/fields/compare/v4.0.0\...v5.0.0

=== Version 4.0.0 - Grails 4.1.x

**Important**
Expand All @@ -9,7 +21,7 @@ New `group` id.

In your `build.gradle` file, use:

[source,groovy,subs="attributes"]
[source,groovy]
----
compile 'io.github.gpc:fields:4.0.0'
----
Expand Down
2 changes: 1 addition & 1 deletion src/docs/asciidoc/installation.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ The plugin is available on Maven Central and should be a dependency like this:
[source,groovy,subs="attributes"]
----
dependencies {
compile 'io.github.gpc:fields:{version}'
implementation 'io.github.gpc:fields:{version}'
}
----
Loading