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
14 changes: 7 additions & 7 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ jobs:
steps:
- uses: actions/checkout@v5

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v5
with:
java-version: '17'
distribution: 'adopt'
java-version: '21'
distribution: 'temurin'

- name: Gradle Wrapper Validation
uses: gradle/actions/wrapper-validation@v4
uses: gradle/actions/wrapper-validation@v5

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v5

- name: Run tests
- name: Test
run: ./gradlew test

- name: Build project
- name: Build
run: ./gradlew build
21 changes: 8 additions & 13 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Publish to Reposilite

on:
Expand All @@ -17,22 +12,22 @@ jobs:
- uses: actions/checkout@v5

- name: Set version
run: echo "RELEASE_VERSION=$(echo ${GITHUB_REF#refs/*/} | sed 's/^v//')" >> $GITHUB_ENV
run: echo "RELEASE_VERSION=$(echo ${GITHUB_REF#refs/*/} | sed "s/^v//")" >> $GITHUB_ENV

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v5
with:
java-version: '17'
distribution: 'adopt'
java-version: '21'
distribution: 'temurin'

- name: Gradle Wrapper Validation
uses: gradle/actions/wrapper-validation@v4
uses: gradle/actions/wrapper-validation@v5

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v5

- name: Publish Build
run: ./gradlew clean publish -Pversion=${{ env.RELEASE_VERSION }}
- name: Publish
run: ./gradlew clean build publish -Pversion=${{ env.RELEASE_VERSION }}
env:
REPOSILITE_USERNAME: ${{ secrets.REPOSILITE_USERNAME }}
REPOSILITE_PASSWORD: ${{ secrets.REPOSILITE_PASSWORD }}
60 changes: 0 additions & 60 deletions build.gradle

This file was deleted.

76 changes: 76 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
import org.springframework.boot.gradle.plugin.SpringBootPlugin

plugins {
id("org.springframework.boot") version "3.5.7" apply false
id("io.spring.dependency-management") version "1.1.7"
id("java-library")
id("maven-publish")
id("com.github.ben-manes.versions") version "0.53.0"
}

group = "no.novari"

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
}
withSourcesJar()
}

publishing {
repositories {
mavenLocal()
}
}

repositories {
mavenLocal()
maven {
url = uri("https://repo.fintlabs.no/releases")
}
mavenCentral()
}

dependencyManagement {
imports {
mavenBom(SpringBootPlugin.BOM_COORDINATES)
}
}

dependencies {
implementation("org.springframework.boot:spring-boot-starter-actuator")

compileOnly("org.projectlombok:lombok")
runtimeOnly("io.micrometer:micrometer-registry-prometheus")
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
annotationProcessor("org.projectlombok:lombok")

implementation("org.ehcache:ehcache:3.11.1")

testImplementation("org.springframework.boot:spring-boot-starter-test")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

tasks.test {
useJUnitPlatform()
}

publishing {
repositories {
maven {
url = uri("https://repo.fintlabs.no/releases")
credentials {
username = System.getenv("REPOSILITE_USERNAME")
password = System.getenv("REPOSILITE_PASSWORD")
}
authentication {
create<BasicAuthentication>("basic")
}
}
}
publications {
create<MavenPublication>("maven") {
from(components["java"])
}
}
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
47 changes: 32 additions & 15 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading