hlaeja-old/hlaeja-common-plugin
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update for core plugin v0.2.0

Browse Source 
- update task ltd.hlaeja.plugin.hlaeja-common-plugin.service-container.gradle.kts
- update publishing ltd.hlaeja.plugin.hlaeja-common-plugin.library-publish.gradle.kts
- update publishing in build.gradle.kts
- update catalog version
This commit is contained in:
Mr. Swordsteel
2024-12-10 17:48:53 +01:00
parent 9cae6198ad
commit 867b07575c
4 changed files with 16 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build.gradle.kts
View File

@@ -1,6 +1,5 @@
import io.gitlab.arturbosch.detekt.Detekt
import io.gitlab.arturbosch.detekt.extensions.DetektExtension.Companion.DEFAULT_SRC_DIR_KOTLIN
import java.lang.System.getenv
plugins {
alias(hlaeja.plugins.io.gitlab.arturbosch.detekt)
@@ -39,18 +38,12 @@ kotlin.compilerOptions.freeCompilerArgs.addAll("-Xjsr305=strict")
publishing {
repositories {
fun retrieveConfiguration(
property: String,
environment: String,
): String? = project.findProperty(property)?.toString() ?: getenv(environment)
maven {
url = uri("https://maven.pkg.github.com/swordsteel/${project.name}")
name = "GitHubPackages"
credentials {
username = retrieveConfiguration("repository.user", "REPOSITORY_USER")
password = retrieveConfiguration("repository.token", "REPOSITORY_TOKEN")
username = config.find("repository.user", "REPOSITORY_USER")
password = config.find("repository.token", "REPOSITORY_TOKEN")
}
}
}

2
gradle.properties
View File

@@ -1,3 +1,3 @@
kotlin.code.style=official
version=0.2.0-SNAPSHOT
catalog=0.2.0
catalog=0.6.0-SNAPSHOT

13
src/main/kotlin/ltd.hlaeja.plugin.hlaeja-common-plugin.library-publish.gradle.kts
View File

@@ -1,23 +1,16 @@
import java.lang.System.getenv
plugins {
id("ltd.hlaeja.plugin.hlaeja-core-plugin")
`maven-publish`
}
publishing {
repositories {
fun retrieveConfiguration(
property: String,
environment: String,
): String? = project.findProperty(property)?.toString() ?: getenv(environment)
maven {
url = uri("https://maven.pkg.github.com/swordsteel/${project.name}")
name = "GitHubPackages"
credentials {
username = retrieveConfiguration("repository.user", "REPOSITORY_USER")
password = retrieveConfiguration("repository.token", "REPOSITORY_TOKEN")
username = config.find("repository.user", "REPOSITORY_USER")
password = config.find("repository.token", "REPOSITORY_TOKEN")
}
}
}

23
src/main/kotlin/ltd.hlaeja.plugin.hlaeja-common-plugin.service-container.gradle.kts
View File

@@ -4,22 +4,16 @@ import com.bmuschko.gradle.docker.tasks.container.DockerStopContainer
import com.bmuschko.gradle.docker.tasks.network.DockerCreateNetwork
import com.bmuschko.gradle.docker.tasks.network.DockerInspectNetwork
import com.bmuschko.gradle.docker.tasks.network.DockerRemoveNetwork
import java.lang.System.getenv
plugins {
id("ltd.hlaeja.plugin.hlaeja-core-plugin")
id("com.bmuschko.docker-spring-boot-application")
}
fun configuration(
property: String,
environment: String,
default: String,
): String = project.findProperty(property)?.toString() ?: getenv(environment) ?: default
fun configurationPorts(
property: String,
environment: String,
): List<String> = configuration(property, environment, "8080").split(',')
): List<String> = config.findOrDefault(property, environment, "8080").split(',')
fun exposeDockerPorts(): List<Int> = configurationPorts("docker.port.expose", "DOCKER_PORT_EXPOSE")
.mapNotNull { it.toIntOrNull() }
@@ -40,9 +34,12 @@ tasks {
targetImageId("${project.name}:${project.version}")
containerName.set(project.name)
hostConfig.autoRemove.set(true)
hostConfig.network.set(configuration("container.network", "CONTAINER_NETWORK", "develop"))
hostConfig.network.set(config.findOrDefault("container.network", "CONTAINER_NETWORK", "develop"))
hostConfig.portBindings.set(exposeContainerPorts())
withEnvVar("SPRING_PROFILES_ACTIVE", configuration("container.profiles", "CONTAINER_PROFILES", "docker"))
withEnvVar(
"SPRING_PROFILES_ACTIVE",
config.findOrDefault("container.profiles", "CONTAINER_PROFILES", "docker")
)
}
register("containerStart", DockerStartContainer::class) {
group = "hlaeja"
@@ -55,15 +52,15 @@ tasks {
}
register("containerNetworkCheck", DockerInspectNetwork::class) {
group = "hlaeja"
targetNetworkId(configuration("container.network", "CONTAINER_NETWORK", "develop"))
targetNetworkId(config.findOrDefault("container.network", "CONTAINER_NETWORK", "develop"))
onError { println("Network does not exist.") }
}
register("containerNetworkCreate", DockerCreateNetwork::class) {
group = "hlaeja"
networkName.set(configuration("container.network", "CONTAINER_NETWORK", "develop"))
networkName.set(config.findOrDefault("container.network", "CONTAINER_NETWORK", "develop"))
}
register("containerNetworkRemove", DockerRemoveNetwork::class) {
group = "hlaeja"
targetNetworkId(configuration("container.network", "CONTAINER_NETWORK", "develop"))
targetNetworkId(config.findOrDefault("container.network", "CONTAINER_NETWORK", "develop"))
}
}