diff --git a/README.markdown b/README.markdown index 083c98b..ce7e502 100644 --- a/README.markdown +++ b/README.markdown @@ -22,9 +22,9 @@ Add the following to your `build.gradle`: ```groovy dependencies { - implementation 'cloud.wondrify:selfie:7.0.0-SNAPSHOT' + implementation 'cloud.wondrify:selfie:7.0.0' // Add storage provider as needed - implementation 'cloud.wondrify:karman-aws:3.0.1-SNAPSHOT' // For AWS S3 + implementation 'cloud.wondrify:karman-aws:3.0.3' // For AWS S3 } ``` diff --git a/build.gradle b/build.gradle index adbbde9..7d3e288 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'org.apache.grails.gradle.grails-publish' apply plugin: 'org.apache.grails.gradle.grails-plugin' apply plugin: 'java-library' -group "cloud.wondrify" +group = "cloud.wondrify" ext { pomDescription = 'Selfie is a Grails Image / File Upload Plugin. Use Selfie to attach files to your domain models, upload to a CDN, validate content, produce thumbnails.' diff --git a/gradle.properties b/gradle.properties index 11d6012..0dbf34b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,5 @@ version=7.0.0-SNAPSHOT -groovyVersion=4.0.24 javaVersion=17 -grailsVersion=7.0.2 +grailsVersion=7.0.9 javaparserVersion=3.26.3 karmanVersion=3.0.3 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c35211..9bbc975 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0..aaaabb3 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-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..faf9300 100755 --- a/gradlew +++ b/gradlew @@ -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 @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. diff --git a/selfie-docs/build.gradle b/selfie-docs/build.gradle index cbd27e4..ff1069b 100644 --- a/selfie-docs/build.gradle +++ b/selfie-docs/build.gradle @@ -1,15 +1,20 @@ plugins { - id 'org.asciidoctor.jvm.convert' version '4.0.2' + id 'org.asciidoctor.jvm.convert' version '4.0.5' } repositories { mavenCentral() } +ext { + buildDocs = file('build/docs') + srcDocs = file('src/docs/asciidoc') +} + asciidoctor { - sourceDir file('src/docs/asciidoc') - outputDir file('build/docs') - + sourceDir = srcDocs + outputDir = buildDocs + attributes = [ 'source-highlighter': 'coderay', 'toc': 'left', @@ -26,9 +31,10 @@ asciidoctor { ] } -task copyDocs(type: Copy, dependsOn: asciidoctor) { - from asciidoctor.outputDir +tasks.register("copyDocs", Copy) { + dependsOn(asciidoctor) + from buildDocs into file('build/gh-pages') } -build.dependsOn copyDocs +tasks.build.dependsOn copyDocs diff --git a/selfie-docs/src/docs/asciidoc/index.adoc b/selfie-docs/src/docs/asciidoc/index.adoc index 9a27705..aa808a3 100644 --- a/selfie-docs/src/docs/asciidoc/index.adoc +++ b/selfie-docs/src/docs/asciidoc/index.adoc @@ -39,7 +39,7 @@ Add Selfie to your `build.gradle`: dependencies { implementation 'cloud.wondrify:selfie:{project-version}' // Add storage provider dependencies as needed - implementation 'cloud.wondrify:karman-aws:3.0.1-SNAPSHOT' // For AWS S3 + implementation 'cloud.wondrify:karman-aws:3.0.3' // For AWS S3 } ---- diff --git a/src/main/groovy/com/bertramlabs/plugins/selfie/SelfieGrailsPlugin.groovy b/src/main/groovy/com/bertramlabs/plugins/selfie/SelfieGrailsPlugin.groovy index 5490097..12c0918 100644 --- a/src/main/groovy/com/bertramlabs/plugins/selfie/SelfieGrailsPlugin.groovy +++ b/src/main/groovy/com/bertramlabs/plugins/selfie/SelfieGrailsPlugin.groovy @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component class SelfieGrailsPlugin extends Plugin { // the version or versions of Grails the plugin is designed for - def grailsVersion = "3.1.5 > *" + def grailsVersion = "7.0.0 > *" def title = "Selfie Plugin" def author = "David Estes"