merge conflicts

README.md

@@ -78,7 +78,7 @@ is automatically applied by the `snowflake` plugin:
 ```groovy
 plugins {
    id 'java'
-   id 'io.github.stewartbryson.snowflake' version '2.0.15'
+   id 'io.github.stewartbryson.snowflake' version '2.0.16'
 }
 ```
 
@@ -234,7 +234,7 @@ Our `plugins` DSL from the build file:
 plugins {
     id 'java'
     id 'groovy' // needed for Spock testing framework
-    id 'io.github.stewartbryson.snowflake' version '2.0.15'
+    id 'io.github.stewartbryson.snowflake' version '2.0.16'
 }
 ```
 
@@ -311,7 +311,7 @@ functionalTest(JvmTestSuite) {
        all {
            useSpock('2.3-groovy-3.0')
            dependencies {
-               implementation "io.github.stewartbryson:gradle-snowflake-plugin:2.0.15"
+               implementation "io.github.stewartbryson:gradle-snowflake-plugin:2.0.16"
            }
            testTask.configure {
                failFast true

examples/groovy/build.gradle

@@ -1,42 +1,42 @@
 plugins {
     id 'groovy'
     id 'com.github.ben-manes.versions' version '0.47.0'
-    id 'io.github.stewartbryson.snowflake' version '2.0.15'
+    id 'io.github.stewartbryson.snowflake' version '2.0.16'
 }
 
 repositories {
-    mavenCentral()
+   mavenCentral()
 }
 
 dependencies {
-    implementation 'org.codehaus.groovy:groovy:3.0.17'
+   implementation 'org.codehaus.groovy:groovy:3.0.17'
 }
 
 java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
+   toolchain {
+      languageVersion = JavaLanguageVersion.of(11)
+   }
 }
 
 snowflake {
-    connection = 'gradle_plugin'
-    stage = 'upload'
-    applications {
-        add_numbers {
-            inputs = ["a integer", "b integer"]
-            returns = "string"
-            handler = "Sample.addNum"
-        }
-    }
+   connection = 'gradle_plugin'
+   stage = 'upload'
+   applications {
+      add_numbers {
+         inputs = ["a integer", "b integer"]
+         returns = "string"
+         handler = "Sample.addNum"
+      }
+   }
 }
 
-version='0.1.0'
+version = '0.1.0'
 
 // empty task for matrix strategy execution in GitHub Actions
 // please ignore
 afterEvaluate {
-    tasks.register('matrixStrategy') {
-        description 'Empty task for matrix strategy execution in GitHub Actions.'
-        dependsOn snowflakeJvm
-    }
+   tasks.register('matrixStrategy') {
+      description 'Empty task for matrix strategy execution in GitHub Actions.'
+      dependsOn snowflakeJvm
+   }
 }

examples/java-external-stage/build.gradle

@@ -1,40 +1,40 @@
 plugins {
     id 'java'
     id 'com.github.ben-manes.versions' version '0.47.0'
-    id 'io.github.stewartbryson.snowflake' version '2.0.15'
+    id 'io.github.stewartbryson.snowflake' version '2.0.16'
 }
 
 repositories {
-    mavenCentral()
+   mavenCentral()
 }
 
 java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
+   toolchain {
+      languageVersion = JavaLanguageVersion.of(11)
+   }
 }
 
 snowflake {
-    connection = 'gradle_plugin'
-    stage = 's3_maven'
-    groupId = 'io.github.stewartbryson'
-    artifactId = 'sample-udfs'
-    applications {
-        add_numbers {
-            inputs = ["a integer", "b integer"]
-            returns = "string"
-            handler = "Sample.addNum"
-        }
-    }
+   connection = 'gradle_plugin'
+   stage = 's3_maven'
+   groupId = 'io.github.stewartbryson'
+   artifactId = 'sample-udfs'
+   applications {
+      add_numbers {
+         inputs = ["a integer", "b integer"]
+         returns = "string"
+         handler = "Sample.addNum"
+      }
+   }
 }
 
-version='0.1.0'
+version = '0.1.0'
 
 // empty task for matrix strategy execution in GitHub Actions
 // please ignore
 afterEvaluate {
-    tasks.register('matrixStrategy') {
-        description 'Empty task for matrix strategy execution in GitHub Actions.'
-        dependsOn snowflakeJvm
-    }
+   tasks.register('matrixStrategy') {
+      description 'Empty task for matrix strategy execution in GitHub Actions.'
+      dependsOn snowflakeJvm
+   }
 }

examples/java-testing/build.gradle

@@ -1,72 +1,72 @@
 plugins {
     id 'java'
     id 'groovy' // needed for Spock testing framework
-    id 'io.github.stewartbryson.snowflake' version '2.0.15'
+    id 'io.github.stewartbryson.snowflake' version '2.0.16'
     id 'com.adarshr.test-logger' version '3.2.0' // added for testing
     id 'com.github.ben-manes.versions' version '0.47.0'
 }
 
 repositories {
-    mavenCentral()
-    gradlePluginPortal() // added for functionalTest dependency
+   mavenCentral()
+   gradlePluginPortal() // added for functionalTest dependency
 }
 
 java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
+   toolchain {
+      languageVersion = JavaLanguageVersion.of(11)
+   }
 }
 
 snowflake {
-    connection = 'gradle_plugin'
-    stage = 'upload'
-    // Explained in the Ephemeral Cloning section
-    useEphemeral = snowflake.isCI() // use ephemeral with CI/CD workflows
-    keepEphemeral = snowflake.isPR() // keep ephemeral for PRs
-    applications {
-        add_numbers {
-            inputs = ["a integer", "b integer"]
-            returns = "string"
-            handler = "Sample.addNum"
-        }
-    }
+   connection = 'gradle_plugin'
+   stage = 'upload'
+   // Explained in the Ephemeral Cloning section
+   useEphemeral = snowflake.isCI() // use ephemeral with CI/CD workflows
+   keepEphemeral = snowflake.isPR() // keep ephemeral for PRs
+   applications {
+      add_numbers {
+         inputs = ["a integer", "b integer"]
+         returns = "string"
+         handler = "Sample.addNum"
+      }
+   }
 }
 
 // Explained in the Testing section
 testing {
-    suites {
-        test {
-            useSpock('2.3-groovy-3.0')
-        }
-        functionalTest(JvmTestSuite) {
-            targets {
-                all {
-                    useSpock('2.3-groovy-3.0')
-                    dependencies {
-                        implementation "io.github.stewartbryson:gradle-snowflake-plugin:2.0.15"
-                    }
-                    testTask.configure {
-                        failFast true
-                        // which SnowSQL connection to use
-                        systemProperty 'connection', snowflake.connection
-                        // if this is ephemeral, the test spec needs the name to connect to
-                        if (snowflake.useEphemeral) {
-                            systemProperty 'ephemeralName', snowflake.ephemeralName
-                        }
-                    }
-                }
+   suites {
+      test {
+         useSpock('2.3-groovy-3.0')
+      }
+      functionalTest(JvmTestSuite) {
+         targets {
+            all {
+               useSpock('2.3-groovy-3.0')
+               dependencies {
+                  implementation "io.github.stewartbryson:gradle-snowflake-plugin:2.0.16"
+               }
+               testTask.configure {
+                  failFast true
+                  // which SnowSQL connection to use
+                  systemProperty 'connection', snowflake.connection
+                  // if this is ephemeral, the test spec needs the name to connect to
+                  if (snowflake.useEphemeral) {
+                     systemProperty 'ephemeralName', snowflake.ephemeralName
+                  }
+               }
             }
-        }
-    }
+         }
+      }
+   }
 }
 
-version='0.1.0'
+version = '0.1.0'
 
 // empty task for matrix strategy execution in GitHub Actions
 // please ignore
 afterEvaluate {
-    tasks.register('matrixStrategy') {
-        description 'Empty task for matrix strategy execution in GitHub Actions.'
-        dependsOn functionalTest, dropEphemeral
-    }
+   tasks.register('matrixStrategy') {
+      description 'Empty task for matrix strategy execution in GitHub Actions.'
+      dependsOn functionalTest, dropEphemeral
+   }
 }

examples/java/build.gradle

@@ -1,38 +1,38 @@
 plugins {
     id 'java'
     id 'com.github.ben-manes.versions' version '0.47.0'
-    id 'io.github.stewartbryson.snowflake' version '2.0.15'
+    id 'io.github.stewartbryson.snowflake' version '2.0.16'
 }
 
 repositories {
-    mavenCentral()
+   mavenCentral()
 }
 
 java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
+   toolchain {
+      languageVersion = JavaLanguageVersion.of(11)
+   }
 }
 
 snowflake {
-    connection = 'gradle_plugin'
-    stage = 'upload'
-    applications {
-        add_numbers {
-            inputs = ["a integer", "b integer"]
-            returns = "string"
-            handler = "Sample.addNum"
-        }
-    }
+   connection = 'gradle_plugin'
+   stage = 'upload'
+   applications {
+      add_numbers {
+         inputs = ["a integer", "b integer"]
+         returns = "string"
+         handler = "Sample.addNum"
+      }
+   }
 }
 
-version='0.1.0'
+version = '0.1.0'
 
 // empty task for matrix strategy execution in GitHub Actions
 // please ignore
 afterEvaluate {
-    tasks.register('matrixStrategy') {
-        description 'Empty task for matrix strategy execution in GitHub Actions.'
-        dependsOn snowflakeJvm
-    }
+   tasks.register('matrixStrategy') {
+      description 'Empty task for matrix strategy execution in GitHub Actions.'
+      dependsOn snowflakeJvm
+   }
 }

examples/kotlin/build.gradle

@@ -1,39 +1,39 @@
 plugins {
     id "org.jetbrains.kotlin.jvm" version "1.8.21"
     id 'com.github.ben-manes.versions' version '0.47.0'
-    id 'io.github.stewartbryson.snowflake' version '2.0.15'
+    id 'io.github.stewartbryson.snowflake' version '2.0.16'
 }
 
 repositories {
-    mavenCentral()
+   mavenCentral()
 }
 
 java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
+   toolchain {
+      languageVersion = JavaLanguageVersion.of(11)
+   }
 }
 
 snowflake {
-    connection = 'gradle_plugin'
-    stage = 'upload'
-    applications {
-        add_numbers {
-            inputs = ["a integer", "b integer"]
-            returns = "string"
-            handler = "Sample.addNum"
-        }
-    }
+   connection = 'gradle_plugin'
+   stage = 'upload'
+   applications {
+      add_numbers {
+         inputs = ["a integer", "b integer"]
+         returns = "string"
+         handler = "Sample.addNum"
+      }
+   }
 }
 
-version='0.1.0'
+version = '0.1.0'
 
 
 // empty task for matrix strategy execution in GitHub Actions
 // please ignore
 afterEvaluate {
-    tasks.register('matrixStrategy') {
-        description 'Empty task for matrix strategy execution in GitHub Actions.'
-        dependsOn snowflakeJvm
-    }
+   tasks.register('matrixStrategy') {
+      description 'Empty task for matrix strategy execution in GitHub Actions.'
+      dependsOn snowflakeJvm
+   }
 }