Skip to content

Commit

Permalink
Updated some versions, which fixes solarthing-server
Browse files Browse the repository at this point in the history
  • Loading branch information
retrodaredevil committed Mar 21, 2023
1 parent 275d013 commit 650ef44
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ buildscript {
dockerComposePluginVersion = "0.16.11" // https://github.com/avast/gradle-docker-compose-plugin/releases
errorpronePluginVersion = '3.0.1' // https://github.com/tbroyer/gradle-errorprone-plugin/releases
errorproneCoreVersion = '2.18.0' // https://mvnrepository.com/artifact/com.google.errorprone/error_prone_core
antlrVersion = "4.11.1"
antlrVersion = "4.12.0" // https://github.com/antlr/antlr4/releases
}
dependencies {
classpath "com.avast.gradle:gradle-docker-compose-plugin:$dockerComposePluginVersion"
Expand Down
2 changes: 2 additions & 0 deletions docker/solarthing-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ RUN java -Djarmode=layertools -jar application.jar extract


FROM eclipse-temurin:19-jre-jammy
LABEL org.opencontainers.image.source=https://github.com/wildmountainfarms/solarthing

RUN ["mkdir", "/app"]
WORKDIR "/app"
COPY --from=builder dependencies/ ./
Expand Down
2 changes: 1 addition & 1 deletion graphql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies {
implementation 'com.graphql-java:graphql-java-spring-boot-starter-webmvc:2.0'

// implementation 'com.graphql-java:graphql-java:14.0' graphql-spqr adds this dependency
implementation 'io.leangen.graphql:spqr:0.11.2' // https://github.com/leangen/graphql-spqr/releases
implementation 'io.leangen.graphql:spqr:0.12.1' // https://github.com/leangen/graphql-spqr/releases

// Although we don't need this dependency, we need to bump the version so that couchdb has the version it needs
api group: 'com.squareup.okhttp3', name: 'okhttp', version: "$okhttpVersion"
Expand Down

0 comments on commit 650ef44

Please sign in to comment.