Skip to content

Commit

Permalink
Remove lobby/infrastructure/nodebb components (#12638)
Browse files Browse the repository at this point in the history
Removed components are moving into their own repositories.
Build is a bit simplified, no longer need docker.
  • Loading branch information
DanVanAtta authored Jun 11, 2024
1 parent ef23907 commit b824876
Show file tree
Hide file tree
Showing 535 changed files with 7 additions and 23,342 deletions.
38 changes: 0 additions & 38 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@ plugins {
id "com.github.ben-manes.versions" version "0.51.0"
id "io.franzbecker.gradle-lombok" version "5.0.0" apply false
id "com.diffplug.spotless" version "6.25.0" apply false
id "com.avast.gradle.docker-compose" version "0.17.7"
}

apply plugin: "eclipse"
apply plugin: "docker-compose"


ext {
schemasDir = file("config/triplea/schemas")
Expand Down Expand Up @@ -199,39 +196,4 @@ subprojects {
removeUnusedImports()
}
}

// "testWithDatabase" runs only the tests that need a database
tasks.register("testWithDatabase", Test) {
description = "Runs integration tests."
group = "verification"

dependsOn(":composeUp")
dependsOn(":spitfire-server:database:flywayMigrateLobbyDb")
dependsOn(":spitfire-server:database:flywayMigrateErrorReportDb")

useJUnitPlatform() {
includeTags "RequiresDatabase"
}
}

// - "testAll" runs all tests
task testAll {
dependsOn testWithDatabase
dependsOn test
}

// - "check" should run ALL validations, tests, spotlessChecks, everything..
check.dependsOn testAll

// composeUp is the same as running => docker compose -f .docker/full-stack.yml --ansi never -p triplea up
// composeBuild is the same as running => docker compose -f .docker/full-stack.yml --ansi never -p triplea build
dockerCompose {
projectName = "triplea"
useComposeFiles = ["docker-compose.yml" ]
}

// compose builds need WAR files for packaging, so we must run the corresponding package (shadowJar) tasks
composeBuild.dependsOn ":servers:game-support:server:shadowJar"
composeBuild.dependsOn ":servers:maps:server:shadowJar"
composeBuild.dependsOn ":spitfire-server:dropwizard-server:shadowJar"
}
69 changes: 0 additions & 69 deletions docker-compose.yml

This file was deleted.

2 changes: 2 additions & 0 deletions format
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

set -eu

./gradlew spotlessApply

find . -name "*.md" -type f | while read -r file; do
Expand Down
2 changes: 1 addition & 1 deletion game-app/game-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ dependencies {
implementation project(":game-app:map-data")
implementation project(":game-app:game-relay-server")
implementation project(":http-clients:lobby-client")
implementation project(":http-clients:maps-server")
implementation project(":lib:http-client-lib")
implementation project(":lib:java-extras")
implementation project(":lib:swing-lib")
implementation project(":lib:websocket-client")
implementation project(":lib:xml-reader")
implementation project(":servers:maps:client")
testImplementation "org.awaitility:awaitility:$awaitilityVersion"
testImplementation "org.sonatype.goodies:goodies-prefs:$sonatypeGoodiesPrefsVersion"
testImplementation project(":lib:swing-lib-test-support")
Expand Down
2 changes: 1 addition & 1 deletion game-app/game-headed/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ dependencies {
implementation project(":game-app:game-core")
implementation project(":game-app:map-data")
implementation project(":http-clients:lobby-client")
implementation project(":http-clients:maps-server")
implementation project(":lib:feign-common")
implementation project(":lib:http-client-lib")
implementation project(":lib:java-extras")
implementation project(":lib:swing-lib")
implementation project(":lib:websocket-client")
implementation project(":servers:maps:client")
testImplementation "org.sonatype.goodies:goodies-prefs:$sonatypeGoodiesPrefsVersion"
testImplementation project(":lib:test-common")
}
Expand Down
File renamed without changes.
9 changes: 0 additions & 9 deletions http-clients/github-client/build.gradle

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit b824876

Please sign in to comment.