From 169ebef4040c716bac0a2adf39bb3ac2760026e7 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Wed, 15 May 2024 21:53:11 +0800 Subject: [PATCH 01/19] Bump version to 0.4.0-SNAPSHOT --- gradle.properties | 2 +- .../graceframework/plugins/stimulus/StimulusGrailsPlugin.groovy | 2 +- .../org/graceframework/plugins/turbo/TurboGrailsPlugin.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8a390e4..fbeeb95 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=0.3.0-SNAPSHOT +projectVersion=0.4.0-SNAPSHOT graceVersion=2022.2.4 groovyVersion=3.0.17 org.gradle.daemon=true diff --git a/plugins/stimulus/src/main/groovy/org/graceframework/plugins/stimulus/StimulusGrailsPlugin.groovy b/plugins/stimulus/src/main/groovy/org/graceframework/plugins/stimulus/StimulusGrailsPlugin.groovy index c3530fd..5eaf31f 100644 --- a/plugins/stimulus/src/main/groovy/org/graceframework/plugins/stimulus/StimulusGrailsPlugin.groovy +++ b/plugins/stimulus/src/main/groovy/org/graceframework/plugins/stimulus/StimulusGrailsPlugin.groovy @@ -19,7 +19,7 @@ import grails.plugins.* class StimulusGrailsPlugin extends Plugin { - def version = '0.3.0-SNAPSHOT' + def version = '0.4.0-SNAPSHOT' // the version or versions of Grails the plugin is designed for def grailsVersion = "3.0.0 > *" // resources that are excluded from plugin packaging diff --git a/plugins/turbo/src/main/groovy/org/graceframework/plugins/turbo/TurboGrailsPlugin.groovy b/plugins/turbo/src/main/groovy/org/graceframework/plugins/turbo/TurboGrailsPlugin.groovy index 9f02a8b..ef463e0 100644 --- a/plugins/turbo/src/main/groovy/org/graceframework/plugins/turbo/TurboGrailsPlugin.groovy +++ b/plugins/turbo/src/main/groovy/org/graceframework/plugins/turbo/TurboGrailsPlugin.groovy @@ -19,7 +19,7 @@ import grails.plugins.* class TurboGrailsPlugin extends Plugin { - def version = '0.3.0-SNAPSHOT' + def version = '0.4.0-SNAPSHOT' // the version or versions of Grails the plugin is designed for def grailsVersion = "3.0.0 > *" // resources that are excluded from plugin packaging From febd813968319ba525c0a1b903a96520e8245111 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Wed, 15 May 2024 21:53:39 +0800 Subject: [PATCH 02/19] Fixed wrong links --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7bffdff..e7455ec 100644 --- a/README.md +++ b/README.md @@ -142,8 +142,8 @@ This plugin is available as open source under the terms of the [APACHE LICENSE, - [Grace Framework](https://github.com/graceframework/grace-framework) - [Grace Plugins](https://github.com/grace-plugins) -- [Grace Hotwire Plugin](https://github.com/grace-plugins/grace-hotewire) -- [Grace Stimulus Gudie](https://github.com/grace-guides/gs-stimuls) +- [Grace Hotwire Plugin](https://github.com/grace-plugins/grace-hotwire) +- [Grace Stimulus Gudie](https://github.com/grace-guides/gs-stimulus) - [Grace Turbo Guide](https://github.com/grace-guides/gs-turbo) - [Hotwire Turbo](https://turbo.hotwired.dev) - [Hotwire Stimulus](https://stimulus.hotwired.dev) From 74a94c54f61baae6aea6c142e1caa6c5b7ff0e46 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sat, 8 Jun 2024 01:53:51 +0800 Subject: [PATCH 03/19] Upgrade to Grace 2022.2.5 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fbeeb95..f05038e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ projectVersion=0.4.0-SNAPSHOT -graceVersion=2022.2.4 +graceVersion=2022.2.5 groovyVersion=3.0.17 org.gradle.daemon=true org.gradle.parallel=false From 3eba34116e57737a13bf31fdac18c4698062b6cb Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sat, 8 Jun 2024 01:54:10 +0800 Subject: [PATCH 04/19] Upgrade to Groovy 3.0.18 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f05038e..4d68fb9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ projectVersion=0.4.0-SNAPSHOT graceVersion=2022.2.5 -groovyVersion=3.0.17 +groovyVersion=3.0.18 org.gradle.daemon=true org.gradle.parallel=false org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M From 9795674180f1858cf6c6bd3a04226d1ddba73d6a Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Sat, 8 Jun 2024 02:08:56 +0800 Subject: [PATCH 05/19] Use Grace Asset Pipeline Plugin 5.2.6 snapshots --- build.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 8adf924..d6d7a1a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ buildscript { repositories { mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } maven { url "https://repo.gradle.org/gradle/libs-releases" } maven { url "https://plugins.gradle.org/m2/" } } @@ -8,7 +9,7 @@ buildscript { classpath "io.github.gradle-nexus:publish-plugin:1.3.0" classpath "org.graceframework:grace-gradle-plugin:$graceVersion" classpath "com.github.erdi:webdriver-binaries-gradle-plugin:3.2" - classpath "org.graceframework.plugins:asset-pipeline-gradle:5.2.5" + classpath "org.graceframework.plugins:asset-pipeline-gradle:5.2.6-SNAPSHOT" } } @@ -26,6 +27,7 @@ apply plugin: "org.graceframework.grace-gsp" repositories { mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } } configurations { @@ -76,7 +78,7 @@ dependencies { runtimeOnly "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" runtimeOnly "jakarta.el:jakarta.el-api:3.0.3" runtimeOnly "org.glassfish:jakarta.el:3.0.4" - runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin:5.2.5" + runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin:5.2.6-SNAPSHOT" testImplementation "io.micronaut:micronaut-inject-groovy" testImplementation "org.graceframework:grace-test-support" testImplementation "org.mockito:mockito-core" From 0452562b05d0644695996d123eff93c6456bf353 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Fri, 21 Jun 2024 00:44:20 +0800 Subject: [PATCH 06/19] Update github workflows Upgrade Gradle Actions --- .github/workflows/gradle.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d7a8c76..0c4ca8e 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -31,7 +31,7 @@ jobs: java-version: ${{ matrix.java }} - name: Run Build id: build - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 with: arguments: build -x test publish: @@ -59,7 +59,7 @@ jobs: run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg - name: Publish to Sonatype OSSRH id: publish - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 555e4d6..ec7faad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,7 @@ jobs: uses: actions/checkout@v4 with: token: ${{ secrets.GITHUB_TOKEN }} - - uses: gradle/wrapper-validation-action@v2 + - uses: gradle/actions/wrapper-validation@v3 - name: Set up JDK uses: actions/setup-java@v4 with: @@ -60,7 +60,7 @@ jobs: - name: Publish to Sonatype OSSRH id: publish if: steps.secring.outcome == 'success' - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} From 520ee416d71c6df077b1e0ea353285d8146aec46 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Fri, 21 Jun 2024 00:44:58 +0800 Subject: [PATCH 07/19] Upgrade to Grace 2022.2.6 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4d68fb9..22a145c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ projectVersion=0.4.0-SNAPSHOT -graceVersion=2022.2.5 +graceVersion=2022.2.6 groovyVersion=3.0.18 org.gradle.daemon=true org.gradle.parallel=false From 84486afc5c03c5013a62a3221997a57204f44eed Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Fri, 21 Jun 2024 00:45:10 +0800 Subject: [PATCH 08/19] Upgrade to Groovy 3.0.21 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 22a145c..9fc565f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ projectVersion=0.4.0-SNAPSHOT graceVersion=2022.2.6 -groovyVersion=3.0.18 +groovyVersion=3.0.21 org.gradle.daemon=true org.gradle.parallel=false org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M From 9e6c6b1e0a2cbed9dfbdc17446e7165acb8d6967 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Fri, 21 Jun 2024 00:45:34 +0800 Subject: [PATCH 09/19] Upgrade to Grace Asset Pipeline Plugin 5.2.6 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d6d7a1a..3675139 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { classpath "io.github.gradle-nexus:publish-plugin:1.3.0" classpath "org.graceframework:grace-gradle-plugin:$graceVersion" classpath "com.github.erdi:webdriver-binaries-gradle-plugin:3.2" - classpath "org.graceframework.plugins:asset-pipeline-gradle:5.2.6-SNAPSHOT" + classpath "org.graceframework.plugins:asset-pipeline-gradle:5.2.6" } } @@ -78,7 +78,7 @@ dependencies { runtimeOnly "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" runtimeOnly "jakarta.el:jakarta.el-api:3.0.3" runtimeOnly "org.glassfish:jakarta.el:3.0.4" - runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin:5.2.6-SNAPSHOT" + runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin:5.2.6" testImplementation "io.micronaut:micronaut-inject-groovy" testImplementation "org.graceframework:grace-test-support" testImplementation "org.mockito:mockito-core" From d44ff52537e35efc6ef604f765a1de455e477236 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Fri, 21 Jun 2024 00:46:44 +0800 Subject: [PATCH 10/19] Set `archiveClassifier` with 'plugin' --- plugins/stimulus/build.gradle | 2 +- plugins/turbo/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/stimulus/build.gradle b/plugins/stimulus/build.gradle index 8ce59dd..db4c42e 100644 --- a/plugins/stimulus/build.gradle +++ b/plugins/stimulus/build.gradle @@ -66,7 +66,7 @@ jar { "Implementation-Version": projectVersion, "Implementation-Vendor": 'Grace Plugins') enabled = true - archiveClassifier.set('') + archiveClassifier.set('plugin') includeEmptyDirs = false } diff --git a/plugins/turbo/build.gradle b/plugins/turbo/build.gradle index abe1404..b9302f7 100644 --- a/plugins/turbo/build.gradle +++ b/plugins/turbo/build.gradle @@ -70,7 +70,7 @@ jar { "Implementation-Version": projectVersion, "Implementation-Vendor": 'Grace Plugins') enabled = true - archiveClassifier.set('') + archiveClassifier.set('plugin') includeEmptyDirs = false } From 9064613b88b65cc17d26975761af20eb140e4155 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Fri, 21 Jun 2024 00:47:32 +0800 Subject: [PATCH 11/19] Add artifact `grails-plugin.xml` --- plugins/stimulus/build.gradle | 3 +++ plugins/turbo/build.gradle | 3 +++ 2 files changed, 6 insertions(+) diff --git a/plugins/stimulus/build.gradle b/plugins/stimulus/build.gradle index db4c42e..f1a01dd 100644 --- a/plugins/stimulus/build.gradle +++ b/plugins/stimulus/build.gradle @@ -100,6 +100,9 @@ publishing { from components.java + artifact source: "${project.sourceSets.main.groovy.outputDir}/META-INF/grails-plugin.xml", + classifier: "plugin", + extension: 'xml' pom { name = "Grace Stimulus Plugin" description = "Grace Plugin for using Stimulus with Grace." diff --git a/plugins/turbo/build.gradle b/plugins/turbo/build.gradle index b9302f7..fac1103 100644 --- a/plugins/turbo/build.gradle +++ b/plugins/turbo/build.gradle @@ -104,6 +104,9 @@ publishing { from components.java + artifact source: "${project.sourceSets.main.groovy.outputDir}/META-INF/grails-plugin.xml", + classifier: "plugin", + extension: 'xml' pom { name = "Grace Turbo Plugin" description = "Grace Plugin for using Turbo with Grace." From 0e8d209194a6395e6b39a2796d8d7b982f4d8f67 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Tue, 27 May 2025 00:58:43 +0800 Subject: [PATCH 12/19] Upgrade to Gradle 7.6.4 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b1624c4..c7d437b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From a34a21f608eb6b50102616787b391e0f3207eca7 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Tue, 27 May 2025 01:05:39 +0800 Subject: [PATCH 13/19] Upgrade to Grace 2022.2.8 --- build.gradle | 20 ++++++++------------ gradle.properties | 4 ++-- plugins/stimulus/build.gradle | 18 ++++++------------ plugins/stimulus/gradle.properties | 2 -- plugins/turbo/build.gradle | 23 ++++++++--------------- plugins/turbo/gradle.properties | 2 -- 6 files changed, 24 insertions(+), 45 deletions(-) diff --git a/build.gradle b/build.gradle index 3675139..0c0f363 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,8 @@ buildscript { classpath "io.github.gradle-nexus:publish-plugin:1.3.0" classpath "org.graceframework:grace-gradle-plugin:$graceVersion" classpath "com.github.erdi:webdriver-binaries-gradle-plugin:3.2" - classpath "org.graceframework.plugins:asset-pipeline-gradle:5.2.6" + classpath "org.graceframework.plugins:asset-pipeline-gradle:5.2.7" + classpath "org.graceframework.plugins:database-migration:5.2.7" } } @@ -43,7 +44,6 @@ grails { dependencies { developmentOnly('org.springframework.boot:spring-boot-devtools') - compileOnly "io.micronaut:micronaut-inject-groovy" console "org.graceframework:grace-console" implementation "org.springframework.boot:spring-boot-starter-logging" implementation "org.springframework.boot:spring-boot-starter-validation" @@ -58,6 +58,7 @@ dependencies { implementation "org.graceframework:grace-plugin-databinding" implementation "org.graceframework:grace-plugin-datasource" implementation "org.graceframework:grace-plugin-domain-class" + implementation "org.graceframework:grace-plugin-gsp" implementation "org.graceframework:grace-plugin-i18n" implementation "org.graceframework:grace-plugin-interceptors" implementation "org.graceframework:grace-plugin-management" @@ -67,19 +68,14 @@ dependencies { implementation "org.graceframework.plugins:cache" implementation "org.graceframework.plugins:async" implementation "org.graceframework.plugins:scaffolding" - implementation "org.graceframework.plugins:fields" implementation "org.graceframework.plugins:events" + implementation "org.graceframework.plugins:fields" + implementation "org.graceframework.plugins:database-migration" implementation "org.graceframework.plugins:hibernate5" - implementation "org.hibernate:hibernate-core:5.6.15.Final" - implementation "org.graceframework:grace-plugin-gsp" profile "org.graceframework.profiles:web" + runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin:5.2.7" runtimeOnly "com.h2database:h2" runtimeOnly "org.apache.tomcat:tomcat-jdbc" - runtimeOnly "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" - runtimeOnly "jakarta.el:jakarta.el-api:3.0.3" - runtimeOnly "org.glassfish:jakarta.el:3.0.4" - runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin:5.2.6" - testImplementation "io.micronaut:micronaut-inject-groovy" testImplementation "org.graceframework:grace-test-support" testImplementation "org.mockito:mockito-core" testImplementation "org.graceframework.plugins:geb" @@ -134,8 +130,8 @@ tasks.withType(Test) { } assets { - minifyJs = false - minifyCss = false + minifyJs = true + minifyCss = true enableDigests = false enableGzip = false enableSourceMaps = false diff --git a/gradle.properties b/gradle.properties index 9fc565f..9b788e1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ projectVersion=0.4.0-SNAPSHOT -graceVersion=2022.2.6 -groovyVersion=3.0.21 +graceVersion=2022.2.8 +groovyVersion=3.0.22 org.gradle.daemon=true org.gradle.parallel=false org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M diff --git a/plugins/stimulus/build.gradle b/plugins/stimulus/build.gradle index f1a01dd..a01f091 100644 --- a/plugins/stimulus/build.gradle +++ b/plugins/stimulus/build.gradle @@ -9,11 +9,6 @@ ext."signing.password" = project.hasProperty("signing.password") ? project.getPr ext."signing.secretKeyRingFile" = project.hasProperty("signing.secretKeyRingFile") ? project.getProperty('signing.secretKeyRingFile') : ("${System.properties['user.home']}${File.separator}.gnupg${File.separator}secring.gpg") ext.isReleaseVersion = !projectVersion.endsWith("SNAPSHOT") -ext { - springBootVersion = '2.6.6' - servletVersion = '4.0.1' -} - version projectVersion group "org.graceframework.plugins" @@ -30,10 +25,10 @@ repositories { } dependencies { - compileOnly "org.springframework.boot:spring-boot-autoconfigure:$springBootVersion" - compileOnly "javax.servlet:javax.servlet-api:$servletVersion" - compileOnly "org.graceframework:grace-core:$graceVersion" - compileOnly "org.graceframework:grace-web-common:$graceVersion" + compileOnly "org.springframework.boot:spring-boot-autoconfigure" + compileOnly "javax.servlet:javax.servlet-api" + compileOnly "org.graceframework:grace-core" + compileOnly "org.graceframework:grace-web-common" } tasks.withType(Sign) { @@ -51,14 +46,13 @@ tasks.withType(Test) { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 withJavadocJar() withSourcesJar() } jar { - duplicatesStrategy = DuplicatesStrategy.INCLUDE manifest.mainAttributes( "Built-By": System.properties['user.name'], "Created-By": System.properties['java.vm.version'] + " (" + System.properties['java.vm.vendor'] + ")", diff --git a/plugins/stimulus/gradle.properties b/plugins/stimulus/gradle.properties index af53cab..da7fd24 100644 --- a/plugins/stimulus/gradle.properties +++ b/plugins/stimulus/gradle.properties @@ -1,4 +1,2 @@ projectName=stimulus -graceVersion=2020.0.0 -groovyVersion=3.0.11 exploded=true \ No newline at end of file diff --git a/plugins/turbo/build.gradle b/plugins/turbo/build.gradle index fac1103..c2c19ee 100644 --- a/plugins/turbo/build.gradle +++ b/plugins/turbo/build.gradle @@ -9,12 +9,6 @@ ext."signing.password" = project.hasProperty("signing.password") ? project.getPr ext."signing.secretKeyRingFile" = project.hasProperty("signing.secretKeyRingFile") ? project.getProperty('signing.secretKeyRingFile') : ("${System.properties['user.home']}${File.separator}.gnupg${File.separator}secring.gpg") ext.isReleaseVersion = !projectVersion.endsWith("SNAPSHOT") -ext { - grailsVersion = '5.1.0' - springBootVersion = '2.6.6' - servletVersion = '4.0.1' -} - version projectVersion group "org.graceframework.plugins" @@ -32,12 +26,12 @@ repositories { } dependencies { - compileOnly "org.springframework.boot:spring-boot-autoconfigure:$springBootVersion" - compileOnly "javax.servlet:javax.servlet-api:$servletVersion" - compileOnly "org.graceframework:grace-core:$graceVersion" - compileOnly "org.grails:grails-web-common:$grailsVersion" - compileOnly "org.grails:grails-web-gsp:$grailsVersion" - compileOnly "org.grails:grails-web-sitemesh:$grailsVersion" + compileOnly "org.springframework.boot:spring-boot-autoconfigure" + compileOnly "javax.servlet:javax.servlet-api" + compileOnly "org.graceframework:grace-core" + compileOnly "org.graceframework:grace-web-common" + compileOnly "org.graceframework:grace-web-gsp" + compileOnly "org.graceframework:grace-web-sitemesh" } tasks.withType(Sign) { @@ -55,14 +49,13 @@ tasks.withType(Test) { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 withJavadocJar() withSourcesJar() } jar { - duplicatesStrategy = DuplicatesStrategy.INCLUDE manifest.mainAttributes( "Built-By": System.properties['user.name'], "Created-By": System.properties['java.vm.version'] + " (" + System.properties['java.vm.vendor'] + ")", diff --git a/plugins/turbo/gradle.properties b/plugins/turbo/gradle.properties index 0fab174..e754d78 100644 --- a/plugins/turbo/gradle.properties +++ b/plugins/turbo/gradle.properties @@ -1,4 +1,2 @@ projectName=turbo -graceVersion=2020.0.0 -groovyVersion=3.0.11 exploded=true \ No newline at end of file From 96b331373931d99690769c54dc0079b779c119ec Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Tue, 27 May 2025 01:06:58 +0800 Subject: [PATCH 14/19] Remove grails-plugin.xml in favor of the generated plugin meta file --- plugins/stimulus/src/main/resources/META-INF/grails-plugin.xml | 3 --- plugins/turbo/src/main/resources/META-INF/grails-plugin.xml | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 plugins/stimulus/src/main/resources/META-INF/grails-plugin.xml delete mode 100644 plugins/turbo/src/main/resources/META-INF/grails-plugin.xml diff --git a/plugins/stimulus/src/main/resources/META-INF/grails-plugin.xml b/plugins/stimulus/src/main/resources/META-INF/grails-plugin.xml deleted file mode 100644 index 377ac1b..0000000 --- a/plugins/stimulus/src/main/resources/META-INF/grails-plugin.xml +++ /dev/null @@ -1,3 +0,0 @@ - - org.graceframework.plugins.stimulus.StimulusGrailsPlugin - \ No newline at end of file diff --git a/plugins/turbo/src/main/resources/META-INF/grails-plugin.xml b/plugins/turbo/src/main/resources/META-INF/grails-plugin.xml deleted file mode 100644 index e6ad260..0000000 --- a/plugins/turbo/src/main/resources/META-INF/grails-plugin.xml +++ /dev/null @@ -1,3 +0,0 @@ - - org.graceframework.plugins.turbo.TurboGrailsPlugin - \ No newline at end of file From 7b1c6ab105adce059da8859c2a3b5453751573f1 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Tue, 27 May 2025 01:08:27 +0800 Subject: [PATCH 15/19] Drop support Grails <5, only support Grails 5+ and Grace 2022.0+ --- .../graceframework/plugins/stimulus/StimulusGrailsPlugin.groovy | 2 +- .../org/graceframework/plugins/turbo/TurboGrailsPlugin.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/stimulus/src/main/groovy/org/graceframework/plugins/stimulus/StimulusGrailsPlugin.groovy b/plugins/stimulus/src/main/groovy/org/graceframework/plugins/stimulus/StimulusGrailsPlugin.groovy index 5eaf31f..ff3aa8e 100644 --- a/plugins/stimulus/src/main/groovy/org/graceframework/plugins/stimulus/StimulusGrailsPlugin.groovy +++ b/plugins/stimulus/src/main/groovy/org/graceframework/plugins/stimulus/StimulusGrailsPlugin.groovy @@ -21,7 +21,7 @@ class StimulusGrailsPlugin extends Plugin { def version = '0.4.0-SNAPSHOT' // the version or versions of Grails the plugin is designed for - def grailsVersion = "3.0.0 > *" + def grailsVersion = "5.0.0 > *" // resources that are excluded from plugin packaging def pluginExcludes = [ "grails-app/views/error.gsp" diff --git a/plugins/turbo/src/main/groovy/org/graceframework/plugins/turbo/TurboGrailsPlugin.groovy b/plugins/turbo/src/main/groovy/org/graceframework/plugins/turbo/TurboGrailsPlugin.groovy index ef463e0..c90089a 100644 --- a/plugins/turbo/src/main/groovy/org/graceframework/plugins/turbo/TurboGrailsPlugin.groovy +++ b/plugins/turbo/src/main/groovy/org/graceframework/plugins/turbo/TurboGrailsPlugin.groovy @@ -21,7 +21,7 @@ class TurboGrailsPlugin extends Plugin { def version = '0.4.0-SNAPSHOT' // the version or versions of Grails the plugin is designed for - def grailsVersion = "3.0.0 > *" + def grailsVersion = "5.0.0 > *" // resources that are excluded from plugin packaging def pluginExcludes = [ "grails-app/views/error.gsp" From 2a7f0a762d28424560072a0d6fddc18383657278 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Tue, 27 May 2025 01:22:09 +0800 Subject: [PATCH 16/19] Don't minify CSS and JavaScript --- build.gradle | 4 ++-- plugins/stimulus/build.gradle | 2 +- plugins/turbo/build.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 0c0f363..ed69f3b 100644 --- a/build.gradle +++ b/build.gradle @@ -130,8 +130,8 @@ tasks.withType(Test) { } assets { - minifyJs = true - minifyCss = true + minifyJs = false + minifyCss = false enableDigests = false enableGzip = false enableSourceMaps = false diff --git a/plugins/stimulus/build.gradle b/plugins/stimulus/build.gradle index a01f091..6b67bb0 100644 --- a/plugins/stimulus/build.gradle +++ b/plugins/stimulus/build.gradle @@ -15,8 +15,8 @@ group "org.graceframework.plugins" apply plugin: "eclipse" apply plugin: "idea" apply plugin: "groovy" -apply plugin: "org.graceframework.asset-pipeline" apply plugin: "org.graceframework.grace-plugin" +apply plugin: "org.graceframework.asset-pipeline" apply plugin: "maven-publish" apply plugin: "signing" diff --git a/plugins/turbo/build.gradle b/plugins/turbo/build.gradle index c2c19ee..0619e75 100644 --- a/plugins/turbo/build.gradle +++ b/plugins/turbo/build.gradle @@ -15,9 +15,9 @@ group "org.graceframework.plugins" apply plugin: "eclipse" apply plugin: "idea" apply plugin: "groovy" -apply plugin: "org.graceframework.asset-pipeline" apply plugin: "org.graceframework.grace-plugin" apply plugin: "org.graceframework.grace-gsp" +apply plugin: "org.graceframework.asset-pipeline" apply plugin: "maven-publish" apply plugin: "signing" From 661ae71b26e26b5616d0034b5312bad4176de8f2 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Tue, 27 May 2025 01:31:41 +0800 Subject: [PATCH 17/19] Upgrade to Gradle Nexus Publish Plugin 2.0.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ed69f3b..5243500 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath "io.github.gradle-nexus:publish-plugin:1.3.0" + classpath "io.github.gradle-nexus:publish-plugin:2.0.0" classpath "org.graceframework:grace-gradle-plugin:$graceVersion" classpath "com.github.erdi:webdriver-binaries-gradle-plugin:3.2" classpath "org.graceframework.plugins:asset-pipeline-gradle:5.2.7" From b129997b5706d222479826afe648e54aeae2ebb1 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Tue, 27 May 2025 01:38:42 +0800 Subject: [PATCH 18/19] Update README --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e7455ec..13f1a18 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ [![Main branch build status](https://github.com/grace-plugins/grace-hotwire/workflows/Grace%20CI/badge.svg?style=flat)](https://github.com/grace-plugins/grace-hotwire/actions?query=workflow%3A%Grace+CI%22) [![Apache 2.0 license](https://img.shields.io/badge/License-APACHE%202.0-green.svg?logo=APACHE&style=flat)](https://opensource.org/licenses/Apache-2.0) [![Latest version on Maven Central](https://img.shields.io/maven-central/v/org.graceframework.plugins/turbo.svg?label=Maven%20Central&logo=apache-maven&style=flat)](https://search.maven.org/search?q=g:org.graceframework.plugins) -[![Grace on X](https://img.shields.io/twitter/follow/graceframework?style=social)](https://twitter.com/graceframework) +[![Groovy Version](https://img.shields.io/badge/Groovy-3.0.22-blue?style=flat&color=4298b8)](https://groovy-lang.org/releasenotes/groovy-3.0.html) +[![Grace Version](https://img.shields.io/badge/Grace-2022.0.0-blue?style=flat&color=f49b06)](https://github.com/graceframework/grace-framework/releases/tag/v2022.0.0) +[![Grace on X](https://img.shields.io/twitter/follow/graceframework?style=social)](https://x.com/graceframework) # Grace with Hotwire @@ -11,7 +13,7 @@ [Stimulus](https://stimulus.hotwired.dev) is a JavaScript framework with modest ambitions. It doesn’t seek to take over your entire front-end—in fact, it’s not concerned with rendering HTML at all. Instead, it’s designed to augment your HTML with just enough behavior to make it shine. -This plugin will help you to develop Grace app with Hotwire Turo and Stimulus. +This plugin will help you to develop Grace app with Hotwire Turbo and Stimulus. ## Usage @@ -125,7 +127,7 @@ cd grace-hotwire ## Support Version * Grace 2022.0.0+ -* Grails 3.0+ +* Grails 5.0+ ## Roadmap From 53228bdcfe08b5ed8bbdb003400616a494cbc222 Mon Sep 17 00:00:00 2001 From: Michael Yan Date: Tue, 27 May 2025 01:39:44 +0800 Subject: [PATCH 19/19] Release v0.4.0 --- gradle.properties | 2 +- .../graceframework/plugins/stimulus/StimulusGrailsPlugin.groovy | 2 +- .../org/graceframework/plugins/turbo/TurboGrailsPlugin.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9b788e1..7606885 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=0.4.0-SNAPSHOT +projectVersion=0.4.0 graceVersion=2022.2.8 groovyVersion=3.0.22 org.gradle.daemon=true diff --git a/plugins/stimulus/src/main/groovy/org/graceframework/plugins/stimulus/StimulusGrailsPlugin.groovy b/plugins/stimulus/src/main/groovy/org/graceframework/plugins/stimulus/StimulusGrailsPlugin.groovy index ff3aa8e..272681b 100644 --- a/plugins/stimulus/src/main/groovy/org/graceframework/plugins/stimulus/StimulusGrailsPlugin.groovy +++ b/plugins/stimulus/src/main/groovy/org/graceframework/plugins/stimulus/StimulusGrailsPlugin.groovy @@ -19,7 +19,7 @@ import grails.plugins.* class StimulusGrailsPlugin extends Plugin { - def version = '0.4.0-SNAPSHOT' + def version = '0.4.0' // the version or versions of Grails the plugin is designed for def grailsVersion = "5.0.0 > *" // resources that are excluded from plugin packaging diff --git a/plugins/turbo/src/main/groovy/org/graceframework/plugins/turbo/TurboGrailsPlugin.groovy b/plugins/turbo/src/main/groovy/org/graceframework/plugins/turbo/TurboGrailsPlugin.groovy index c90089a..991c9d0 100644 --- a/plugins/turbo/src/main/groovy/org/graceframework/plugins/turbo/TurboGrailsPlugin.groovy +++ b/plugins/turbo/src/main/groovy/org/graceframework/plugins/turbo/TurboGrailsPlugin.groovy @@ -19,7 +19,7 @@ import grails.plugins.* class TurboGrailsPlugin extends Plugin { - def version = '0.4.0-SNAPSHOT' + def version = '0.4.0' // the version or versions of Grails the plugin is designed for def grailsVersion = "5.0.0 > *" // resources that are excluded from plugin packaging