From 86dd1e45201e2dcbc3905b6d02346fd8087ec426 Mon Sep 17 00:00:00 2001 From: JeremyStarTM Date: Sun, 15 Dec 2024 19:22:25 +0100 Subject: [PATCH] Integrate logging subproject into base subproject --- base/build.gradle.kts | 6 ------ .../engine/logging/CrashHandler.kt | 0 .../staropensource/engine/logging/Filterer.kt | 0 .../staropensource/engine/logging/Logger.kt | 0 .../engine/logging/LoggerConfiguration.kt | 0 .../engine/logging/Processor.kt | 0 .../engine/logging/ThreadingHandler.kt | 0 .../engine/logging/implementable/Adapter.kt | 0 .../logging/implementable/CrashCategory.kt | 0 .../engine/logging/implementable/Filter.kt | 0 .../logging/implementable/FormatBuilder.kt | 0 .../engine/logging/implementable/Formatter.kt | 0 .../implementable/OneCycleFormatter.kt | 0 .../logging/implementable/ShutdownHandler.kt | 0 .../implementable/TwoCycleFormatter.kt | 0 .../logging/implementable/package-info.kt | 0 .../implementation/KotlinShutdownHandler.kt | 0 .../implementation/NoOperationFormatter.kt | 0 .../logging/implementation/PrintlnAdapter.kt | 0 .../implementation/SOSLSv2FormatBuilder.kt | 0 .../implementation/TwoCycleFormatterImpl.kt | 0 .../crashcategory/InfoCrashCategory.kt | 0 .../crashcategory/package-info.kt | 0 .../logging/implementation/package-info.kt | 0 .../engine/logging/package-info.kt | 0 .../engine/logging/type/Call.kt | 0 .../engine/logging/type/ChannelSettings.kt | 0 .../engine/logging/type/Feature.kt | 0 .../engine/logging/type/FormatBuilder.kt | 0 .../engine/logging/type/Level.kt | 0 .../engine/logging/type/OperationMode.kt | 0 .../engine/logging/type/package-info.kt | 0 logging/build.gradle.kts | 19 ------------------- settings.gradle.kts | 1 - testapp/build.gradle.kts | 1 - 35 files changed, 27 deletions(-) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/CrashHandler.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/Filterer.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/Logger.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/LoggerConfiguration.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/Processor.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/ThreadingHandler.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementable/Adapter.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementable/CrashCategory.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementable/Filter.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementable/FormatBuilder.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementable/Formatter.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementable/OneCycleFormatter.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementable/ShutdownHandler.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementable/TwoCycleFormatter.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementable/package-info.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementation/KotlinShutdownHandler.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementation/NoOperationFormatter.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementation/PrintlnAdapter.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementation/SOSLSv2FormatBuilder.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementation/TwoCycleFormatterImpl.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementation/crashcategory/InfoCrashCategory.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementation/crashcategory/package-info.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/implementation/package-info.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/package-info.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/type/Call.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/type/ChannelSettings.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/type/Feature.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/type/FormatBuilder.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/type/Level.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/type/OperationMode.kt (100%) rename {logging => base}/src/main/kotlin/de/staropensource/engine/logging/type/package-info.kt (100%) delete mode 100644 logging/build.gradle.kts diff --git a/base/build.gradle.kts b/base/build.gradle.kts index f99dc77..8947aa1 100644 --- a/base/build.gradle.kts +++ b/base/build.gradle.kts @@ -17,9 +17,3 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ - -// Dependencies -dependencies { - // sos!engine - implementation(project(":logging")) -} diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/CrashHandler.kt b/base/src/main/kotlin/de/staropensource/engine/logging/CrashHandler.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/CrashHandler.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/CrashHandler.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/Filterer.kt b/base/src/main/kotlin/de/staropensource/engine/logging/Filterer.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/Filterer.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/Filterer.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/Logger.kt b/base/src/main/kotlin/de/staropensource/engine/logging/Logger.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/Logger.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/Logger.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/LoggerConfiguration.kt b/base/src/main/kotlin/de/staropensource/engine/logging/LoggerConfiguration.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/LoggerConfiguration.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/LoggerConfiguration.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/Processor.kt b/base/src/main/kotlin/de/staropensource/engine/logging/Processor.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/Processor.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/Processor.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/ThreadingHandler.kt b/base/src/main/kotlin/de/staropensource/engine/logging/ThreadingHandler.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/ThreadingHandler.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/ThreadingHandler.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementable/Adapter.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementable/Adapter.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementable/Adapter.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementable/Adapter.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementable/CrashCategory.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementable/CrashCategory.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementable/CrashCategory.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementable/CrashCategory.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementable/Filter.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementable/Filter.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementable/Filter.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementable/Filter.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementable/FormatBuilder.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementable/FormatBuilder.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementable/FormatBuilder.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementable/FormatBuilder.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementable/Formatter.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementable/Formatter.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementable/Formatter.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementable/Formatter.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementable/OneCycleFormatter.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementable/OneCycleFormatter.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementable/OneCycleFormatter.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementable/OneCycleFormatter.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementable/ShutdownHandler.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementable/ShutdownHandler.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementable/ShutdownHandler.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementable/ShutdownHandler.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementable/TwoCycleFormatter.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementable/TwoCycleFormatter.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementable/TwoCycleFormatter.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementable/TwoCycleFormatter.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementable/package-info.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementable/package-info.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementable/package-info.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementable/package-info.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementation/KotlinShutdownHandler.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementation/KotlinShutdownHandler.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementation/KotlinShutdownHandler.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementation/KotlinShutdownHandler.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementation/NoOperationFormatter.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementation/NoOperationFormatter.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementation/NoOperationFormatter.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementation/NoOperationFormatter.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementation/PrintlnAdapter.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementation/PrintlnAdapter.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementation/PrintlnAdapter.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementation/PrintlnAdapter.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementation/SOSLSv2FormatBuilder.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementation/SOSLSv2FormatBuilder.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementation/SOSLSv2FormatBuilder.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementation/SOSLSv2FormatBuilder.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementation/TwoCycleFormatterImpl.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementation/TwoCycleFormatterImpl.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementation/TwoCycleFormatterImpl.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementation/TwoCycleFormatterImpl.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementation/crashcategory/InfoCrashCategory.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementation/crashcategory/InfoCrashCategory.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementation/crashcategory/InfoCrashCategory.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementation/crashcategory/InfoCrashCategory.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementation/crashcategory/package-info.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementation/crashcategory/package-info.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementation/crashcategory/package-info.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementation/crashcategory/package-info.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/implementation/package-info.kt b/base/src/main/kotlin/de/staropensource/engine/logging/implementation/package-info.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/implementation/package-info.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/implementation/package-info.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/package-info.kt b/base/src/main/kotlin/de/staropensource/engine/logging/package-info.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/package-info.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/package-info.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/type/Call.kt b/base/src/main/kotlin/de/staropensource/engine/logging/type/Call.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/type/Call.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/type/Call.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/type/ChannelSettings.kt b/base/src/main/kotlin/de/staropensource/engine/logging/type/ChannelSettings.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/type/ChannelSettings.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/type/ChannelSettings.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/type/Feature.kt b/base/src/main/kotlin/de/staropensource/engine/logging/type/Feature.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/type/Feature.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/type/Feature.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/type/FormatBuilder.kt b/base/src/main/kotlin/de/staropensource/engine/logging/type/FormatBuilder.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/type/FormatBuilder.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/type/FormatBuilder.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/type/Level.kt b/base/src/main/kotlin/de/staropensource/engine/logging/type/Level.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/type/Level.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/type/Level.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/type/OperationMode.kt b/base/src/main/kotlin/de/staropensource/engine/logging/type/OperationMode.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/type/OperationMode.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/type/OperationMode.kt diff --git a/logging/src/main/kotlin/de/staropensource/engine/logging/type/package-info.kt b/base/src/main/kotlin/de/staropensource/engine/logging/type/package-info.kt similarity index 100% rename from logging/src/main/kotlin/de/staropensource/engine/logging/type/package-info.kt rename to base/src/main/kotlin/de/staropensource/engine/logging/type/package-info.kt diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts deleted file mode 100644 index 8947aa1..0000000 --- a/logging/build.gradle.kts +++ /dev/null @@ -1,19 +0,0 @@ -/* - * STAROPENSOURCE ENGINE SOURCE FILE - * Copyright (c) 2024 The StarOpenSource Engine Authors - * Licensed under the GNU Affero General Public License v3 - * with an exception allowing classpath linking. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ diff --git a/settings.gradle.kts b/settings.gradle.kts index 41420e5..41ad465 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -23,6 +23,5 @@ rootProject.name = "sos!engine" // Subprojects include("") // scan root -include("logging") include("base") include("testapp") diff --git a/testapp/build.gradle.kts b/testapp/build.gradle.kts index 7e79036..1621e9a 100644 --- a/testapp/build.gradle.kts +++ b/testapp/build.gradle.kts @@ -27,7 +27,6 @@ plugins { // Dependencies dependencies { // sos!engine - implementation(project(":logging")) implementation(project(":base")) }