Skip to content

Commit 1fe2d65

Browse files
committed
update project dependencies and license
1 parent 9b9aa26 commit 1fe2d65

File tree

6 files changed

+230
-697
lines changed

6 files changed

+230
-697
lines changed

LICENSE

Lines changed: 201 additions & 674 deletions
Large diffs are not rendered by default.

backend/build.gradle.kts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,23 @@ mavenPublishing {
3333
pom {
3434
name.set("pkg-backend")
3535
description.set("Backend service of PKG.")
36-
url.set("https://github.com/guimauvedigital/pkg")
37-
36+
url.set(project.ext.get("url")?.toString())
3837
licenses {
3938
license {
40-
name.set("GPL-3.0")
41-
url.set("https://opensource.org/licenses/GPL-3.0")
39+
name.set(project.ext.get("license.name")?.toString())
40+
url.set(project.ext.get("license.url")?.toString())
4241
}
4342
}
4443
developers {
4544
developer {
46-
id.set("NathanFallet")
47-
name.set("Nathan Fallet")
48-
email.set("contact@nathanfallet.me")
49-
url.set("https://www.nathanfallet.me")
45+
id.set(project.ext.get("developer.id")?.toString())
46+
name.set(project.ext.get("developer.name")?.toString())
47+
email.set(project.ext.get("developer.email")?.toString())
48+
url.set(project.ext.get("developer.url")?.toString())
5049
}
5150
}
5251
scm {
53-
url.set("https://github.com/guimauvedigital/pkg.git")
52+
url.set(project.ext.get("scm.url")?.toString())
5453
}
5554
}
5655
}

backend/src/commonMain/kotlin/digital/guimauve/pkg/plugins/Monitoring.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package digital.guimauve.pkg.plugins
22

33
import dev.kaccelero.plugins.Health
44
import io.ktor.server.application.*
5-
import io.ktor.server.plugins.callloging.*
5+
import io.ktor.server.plugins.calllogging.*
66
import io.ktor.server.request.*
77
import org.slf4j.event.Level
88

build.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ plugins {
66
allprojects {
77
group = "digital.guimauve.pkg"
88
version = "0.1.3"
9+
project.ext.set("url", "https://github.com/guimauvedigital/pkg")
10+
project.ext.set("license.name", "Apache 2.0")
11+
project.ext.set("license.url", "https://www.apache.org/licenses/LICENSE-2.0.txt")
12+
project.ext.set("developer.id", "nathanfallet")
13+
project.ext.set("developer.name", "Nathan Fallet")
14+
project.ext.set("developer.email", "contact@nathanfallet.me")
15+
project.ext.set("developer.url", "https://www.nathanfallet.me")
16+
project.ext.set("scm.url", "https://github.com/guimauvedigital/pkg.git")
917

1018
repositories {
1119
mavenCentral()

commons/build.gradle.kts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,23 @@ mavenPublishing {
1313
pom {
1414
name.set("pkg-commons")
1515
description.set("Common models and client for PKG.")
16-
url.set("https://github.com/guimauvedigital/pkg")
17-
16+
url.set(project.ext.get("url")?.toString())
1817
licenses {
1918
license {
20-
name.set("GPL-3.0")
21-
url.set("https://opensource.org/licenses/GPL-3.0")
19+
name.set(project.ext.get("license.name")?.toString())
20+
url.set(project.ext.get("license.url")?.toString())
2221
}
2322
}
2423
developers {
2524
developer {
26-
id.set("NathanFallet")
27-
name.set("Nathan Fallet")
28-
email.set("contact@nathanfallet.me")
29-
url.set("https://www.nathanfallet.me")
25+
id.set(project.ext.get("developer.id")?.toString())
26+
name.set(project.ext.get("developer.name")?.toString())
27+
email.set(project.ext.get("developer.email")?.toString())
28+
url.set(project.ext.get("developer.url")?.toString())
3029
}
3130
}
3231
scm {
33-
url.set("https://github.com/guimauvedigital/pkg.git")
32+
url.set(project.ext.get("scm.url")?.toString())
3433
}
3534
}
3635
}

settings.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ dependencyResolutionManagement {
1919
plugin("kover", "org.jetbrains.kotlinx.kover").version("0.8.3")
2020
plugin("ksp", "com.google.devtools.ksp").version("2.1.10-1.0.30")
2121
plugin("maven", "com.vanniktech.maven.publish").version("0.30.0")
22-
plugin("zodable", "digital.guimauve.zodable").version("1.3.1")
22+
plugin("zodable", "digital.guimauve.zodable").version("1.6.1-ksp1")
2323

2424
// Kaccelero
25-
version("kaccelero", "0.4.12")
25+
version("kaccelero", "0.6.1")
2626
library("kaccelero-routers-client", "dev.kaccelero", "routers-client-ktor").versionRef("kaccelero")
2727
library("kaccelero-routers", "dev.kaccelero", "routers-ktor").versionRef("kaccelero")
2828
library("kaccelero-i18n-freemarker", "dev.kaccelero", "i18n-ktor-freemarker").versionRef("kaccelero")
@@ -50,7 +50,7 @@ dependencyResolutionManagement {
5050
library("tests-coroutines", "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0")
5151

5252
// Ktor
53-
version("ktor", "2.3.12")
53+
version("ktor", "3.1.3")
5454
plugin("ktor", "io.ktor.plugin").versionRef("ktor")
5555
library("ktor-serialization-kotlinx-json", "io.ktor", "ktor-serialization-kotlinx-json").versionRef("ktor")
5656
library("ktor-server-core", "io.ktor", "ktor-server-core").versionRef("ktor")
@@ -113,7 +113,7 @@ dependencyResolutionManagement {
113113
)
114114

115115
// Koin
116-
version("koin", "3.5.0")
116+
version("koin", "4.1.0")
117117
library("koin-core", "io.insert-koin", "koin-core").versionRef("koin")
118118
library("koin-ktor", "io.insert-koin", "koin-ktor").versionRef("koin")
119119

0 commit comments

Comments
 (0)