Skip to content

Commit

Permalink
Merge pull request #105 from fauna/release-0.1.0-M4-fixed
Browse files Browse the repository at this point in the history
[release-0.1.0-M4-fixed] Merge build fixes into release branch
  • Loading branch information
findgriffin authored Aug 14, 2024
2 parents 144eb98 + 6cc620d commit 4eda6b1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/gradle-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,9 @@ jobs:

- name: Run Gradle test
run: ./gradlew test

- name: Run Gradle javadoc
run: ./gradlew javadoc

- name: Run Gradle assemble
run: ./gradlew assemble
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ compileJava {
java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
withSourcesJar()
}
test {
useJUnitPlatform()
Expand Down Expand Up @@ -83,10 +84,11 @@ task printVersion {
}

task writeProps(type: WriteProperties) {
outputFile = file("src/main/resources/version.properties")
destinationFile = file("src/main/resources/version.properties")
encoding = 'UTF-8'
property('version', project.version)
property('name', project.name)
property('group', project.group)
}
processResources.dependsOn(writeProps)
sourcesJar.dependsOn(writeProps)
2 changes: 1 addition & 1 deletion src/main/java/com/fauna/response/ConstraintFailure.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public Optional<String> getName() {
}

/**
* Each path returned by Fauna for a constraint failure is an array of strings & integers. But since Java
* Each path returned by Fauna for a constraint failure is an array of strings and integers. But since Java
* doesn't really have a way to support union types, returning Object (the common parent of String and Integer)
* seems like the simplest solution.
*
Expand Down

0 comments on commit 4eda6b1

Please sign in to comment.