Update develop branch with progress

.envrc

@@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: 2025 Alexander Wood (BristerMitten)
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+use flake .

.github/workflows/compliance.yml

@@ -1,9 +1,7 @@
 name: compliance tasks
 on:
   push:
-    branches: [ main, develop ]
   pull_request:
-    branches: [ main, develop ]
 
 permissions:
   contents: read
@@ -15,7 +13,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: REUSE Compliance check
-        uses: fsfe/reuse-action@v2
+        uses: fsfe/reuse-action@v6.0.0
   openapi:
     runs-on: ubuntu-latest
     steps:

.github/workflows/docker.yml

@@ -18,11 +18,11 @@ jobs:
           key: ${{ runner.os }}-gradle-test-${{ hashFiles('**/*.gradle') }}
           restore-keys: |
             ${{ runner.os }}-gradle-test-
-      - name: Set up JDK 17
+      - name: Set up JDK 25
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
       - name: Docker login
         uses: docker/login-action@v1
         with:

.github/workflows/gradle.yml

@@ -1,9 +1,7 @@
 name: Gradle build
 on:
   push:
-    branches: [ main, develop ]
   pull_request:
-    branches: [ main, develop ]
 
 permissions:
   contents: read
@@ -17,11 +15,13 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
+
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build --no-daemon
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: Build with Gradle
+        run: ./gradlew build --no-daemon
   checkstyle:
     runs-on: ubuntu-latest
     steps:
@@ -30,8 +30,9 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: checkstyleMain checkstyleTest --no-daemon
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: Run Checkstyle
+        run: ./gradlew checkstyleMain checkstyleTest --no-daemon

.gitignore

@@ -15,3 +15,10 @@ out/
 .settings
 .classpath
 .factorypath
+
+# Devenv
+.devenv*
+devenv.local.nix
+
+# direnv
+.direnv

.pre-commit-config.yaml

@@ -5,17 +5,19 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-yaml
       - id: check-added-large-files
   - repo: https://github.com/python-openapi/openapi-spec-validator
-    rev: 0.5.5 # The version to use or 'master' for latest
+    rev: 0.7.2
     hooks:
     - id: openapi-spec-validator
   - repo: https://github.com/fsfe/reuse-tool
-    rev: v1.0.0
+    rev: v6.1.2
     hooks:
-      - id: reuse
+      - id: reuse-lint-file
+        additional_dependencies:
+          - click

REUSE.toml

@@ -0,0 +1,16 @@
+version = 1
+SPDX-PackageName = "codosseum-backend"
+SPDX-PackageSupplier = "JohnnyJayJay <johnnyjayjay02@gmail.com>"
+SPDX-PackageDownloadLocation = "https://github.com/codosseum-org/backend"
+
+[[annotations]]
+path = ".github/workflows/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "JohnnyJayJay"
+SPDX-License-Identifier = "CC0-1.0"
+
+[[annotations]]
+path = ["gradle/**", "gradlew", "gradlew.bat"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Gradle, Inc."
+SPDX-License-Identifier = "Apache-2.0"

build.gradle.kts

@@ -1,15 +1,20 @@
+import de.undercouch.gradle.tasks.download.Download
+
+
 // SPDX-FileCopyrightText: 2023 Alex Wood
 // SPDX-License-Identifier: AGPL-3.0-or-later
 plugins {
-    id("com.github.johnrengelman.shadow") version "8.1.1"
-    id("io.micronaut.application") version "4.0.1"
-    id("io.micronaut.aot") version "4.0.1"
-    id("io.micronaut.openapi") version "4.0.1"
+    id("io.micronaut.application") version "4.5.5"
+    id("io.micronaut.aot") version "4.5.5"
+    id("io.micronaut.openapi") version "4.5.5"
+    id("groovy")
+    id("de.undercouch.download") version "5.6.0"
     checkstyle
 }
 
 version = "0.1.0"
 group = "org.developerden"
+val challengesOpenApiSpec: Provider<RegularFile> = layout.buildDirectory.file("openapi/challenges-openapi.yaml")
 
 repositories {
     maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
@@ -20,38 +25,64 @@ repositories {
 
 dependencies {
     annotationProcessor("io.micronaut.openapi:micronaut-openapi")
+    implementation("io.micronaut.openapi:micronaut-openapi-annotations")
     annotationProcessor("io.micronaut.serde:micronaut-serde-processor")
     annotationProcessor("io.micronaut.validation:micronaut-validation-processor")
     annotationProcessor("io.micronaut.security:micronaut-security-annotations")
-    annotationProcessor("io.soabase.record-builder:record-builder-processor:37")
+    annotationProcessor("io.soabase.record-builder:record-builder-processor:49")
+    annotationProcessor("org.mapstruct:mapstruct-processor:1.6.3")
 
     implementation("io.micronaut.reactor:micronaut-reactor")
+    implementation("io.micronaut.cache:micronaut-cache-caffeine")
     implementation("io.micronaut.security:micronaut-security")
     implementation("io.micronaut.validation:micronaut-validation")
-    implementation("io.soabase.record-builder:record-builder-core:37")
+    implementation("io.micronaut.security:micronaut-security-oauth2")
+    implementation("io.micronaut.security:micronaut-security-jwt")
+    implementation("io.soabase.record-builder:record-builder-core:49")
     implementation("io.micronaut.serde:micronaut-serde-jackson")
     implementation("io.swagger.core.v3:swagger-annotations")
     implementation("io.micronaut:micronaut-http-client")
     implementation("com.github.kkuegler:human-readable-ids-java:0.1.1")
     implementation("com.networknt:json-schema-validator:1.0.86")
+    implementation("org.spdx:java-spdx-library:(,2.0]") {
+        exclude("org.apache.logging.log4j")
+    }
+    implementation("org.mapstruct:mapstruct:1.6.3")
     runtimeOnly("ch.qos.logback:logback-classic")
     runtimeOnly("org.yaml:snakeyaml")
+
+
+    testAnnotationProcessor("io.micronaut:micronaut-inject-java")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
+    testImplementation("io.micronaut.test:micronaut-test-junit5")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+    testImplementation("io.micronaut.test:micronaut-test-spock")
+    testImplementation(platform("org.spockframework:spock-bom:+"))
+    testImplementation("org.spockframework:spock-core")
+
 }
 
 
 application {
-    mainClass.set("org.developerden.codosseum.server.Application")
+    mainClass.set("org.developerden.codosseum.Application")
 }
 
 java {
-    sourceCompatibility = JavaVersion.toVersion("17")
-    targetCompatibility = JavaVersion.toVersion("17")
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
 }
 
 checkstyle {
-    toolVersion = "10.12.2"
+    toolVersion = "11.1.0"
     configFile = configDirectory.file("google_checks.xml").get().asFile
-    sourceSets = emptySet()
+    sourceSets = listOf(project.sourceSets.main.get())
+}
+
+tasks.withType<Checkstyle> {
+    exclude {
+        it.file.path.contains("generated/openapi") // TODO: this could be slow?
+    }
 }
 
 tasks {
@@ -67,6 +98,7 @@ tasks {
 
 graalvmNative.toolchainDetection.set(false)
 micronaut {
+
     runtime("netty")
     testRuntime("junit5")
     processing {
@@ -86,6 +118,38 @@ micronaut {
     }
 
     openapi {
-
+        client(
+            "challenges-service",
+            challengesOpenApiSpec
+        ) {
+            apiPackageName = "org.developerden.codosseum.challenges.client.api"
+            modelPackageName = "org.developerden.codosseum.challenges.client.model"
+            useOptional = true
+            useSealed = true
+        }
     }
 }
+
+
+val downloadChallengesServiceOpenApi by tasks.registering(Download::class) {
+    src("https://raw.githubusercontent.com/codosseum-org/challenges-service/refs/heads/openapi/openapi.yaml")
+    dest(challengesOpenApiSpec)
+    overwrite(true)
+    onlyIfModified(false)
+}
+
+tasks.named("generateChallenges-serviceOpenApiModels") { // task created by micronaut-openapi plugin
+    dependsOn(downloadChallengesServiceOpenApi)
+}
+
+tasks.named("generateChallenges-serviceOpenApiApis") { // task created by micronaut-openapi plugin
+    dependsOn(downloadChallengesServiceOpenApi)
+}
+
+tasks.named<Test>("test") {
+    useJUnitPlatform()
+    outputs.upToDateWhen { false }
+    systemProperties["junit.jupiter.execution.parallel.enabled"] = true
+    systemProperties["junit.jupiter.execution.parallel.mode.default"] = "concurrent"
+    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
+}