Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #114. #116

Merged
merged 5 commits into from
Mar 20, 2024
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@ bin/

# Ignore google auth files
gha-creds-*.json

# downloaded libs
lib/
3 changes: 2 additions & 1 deletion examples/groovy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
}

Expand All @@ -24,6 +24,7 @@ snowflake {
add_numbers {
inputs = ["a integer", "b integer"]
returns = "string"
runtime = '17'
handler = "Sample.addNum"
}
}
Expand Down
3 changes: 2 additions & 1 deletion examples/java-external-stage/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
}

Expand All @@ -22,6 +22,7 @@ snowflake {
add_numbers {
inputs = ["a integer", "b integer"]
returns = "string"
runtime = '17'
handler = "Sample.addNum"
}
}
Expand Down
3 changes: 2 additions & 1 deletion examples/java-testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repositories {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
}

Expand All @@ -27,6 +27,7 @@ snowflake {
add_numbers {
inputs = ["a integer", "b integer"]
returns = "string"
runtime = '17'
handler = "Sample.addNum"
}
}
Expand Down
3 changes: 2 additions & 1 deletion examples/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
}

Expand All @@ -20,6 +20,7 @@ snowflake {
add_numbers {
inputs = ["a integer", "b integer"]
returns = "string"
runtime = '17'
handler = "Sample.addNum"
}
}
Expand Down
3 changes: 2 additions & 1 deletion examples/kotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
}

Expand All @@ -20,6 +20,7 @@ snowflake {
add_numbers {
inputs = ["a integer", "b integer"]
returns = "string"
runtime = '17'
handler = "Sample.addNum"
}
}
Expand Down
3 changes: 2 additions & 1 deletion examples/scala/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
}

Expand All @@ -25,6 +25,7 @@ snowflake {
add_numbers {
inputs = ["a integer", "b integer"]
returns = "string"
runtime = '17'
handler = "Sample.addNum"
}
}
Expand Down
8 changes: 4 additions & 4 deletions plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ plugins {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
}

dependencies {
implementation 'org.codehaus.groovy:groovy:3.0.20'
implementation 'org.codehaus.groovy:groovy:3.0.21'
implementation 'org.slf4j:slf4j-simple:2.0.9'
implementation 'com.snowflake:snowpark:1.10.0'
implementation 'com.snowflake:snowpark:1.11.0'
implementation 'gradle.plugin.com.redpillanalytics:gradle-properties:1.0.7'
implementation 'gradle.plugin.com.github.johnrengelman:shadow:8.0.0'
implementation 'org.apache.commons:commons-lang3:3.14.0'
Expand All @@ -32,7 +32,7 @@ testing {
useSpock('2.3-groovy-3.0')
dependencies {
implementation project()
implementation 'com.snowflake:snowpark:1.10.0'
implementation 'com.snowflake:snowpark:1.11.0'
implementation 'org.apache.commons:commons-lang3:3.14.0'
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class EphemeralTest extends GradleSpec {
| add_numbers {
| inputs = ["a integer", "b integer"]
| returns = "string"
| runtime = '17'
| handler = "Sample.addNum"
| }
| }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class GroovyTest extends GradleSpec {
| add_numbers {
| inputs = ["a integer", "b integer"]
| returns = "string"
| runtime = '17'
| handler = "Sample.addNum"
| }
| }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class JavaTest extends GradleSpec {
| add_numbers {
| inputs = ["a integer", "b integer"]
| returns = "string"
| runtime = '17'
| handler = "Sample.addNum"
| }
| }
Expand Down Expand Up @@ -84,6 +85,7 @@ class JavaTest extends GradleSpec {
| add_numbers {
| inputs = ["a integer", "b integer"]
| returns = "string"
| runtime = '17'
| handler = "Sample.addNum"
| immutable = true
| }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class KotlinTest extends GradleSpec {
| add_numbers {
| inputs = ["a integer", "b integer"]
| returns = "string"
| runtime = '17'
| handler = "Sample.addNum"
| }
| }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class ScalaTest extends GradleSpec {
| add_numbers {
| inputs = ["a integer", "b integer"]
| returns = "string"
| runtime = '17'
| handler = "Sample.addNum"
| }
| }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class JavaAmazonTest extends GradleSpec {
| add_numbers {
| inputs = ["a integer", "b integer"]
| returns = "string"
| runtime = '17'
| handler = "Sample.addNum"
| }
| }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class JavaGoogleTest extends GradleSpec {
| add_numbers {
| inputs = ["a integer", "b integer"]
| returns = "string"
| runtime = '17'
| handler = "Sample.addNum"
| }
| }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ class ApplicationContainer {
* The 'language' property of the UDF. DEFAULT: 'JAVA'.
*/
String language = 'JAVA'
/**
* The Java runtime version. DEFAULT: '11'.
*/
String runtime = '11'
/**
* The 'handler' property of the UDF.
*/
Expand All @@ -49,6 +53,7 @@ class ApplicationContainer {
| returns $returns
| language $language ${immutable ? "\n IMMUTABLE" : ""}
| handler = '$handler'
| runtime_version = '$runtime'
| imports = ($imports)
|""".stripMargin()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class BuildTest extends GradleSpec {
| add_numbers {
| inputs = ["a integer", "b integer"]
| returns = "string"
| runtime = '17'
| handler = "Sample.addNum"
| }
| }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class GradleSpec extends Specification {
|}
|java {
| toolchain {
| languageVersion = JavaLanguageVersion.of(11)
| languageVersion = JavaLanguageVersion.of(17)
| }
|}
|repositories {
Expand Down
5 changes: 3 additions & 2 deletions src/examples/groovy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ repositories {
}

dependencies {
implementation 'org.codehaus.groovy:groovy:3.0.20'
implementation 'org.codehaus.groovy:groovy:3.0.21'
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
}

Expand All @@ -24,6 +24,7 @@ snowflake {
add_numbers {
inputs = ["a integer", "b integer"]
returns = "string"
runtime = '17'
handler = "Sample.addNum"
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/examples/java-external-stage/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
}

Expand All @@ -22,6 +22,7 @@ snowflake {
add_numbers {
inputs = ["a integer", "b integer"]
returns = "string"
runtime = '17'
handler = "Sample.addNum"
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/examples/java-testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repositories {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
}

Expand All @@ -27,6 +27,7 @@ snowflake {
add_numbers {
inputs = ["a integer", "b integer"]
returns = "string"
runtime = '17'
handler = "Sample.addNum"
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/examples/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
}

Expand All @@ -20,6 +20,7 @@ snowflake {
add_numbers {
inputs = ["a integer", "b integer"]
returns = "string"
runtime = '17'
handler = "Sample.addNum"
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/examples/kotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
}

Expand All @@ -20,6 +20,7 @@ snowflake {
add_numbers {
inputs = ["a integer", "b integer"]
returns = "string"
runtime = '17'
handler = "Sample.addNum"
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/examples/scala/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
}

Expand All @@ -25,6 +25,7 @@ snowflake {
add_numbers {
inputs = ["a integer", "b integer"]
returns = "string"
runtime = '17'
handler = "Sample.addNum"
}
}
Expand Down
Loading
Loading