From bd3c768570e39402c4c9fdb1ede417e4a71dc558 Mon Sep 17 00:00:00 2001 From: Guilherme Ferreira Date: Sun, 15 Mar 2026 16:53:03 +0000 Subject: [PATCH 1/3] Reduced module dependencies --- engine/app/app-core/build.gradle.kts | 6 +++--- engine/app/app-test/build.gradle.kts | 3 +++ engine/core/build.gradle.kts | 20 ++----------------- engine/input/build.gradle.kts | 4 +--- .../io/canopy/engine/input/InputMapper.kt | 3 ++- 5 files changed, 11 insertions(+), 25 deletions(-) diff --git a/engine/app/app-core/build.gradle.kts b/engine/app/app-core/build.gradle.kts index 17eb5b5..10e063b 100644 --- a/engine/app/app-core/build.gradle.kts +++ b/engine/app/app-core/build.gradle.kts @@ -6,9 +6,9 @@ plugins { dependencies { // Canopy deps - api(projects.engine.core) - api(projects.engine.logging) - api(projects.engine.data.dataCore) + implementation(projects.engine.core) + implementation(projects.engine.logging) + implementation(projects.engine.data.dataCore) // Ktx api(libs.ktx.app) diff --git a/engine/app/app-test/build.gradle.kts b/engine/app/app-test/build.gradle.kts index ad08c10..f28ea6d 100644 --- a/engine/app/app-test/build.gradle.kts +++ b/engine/app/app-test/build.gradle.kts @@ -10,6 +10,9 @@ dependencies { // Gdx implementation(libs.gdx.backend.headless) + val gdxPlatform = libs.gdx.platform.get().module + val gdxVer = libs.versions.gdx.get() + api("$gdxPlatform:$gdxVer:natives-desktop") // JSON } diff --git a/engine/core/build.gradle.kts b/engine/core/build.gradle.kts index f11f83f..7c206a2 100644 --- a/engine/core/build.gradle.kts +++ b/engine/core/build.gradle.kts @@ -11,28 +11,12 @@ val enableGraalNative: Boolean = providers dependencies { // Canopy - implementation(projects.engine.utils) - implementation(projects.engine.logging) - - // Gdx - api(libs.gdx.core) - - // Ktx - api(libs.ktx.app) - api(libs.ktx.assets.async) - api(libs.ktx.assets) - api(libs.ktx.async) - api(libs.ktx.log) - api(libs.ktx.math) + api(projects.engine.utils) + api(projects.engine.logging) // Logging api(libs.slf4j.api) runtimeOnly(libs.logback.classic) - - // Graal helper only when enabled - if (enableGraalNative) { - implementation(libs.graal.helper.annotations) - } } // Canopy custom tasks diff --git a/engine/input/build.gradle.kts b/engine/input/build.gradle.kts index 080cfb3..341117b 100644 --- a/engine/input/build.gradle.kts +++ b/engine/input/build.gradle.kts @@ -9,7 +9,5 @@ dependencies { implementation(projects.engine.data.dataCore) implementation(projects.engine.data.dataSaving) implementation(projects.engine.utils) - - // JSON - implementation(libs.kotlinx.serialization.json) + implementation(projects.engine.logging) } diff --git a/engine/input/src/main/kotlin/io/canopy/engine/input/InputMapper.kt b/engine/input/src/main/kotlin/io/canopy/engine/input/InputMapper.kt index 4d829f5..43ca3ed 100644 --- a/engine/input/src/main/kotlin/io/canopy/engine/input/InputMapper.kt +++ b/engine/input/src/main/kotlin/io/canopy/engine/input/InputMapper.kt @@ -2,7 +2,8 @@ package io.canopy.engine.input import com.badlogic.gdx.Input import io.canopy.engine.data.saving.registerSaveModule -import ktx.log.logger +import io.canopy.engine.logging.logger +import kotlinx.serialization.builtins.serializer /** * Maintains runtime mappings between **input actions** and **physical input binds**. From 7c0a361ce82be40d8f6752d278302748a0a38cf7 Mon Sep 17 00:00:00 2001 From: Guilherme Ferreira Date: Sun, 15 Mar 2026 16:53:24 +0000 Subject: [PATCH 2/3] Renamed 'app-headless' to 'app-terminal' --- engine/app/{app-headless => app-terminal}/.gitignore | 0 engine/app/{app-headless => app-terminal}/build.gradle.kts | 4 ++-- .../kotlin/io/canopy/engine/app/headless/TerminalCanopyApp.kt | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename engine/app/{app-headless => app-terminal}/.gitignore (100%) rename engine/app/{app-headless => app-terminal}/build.gradle.kts (80%) rename engine/app/{app-headless => app-terminal}/src/main/kotlin/io/canopy/engine/app/headless/TerminalCanopyApp.kt (100%) diff --git a/engine/app/app-headless/.gitignore b/engine/app/app-terminal/.gitignore similarity index 100% rename from engine/app/app-headless/.gitignore rename to engine/app/app-terminal/.gitignore diff --git a/engine/app/app-headless/build.gradle.kts b/engine/app/app-terminal/build.gradle.kts similarity index 80% rename from engine/app/app-headless/build.gradle.kts rename to engine/app/app-terminal/build.gradle.kts index 1ae98b3..0318e78 100644 --- a/engine/app/app-headless/build.gradle.kts +++ b/engine/app/app-terminal/build.gradle.kts @@ -5,8 +5,8 @@ plugins { dependencies { // Canopy deps - api(projects.engine.app.appCore) - // implementation(projects.engine.logging) + implementation(projects.engine.app.appCore) + implementation(projects.engine.logging) // Gdx api(libs.gdx.backend.headless) diff --git a/engine/app/app-headless/src/main/kotlin/io/canopy/engine/app/headless/TerminalCanopyApp.kt b/engine/app/app-terminal/src/main/kotlin/io/canopy/engine/app/headless/TerminalCanopyApp.kt similarity index 100% rename from engine/app/app-headless/src/main/kotlin/io/canopy/engine/app/headless/TerminalCanopyApp.kt rename to engine/app/app-terminal/src/main/kotlin/io/canopy/engine/app/headless/TerminalCanopyApp.kt From 9200d6515c4381c29bb8b924b72c990f68af3fd4 Mon Sep 17 00:00:00 2001 From: Guilherme Ferreira Date: Sun, 15 Mar 2026 17:09:30 +0000 Subject: [PATCH 3/3] Fixed dependency --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index ac9ff0a..23b5f87 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -36,7 +36,7 @@ include( include( ":engine:app:app-core", //":engine:app:app-desktop", - ":engine:app:app-headless", + ":engine:app:app-terminal", ":engine:app:app-test" )