From 2923c73b53b38977a5a76622529f7ca8b30c10ea Mon Sep 17 00:00:00 2001 From: Timo Bryant Date: Sat, 20 Apr 2024 22:13:03 +0200 Subject: [PATCH] setup module build --- app/build.gradle.kts | 1 - build.gradle.kts | 7 +++++++ buildSrc/build.gradle.kts | 11 +++++++++++ buildSrc/settings.gradle.kts | 7 +++++++ buildSrc/src/main/kotlin/module-convention.gradle.kts | 8 ++++++++ gradle.properties | 5 ++--- gradle/libs.versions.toml | 6 +++++- libraries/CredentialsManager/build.gradle.kts | 0 libraries/CredentialsManager/gradle.properties | 0 libraries/build.gradle.kts | 1 - modules/ModCredentialManager/build.gradle.kts | 3 +++ modules/ModuleCore/build.gradle.kts | 5 +++++ modules/build.gradle.kts | 7 +++++++ settings.gradle.kts | 2 +- 14 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 build.gradle.kts create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/settings.gradle.kts create mode 100644 buildSrc/src/main/kotlin/module-convention.gradle.kts delete mode 100644 libraries/CredentialsManager/build.gradle.kts delete mode 100644 libraries/CredentialsManager/gradle.properties delete mode 100644 libraries/build.gradle.kts create mode 100644 modules/ModCredentialManager/build.gradle.kts create mode 100644 modules/ModuleCore/build.gradle.kts create mode 100644 modules/build.gradle.kts diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 501aee8..aa54723 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,7 +1,6 @@ @file:Suppress("UnstableApiUsage") plugins { - alias(libs.plugins.jvm) application kotlin("plugin.serialization") version embeddedKotlinVersion id("com.bmuschko.docker-java-application") version "9.4.0" diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..94999fd --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + alias(libs.plugins.kotlinx.serialization) version embeddedKotlinVersion +} + +repositories { + mavenCentral() +} diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 0000000..c978fc4 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + `kotlin-dsl` +} + +repositories { + gradlePluginPortal() +} + +dependencies { + implementation(libs.gradle.kotlin.jvm) +} diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts new file mode 100644 index 0000000..b5a0fab --- /dev/null +++ b/buildSrc/settings.gradle.kts @@ -0,0 +1,7 @@ +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} diff --git a/buildSrc/src/main/kotlin/module-convention.gradle.kts b/buildSrc/src/main/kotlin/module-convention.gradle.kts new file mode 100644 index 0000000..7d40ce2 --- /dev/null +++ b/buildSrc/src/main/kotlin/module-convention.gradle.kts @@ -0,0 +1,8 @@ +plugins { + `java-library` + kotlin("jvm") +} + +repositories { + mavenCentral() +} diff --git a/gradle.properties b/gradle.properties index 18f452c..34a690d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,5 @@ -# This file was generated by the Gradle 'init' task. -# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties - org.gradle.parallel=true org.gradle.caching=true +group=de.itkl +version=1.0-PRE diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 543e99e..d1e24a7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,6 +5,7 @@ logback-classic = "1.5.4" slf4j = "2.0.12" kotlin-logging = "6.0.4" kotlinx = "1.7.3" +kotlin = "1.9.22" [libraries] koin-core = {module = "io.insert-koin:koin-core", version.ref = "koin" } @@ -23,9 +24,12 @@ kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-c ktor-server-content-negotation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor" } ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor"} +#plugin-kotlinx-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin"} +gradle-kotlin-jvm = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin"} [plugins] -jvm = { id = "org.jetbrains.kotlin.jvm", version = "1.9.22" } +jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin"} [bundles] koin = [ diff --git a/libraries/CredentialsManager/build.gradle.kts b/libraries/CredentialsManager/build.gradle.kts deleted file mode 100644 index e69de29..0000000 diff --git a/libraries/CredentialsManager/gradle.properties b/libraries/CredentialsManager/gradle.properties deleted file mode 100644 index e69de29..0000000 diff --git a/libraries/build.gradle.kts b/libraries/build.gradle.kts deleted file mode 100644 index 1baded6..0000000 --- a/libraries/build.gradle.kts +++ /dev/null @@ -1 +0,0 @@ -subprojects { } diff --git a/modules/ModCredentialManager/build.gradle.kts b/modules/ModCredentialManager/build.gradle.kts new file mode 100644 index 0000000..933a472 --- /dev/null +++ b/modules/ModCredentialManager/build.gradle.kts @@ -0,0 +1,3 @@ +dependencies { + implementation(project(":modules:ModuleCore")) +} diff --git a/modules/ModuleCore/build.gradle.kts b/modules/ModuleCore/build.gradle.kts new file mode 100644 index 0000000..8ee35be --- /dev/null +++ b/modules/ModuleCore/build.gradle.kts @@ -0,0 +1,5 @@ +dependencies { + api(libs.bundles.koin) + api(libs.bundles.kotlinx) + api(libs.bundles.logging) +} diff --git a/modules/build.gradle.kts b/modules/build.gradle.kts new file mode 100644 index 0000000..ed72ca1 --- /dev/null +++ b/modules/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + `java-library` +} + +subprojects { + apply(plugin = "module-convention") +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 2045dea..b1314ad 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,4 +15,4 @@ fun includeDir(dir: String) { rootProject.name = "xssak" include("app") -includeDir("libraries") +includeDir("modules")