gradle cleanup

Author: bgalek

.github/workflows/ci.yml

@@ -17,14 +17,14 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 23
       - uses: gradle/actions/setup-gradle@v4
       - name: Test with Gradle
         run: ./gradlew build
       - uses: superfly/flyctl-actions/setup-flyctl@master
-        if: github.ref == 'refs/heads/main'
+        if: github.ref_name == github.event.repository.default_branch
       - run: flyctl deploy --remote-only
-        if: github.ref == 'refs/heads/main'
+        if: github.ref_name == github.event.repository.default_branch
   dependabot:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' && github.actor == 'dependabot[bot]' }}

Dockerfile

@@ -1,3 +1,3 @@
-FROM bellsoft/liberica-openjdk-alpine:21
-COPY ./backend/build/libs/*.jar app.jar
+FROM bellsoft/liberica-openjdk-alpine:23
+COPY ./build/libs/*.jar app.jar
 ENTRYPOINT ["java", "-Dspring.profiles.active=prod", "-Xmx180M", "-Xss256k", "-jar", "/app.jar"]

README.md

@@ -0,0 +1,26 @@
+# hackmerlin.io
+
+## Project Structure
+
+- **backend**: Contains the Spring Boot application.
+- **frontend**: Contains the React application.
+
+## Getting Started
+
+Currently, this project supports only azure openai deployments as LLM backend.
+To point this app to your deployment, you need to set the following `application.yml` properties:
+
+```yaml
+merlin:
+  azure:
+    key: your-openai-api-key
+    url: your-openai-api-url
+```
+
+## Running the Application
+
+Start the application:
+
+```sh
+./gradlew run
+```

backend/build.gradle.kts

@@ -1,60 +1,23 @@
 plugins {
     java
-    application
-    id("org.springframework.boot") version "3.4.1"
-    id("io.spring.dependency-management") version "1.1.7"
-    id("net.ltgt.errorprone") version "4.1.0"
-}
-
-group = "com.github.bgalek"
-version = "1.0.0"
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
-}
-
-repositories {
-    mavenCentral()
+    alias(libs.plugins.error.prone)
 }
 
 dependencies {
-    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
-    errorprone("com.google.errorprone:error_prone_core:2.36.0")
-    implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation("org.springframework.session:spring-session-jdbc")
-    implementation("org.springframework.boot:spring-boot-starter-jdbc")
-    implementation("org.springframework.boot:spring-boot-starter-actuator")
-    implementation("io.sentry:sentry-spring-boot-starter-jakarta:7.20.0")
-    implementation("com.azure:azure-ai-openai:1.0.0-beta.13")
-    implementation("com.github.ben-manes.caffeine:caffeine:3.1.8")
-    runtimeOnly("io.micrometer:micrometer-registry-prometheus:1.14.2")
-    runtimeOnly("org.postgresql:postgresql")
-}
-
-configurations {
-    compileOnly {
-        extendsFrom(configurations.annotationProcessor.get())
-    }
+    implementation(platform(libs.spring.boot.dependencies))
+    errorprone(libs.error.prone)
+    implementation(libs.spring.boot.starter.web)
+    implementation(libs.spring.session.jdbc)
+    implementation(libs.spring.boot.starter.jdbc)
+    implementation(libs.spring.boot.starter.actuator)
+    implementation(libs.sentry.spring.boot.starter)
+    implementation(libs.azure.ai.openai)
+    implementation(libs.caffeine)
+    runtimeOnly(libs.micrometer.registry.prometheus)
+    runtimeOnly(libs.postgresql)
+    runtimeOnly(libs.hsqldb)
 }
 
 tasks.withType<Test> {
     useJUnitPlatform()
-}
-
-tasks.processResources {
-    dependsOn(":frontend:build")
-}
-
-tasks.jar {
-    enabled = false
-}
-
-tasks.distZip {
-    enabled = false
-}
-
-tasks.distTar {
-    enabled = false
-}
+}

backend/src/main/resources/application.yml

@@ -196,6 +196,8 @@ spring:
   threads:
     virtual:
       enabled: true
+  datasource:
+    url: jdbc:hsqldb:mem:testdb;sql.syntax_pgs=true
 management:
   endpoints:
     web:

build.gradle.kts

@@ -0,0 +1,21 @@
+plugins {
+    application
+}
+
+application {
+    mainClass = "com.github.bgalek.MerlinApplication"
+}
+
+dependencies {
+    implementation(project(":backend"))
+    implementation(project(":frontend"))
+}
+
+allprojects {
+    apply(plugin = "java")
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(23))
+        }
+    }
+}

frontend/build.gradle.kts

@@ -1,20 +1,42 @@
+import com.github.gradle.node.npm.task.NpmTask
+
 plugins {
-    id("org.siouan.frontend-jdk11") version "6.0.0"
+    `java-library`
+    id("com.github.node-gradle.node") version "7.1.0"
 }
 
-frontend {
-    nodeVersion.set("20.5.1")
-    assembleScript.set("run build")
-    cleanScript.set("run clean")
-    checkScript.set("run check")
-    nodeDistributionProvided.set(true)
+node {
+    download = true
+    version = "23.5.0"
 }
 
 tasks.build {
-    dependsOn("copyDistToBackend")
+    dependsOn(tasks.named("npmBuild"))
+}
+
+tasks.test {
+    dependsOn(tasks.named("npmTest"))
 }
 
-tasks.create("copyDistToBackend", Copy::class) {
-    from("./build/dist")
-    into("../backend/build/resources/main/static")
+tasks.register<NpmTask>("npmBuild") {
+    dependsOn(tasks.npmInstall)
+    args.set(listOf("run", "build"))
+    inputs.dir(project.fileTree("src").exclude("**/*.test.ts"))
+    inputs.dir(project.fileTree("public"))
+    inputs.files("*.html", "*.json", "*.ts", "*.js")
+    outputs.dir(project.layout.buildDirectory.dir("dist"))
+    dependsOn(tasks.named("npmTest"))
 }
+
+tasks.register<NpmTask>("npmTest") {
+    args.set(listOf("run", "test"))
+    inputs.dir(project.fileTree("src"))
+    inputs.dir(project.fileTree("public"))
+    inputs.files("*.html", "*.json", "*.ts", "*.js")
+    outputs.upToDateWhen { true }
+}
+
+tasks.jar {
+    dependsOn(tasks.named("npmBuild"))
+    from(project.layout.buildDirectory.dir("dist"))
+}

frontend/vite.config.ts

@@ -5,7 +5,7 @@ import react from "@vitejs/plugin-react"; // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
   build: {
-    outDir: "./build/dist",
+    outDir: "build/dist/static",
   },
   server: {
     proxy: {

gradle/libs.versions.toml

@@ -0,0 +1,25 @@
+[versions]
+azure-ai-openai = "1.0.0-beta.13"
+caffeine = "3.1.8"
+error-prone-plugin = "4.1.0"
+error-prone-core = "2.36.0"
+micrometer = "1.14.2"
+sentry = "7.20.0"
+spring-boot = "3.4.1"
+
+[libraries]
+azure-ai-openai = { module = "com.azure:azure-ai-openai", version.ref = "azure-ai-openai" }
+caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "caffeine" }
+hsqldb = { module = "org.hsqldb:hsqldb" }
+micrometer-registry-prometheus = { module = "io.micrometer:micrometer-registry-prometheus", version.ref = "micrometer" }
+postgresql = { module = "org.postgresql:postgresql" }
+sentry-spring-boot-starter = { module = "io.sentry:sentry-spring-boot-starter-jakarta", version.ref = "sentry" }
+spring-boot-dependencies = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "spring-boot" }
+spring-boot-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator" }
+spring-boot-starter-jdbc = { module = "org.springframework.boot:spring-boot-starter-jdbc" }
+spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web" }
+spring-session-jdbc = { module = "org.springframework.session:spring-session-jdbc" }
+error-prone = { module = "com.google.errorprone:error_prone_core", version.ref = "error-prone-core" }
+
+[plugins]
+error-prone = { id = "net.ltgt.errorprone", version.ref = "error-prone-plugin" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -4,5 +4,11 @@ plugins {
 
 rootProject.name = "merlin"
 
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+    }
+}
+
 include("frontend")
 include("backend")