Skip to content

Commit

Permalink
chores: PR feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
robertmathew committed Jul 1, 2024
1 parent b214196 commit 12bd9b6
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 51 deletions.
20 changes: 14 additions & 6 deletions .fleet/run.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,27 @@
{
"name": "OpenID-Federation [:server:build]",
"type": "gradle",
"workingDir": "C:\\Users\\Robo\\Sphereon\\OpenID-Federation",
"tasks": [":server:build"],
"args": [""],
"workingDir": "$PROJECT_DIR$",
"tasks": [
":server:build"
],
"args": [
""
],
"initScripts": {
"flmapper": "ext.mapPath = { path -> null }"
}
},
{
"name": "OpenID-Federation [build]",
"type": "gradle",
"workingDir": "C:\\Users\\Robo\\Sphereon\\OpenID-Federation",
"tasks": ["build"],
"args": [""],
"workingDir": "$PROJECT_DIR$",
"tasks": [
"build"
],
"args": [
""
],
"initScripts": {
"flmapper": "ext.mapPath = { path -> null }"
}
Expand Down
34 changes: 34 additions & 0 deletions admin-server/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
plugins {
alias(libs.plugins.springboot)
alias(libs.plugins.springDependencyManagement)
alias(libs.plugins.kotlinJvm)
alias(libs.plugins.kotlinPluginSpring)
application
}

group = "com.sphereon.oid.fed"
version = "1.0.0"

java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
}

dependencies {
implementation(libs.springboot.actuator)
implementation(libs.springboot.web)
implementation(libs.kotlin.reflect)

runtimeOnly(libs.springboot.devtools)
}

kotlin {
compilerOptions {
freeCompilerArgs.addAll("-Xjsr305=strict")
}
}

tasks.withType<Test> {
useJUnitPlatform()
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
spring.application.name=OpenID Federation

# Mapping /actuator/health to /status
management.endpoints.web.base-path=/
management.endpoints.web.path-mapping.health=status
11 changes: 8 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ junit = "4.13.2"
kotlin = "2.0.0"
kotlinxSerializationJson = "1.7.0-RC"
springboot = "3.3.1"
spingDependencyManagement = "1.1.5"
springDependencyManagement = "1.1.5"

[libraries]
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
Expand All @@ -30,13 +30,18 @@ androidx-constraintlayout = { group = "androidx.constraintlayout", name = "const
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }

kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect" }
springboot-actuator = { group = "org.springframework.boot", name = "spring-boot-starter-actuator" }
springboot-web = { group = "org.springframework.boot", name = "spring-boot-starter-web" }
springboot-devtools = { group = "org.springframework.boot", name = "spring-boot-devtools" }

[plugins]
androidApplication = { id = "com.android.application", version.ref = "agp" }
androidLibrary = { id = "com.android.library", version.ref = "agp" }
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
springboot = { id = "org.springframework.boot", version.ref = "springboot"}
springDependencyManagement = { id = "io.spring.dependency-management", version.ref = "spingDependencyManagement"}
springboot = { id = "org.springframework.boot", version.ref = "springboot" }
springDependencyManagement = { id = "io.spring.dependency-management", version.ref = "springDependencyManagement" }
kotlinPluginSpring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
42 changes: 0 additions & 42 deletions server/build.gradle.kts

This file was deleted.

0 comments on commit 12bd9b6

Please sign in to comment.