Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Build with Gradle
uses: gradle/actions/setup-gradle@v4
with:
gradle-version: "8.12"
gradle-version: "8.13"
- run: ./gradlew checkstyleMain
- run: ./gradlew test

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ COPY config config

RUN ./gradlew --no-daemon build

ENV JAVA_OPTS "-Xmx512M -Xms512M"
ENV JAVA_OPTS="-Xmx512M -Xms512M"
EXPOSE 7070

CMD java -jar build/libs/HexletJavalin-1.0-SNAPSHOT-all.jar
CMD ["java", "-jar", "build/libs/HexletJavalin-1.0-SNAPSHOT-all.jar"]
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dev:
./gradlew run

setup:
gradle wrapper --gradle-version 8.12
gradle wrapper --gradle-version 8.13

clean:
./gradlew clean
Expand Down
27 changes: 14 additions & 13 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
plugins {
application
checkstyle
id("io.freefair.lombok") version "8.6"
id("com.github.ben-manes.versions") version "0.51.0"
id("io.freefair.lombok") version "8.13.1"
id("com.github.ben-manes.versions") version "0.52.0"
id("com.github.johnrengelman.shadow") version "8.1.1"
}

Expand All @@ -21,19 +21,20 @@ repositories {
}

dependencies {
implementation("com.h2database:h2:2.2.224")
implementation("com.zaxxer:HikariCP:5.1.0")
implementation("com.fasterxml.jackson.core:jackson-databind:2.16.1")
implementation("org.apache.commons:commons-text:1.11.0")
implementation("gg.jte:jte:3.1.9")
implementation("org.slf4j:slf4j-simple:2.0.9")
implementation("io.javalin:javalin:6.1.3")
implementation("io.javalin:javalin-bundle:6.1.3")
implementation("io.javalin:javalin-rendering:6.1.3")
implementation("com.h2database:h2:2.3.232")
implementation("com.zaxxer:HikariCP:6.3.0")
implementation("com.fasterxml.jackson.core:jackson-databind:2.18.3")
implementation("org.apache.commons:commons-text:1.13.1")
implementation("gg.jte:jte:3.2.0")
implementation("org.slf4j:slf4j-simple:2.0.17")
implementation("io.javalin:javalin:6.6.0")
implementation("io.javalin:javalin-bundle:6.6.0")
implementation("io.javalin:javalin-rendering:6.6.0")

testImplementation("org.assertj:assertj-core:3.25.3")
testImplementation(platform("org.junit:junit-bom:5.10.1"))
testImplementation("org.assertj:assertj-core:3.27.3")
testImplementation(platform("org.junit:junit-bom:5.12.2"))
testImplementation("org.junit.jupiter:junit-jupiter")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

tasks.test {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down