Merge pull request #80 from stewartbryson/stewart

Corrected README
stewartbryson · Apr 7, 2023 · ce65b5a · ce65b5a
2 parents 0459788 + c59004e
commit ce65b5a
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -43,12 +43,13 @@ githubRelease {
     //dryRun true
 }
 
+import org.apache.tools.ant.filters.ReplaceTokens
 tasks.register('copyReadme', Copy) {
     group 'documentation'
     description 'Update README.md file with current version.'
     from('src/markdown') {
         include 'README.md'
-        expand(version: version)
+        filter(ReplaceTokens, tokens: [version: version])
     }
     into '.'
 }
@@ -58,7 +59,7 @@ tasks.register('copyExamples', Copy) {
     description 'Token replacement of current version in examples.'
     from('src/examples') {
         include '*/build.gradle'
-        expand(version: version)
+        filter(ReplaceTokens, tokens: [version: version])
     }
     into 'examples'
     mustRunAfter copyReadme

diff --git a/src/examples/groovy/build.gradle b/src/examples/groovy/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'groovy'
     id 'com.github.ben-manes.versions' version '0.46.0'
-    id 'io.github.stewartbryson.snowflake' version '${version}'
+    id 'io.github.stewartbryson.snowflake' version '@version@'
 }
 
 repositories {

diff --git a/src/examples/java-external-stage/build.gradle b/src/examples/java-external-stage/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'com.github.ben-manes.versions' version '0.46.0'
-    id 'io.github.stewartbryson.snowflake' version '${version}'
+    id 'io.github.stewartbryson.snowflake' version '@version@'
 }
 
 repositories {

diff --git a/src/examples/java-testing/build.gradle b/src/examples/java-testing/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'groovy' // needed for Spock testing framework
-    id 'io.github.stewartbryson.snowflake' version '${version}'
+    id 'io.github.stewartbryson.snowflake' version '@version@'
     id 'com.adarshr.test-logger' version '3.2.0' // added for testing
     id 'com.github.ben-manes.versions' version '0.46.0'
 }

diff --git a/src/examples/java/build.gradle b/src/examples/java/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'com.github.ben-manes.versions' version '0.46.0'
-    id 'io.github.stewartbryson.snowflake' version '${version}'
+    id 'io.github.stewartbryson.snowflake' version '@version@'
 }
 
 repositories {

diff --git a/src/examples/kotlin/build.gradle b/src/examples/kotlin/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.jvm" version "1.7.21"
     id 'com.github.ben-manes.versions' version '0.46.0'
-    id 'io.github.stewartbryson.snowflake' version '${version}'
+    id 'io.github.stewartbryson.snowflake' version '@version@'
 }
 
 repositories {

diff --git a/src/examples/scala/build.gradle b/src/examples/scala/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'scala'
     id 'com.github.ben-manes.versions' version '0.46.0'
-    id 'io.github.stewartbryson.snowflake' version '${version}'
+    id 'io.github.stewartbryson.snowflake' version '@version@'
 }
 
 repositories {

diff --git a/src/markdown/README.md b/src/markdown/README.md
@@ -79,7 +79,7 @@ is automatically applied by the `snowflake` plugin:
 ```groovy
 plugins {
    id 'java'
-   id 'io.github.stewartbryson.snowflake' version '${version}'
+   id 'io.github.stewartbryson.snowflake' version '@version@'
 }
 ```
 
@@ -235,7 +235,7 @@ Our `plugins` DSL from the build file:
 plugins {
     id 'java'
     id 'groovy' // needed for Spock testing framework
-    id 'io.github.stewartbryson.snowflake' version '${version}'
+    id 'io.github.stewartbryson.snowflake' version '@version@'
 }
 ```
 
@@ -299,7 +299,7 @@ functionalTest(JvmTestSuite) {
        all {
            useSpock('2.3-groovy-3.0')
            dependencies {
-               implementation "io.github.stewartbryson:gradle-snowflake-plugin:${version}"
+               implementation "io.github.stewartbryson:gradle-snowflake-plugin:@version@"
            }
            testTask.configure {
                failFast true