Skip to content

Commit

Permalink
Migrate root build.gradle to Kotlin
Browse files Browse the repository at this point in the history
  • Loading branch information
Brutus5000 committed Mar 1, 2024
1 parent 06c55d0 commit 04e60ab
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 61 deletions.
56 changes: 0 additions & 56 deletions build.gradle

This file was deleted.

29 changes: 29 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
plugins {
alias(libs.plugins.kotlin.jvm) apply false
alias(libs.plugins.test.logger) apply false
}

configure(subprojects) {
apply(plugin = "java-library")
apply(plugin = "com.adarshr.test-logger")
apply(plugin = "maven-publish")

group = "com.faforever.commons"
version = "1.0-SNAPSHOT"

repositories {
mavenCentral()
}

tasks.withType<Test> {
useJUnitPlatform()
}

configure<PublishingExtension> {
publications {
create<MavenPublication>("maven") {
from(components["java"])
}
}
}
}
12 changes: 11 additions & 1 deletion faf-commons-api/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
version = "1.0-SNAPSHOT"

java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

dependencies {
implementation(project(":faf-commons-data"))
annotationProcessor(libs.lombok)
compileOnly(libs.lombok)
compileOnly(libs.jetbrains.annotations)
compileOnly(libs.slf4j.api)
implementation(libs.jsonapi.converter)
implementation(libs.q.builders)

testImplementation(libs.pojo.tester)
testAnnotationProcessor(libs.lombok)
testCompileOnly(libs.lombok)
testImplementation(libs.junit.jupiter)
testImplementation(libs.hamcrest.core)
testImplementation(libs.mockito.core)
testImplementation(libs.mockito.junit.jupiter)
testImplementation(libs.pojo.tester)
testCompileOnly(libs.jetbrains.annotations)
}
10 changes: 10 additions & 0 deletions faf-commons-data/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
version = "1.0-SNAPSHOT"

java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

dependencies {
annotationProcessor(libs.lombok)
compileOnly(libs.lombok)
compileOnly(libs.jetbrains.annotations)
compileOnly(libs.slf4j.api)

implementation(libs.luaj.jse)
implementation(libs.guava)
Expand All @@ -13,6 +19,10 @@ dependencies {

testAnnotationProcessor(libs.lombok)
testCompileOnly(libs.lombok)
testImplementation(libs.junit.jupiter)
testImplementation(libs.hamcrest.core)
testImplementation(libs.mockito.core)
testImplementation(libs.mockito.junit.jupiter)
testCompileOnly(libs.jetbrains.annotations)
testImplementation(libs.logback.classic)
}
8 changes: 7 additions & 1 deletion faf-commons-lobby/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,17 @@ plugins {
}

version = "1.0.0-SNAPSHOT"
java.sourceCompatibility = JavaVersion.VERSION_21

dependencies {
api(libs.reactor.core)
implementation(libs.reactor.netty)
compileOnly(libs.slf4j.api)
compileOnly(libs.jackson.databind)

testImplementation(libs.junit.jupiter)
testImplementation(libs.hamcrest.core)
testImplementation(libs.mockito.core)
testImplementation(libs.mockito.junit.jupiter)
testImplementation(libs.reactor.test)
testImplementation(libs.logback.classic)
testImplementation(libs.slf4j.api)
Expand Down
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ pojo-tester = { module = "pl.pojo:pojo-tester", version = "0.7.6" }
[plugins]
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-plugin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
test-logger = { id = "com.adarshr.test-logger", version = "4.0.0" }
6 changes: 3 additions & 3 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include ':faf-commons-api'
include ':faf-commons-data'
include ':faf-commons-lobby'
include(":faf-commons-api")
include(":faf-commons-data")
include(":faf-commons-lobby")

0 comments on commit 04e60ab

Please sign in to comment.