diff --git a/hideout-activitypub/build.gradle.kts b/hideout-activitypub/build.gradle.kts deleted file mode 100644 index e69de29b..00000000 diff --git a/hideout/hideout-activitypub/build.gradle.kts b/hideout/hideout-activitypub/build.gradle.kts index 4cd3df85..2d1c8ef7 100644 --- a/hideout/hideout-activitypub/build.gradle.kts +++ b/hideout/hideout-activitypub/build.gradle.kts @@ -2,23 +2,95 @@ import kotlinx.kover.gradle.plugin.dsl.CoverageUnit plugins { alias(libs.plugins.kotlin.jvm) + alias(libs.plugins.detekt) alias(libs.plugins.kover) + alias(libs.plugins.spring.boot) + alias(libs.plugins.kotlin.spring) } +apply { + plugin("io.spring.dependency-management") +} +group = "dev.usbharu" +version = "1.0-SNAPSHOT" + +repositories { + mavenCentral() + maven { + url = uri("https://git.usbharu.dev/api/packages/usbharu/maven") + } +} + +dependencies { + testImplementation(kotlin("test")) + detektPlugins(libs.detekt.formatting) + implementation(project(":hideout-core")) + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.boot:spring-boot-starter-security") + implementation(libs.bundles.jackson) + implementation(libs.owl.producer.api) + implementation(libs.owl.producer.embedded) + implementation(libs.owl.common.serialize.jackson) +} tasks.test { useJUnitPlatform() } +kotlin { + jvmToolchain(21) +} +configurations { + matching { it.name == "detekt" }.all { + resolutionStrategy.eachDependency { + if (requested.group == "org.jetbrains.kotlin") { + useVersion(io.gitlab.arturbosch.detekt.getSupportedKotlinVersion()) + } + } + } + all { + exclude("org.apache.logging.log4j", "log4j-slf4j2-impl") + } +} + tasks { - -withType { + withType { + exclude("**/generated/**") + setSource("src/main/kotlin") + exclude("build/") + configureEach { + exclude("**/org/koin/ksp/generated/**", "**/generated/**") + } + } + withType() { + configureEach { + exclude("**/org/koin/ksp/generated/**", "**/generated/**") + } + } + withType { useJUnitPlatform() } } + +project.gradle.taskGraph.whenReady { + if (this.hasTask(":koverGenerateArtifact")) { + val task = this.allTasks.find { it.name == "test" } + val verificationTask = task as VerificationTask + verificationTask.ignoreFailures = true + } +} + +detekt { + parallel = true + config.setFrom(files("../detekt.yml")) + buildUponDefaultConfig = true + basePath = "${rootDir.absolutePath}/src/main/kotlin" + autoCorrect = true +} + kover { currentProject { sources { diff --git a/hideout/hideout-activitypub/src/main/kotlin/Main.kt b/hideout/hideout-activitypub/src/main/kotlin/Main.kt deleted file mode 100644 index e69de29b..00000000 diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/actor/GetActorApplicationService.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/actor/GetActorApplicationService.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/actor/GetActorApplicationService.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/actor/GetActorApplicationService.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/ActivityPubSecurityConfig.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/ActivityPubSecurityConfig.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/ActivityPubSecurityConfig.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/ActivityPubSecurityConfig.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/OwlConfig.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/OwlConfig.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/OwlConfig.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/config/OwlConfig.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Announce.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Announce.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Announce.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Announce.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Block.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Block.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Block.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Block.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/ExtendedActivityVocabulary.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/ExtendedActivityVocabulary.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/ExtendedActivityVocabulary.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/ExtendedActivityVocabulary.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/ExtendedVocabulary.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/ExtendedVocabulary.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/ExtendedVocabulary.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/ExtendedVocabulary.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasActor.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasActor.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasActor.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasActor.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasId.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasId.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasId.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasId.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasName.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasName.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasName.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasName.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/JsonLd.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/JsonLd.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/JsonLd.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/JsonLd.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Object.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Object.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Object.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Object.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/ObjectDeserializer.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/ObjectDeserializer.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/ObjectDeserializer.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/ObjectDeserializer.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/ObjectValue.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/ObjectValue.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/ObjectValue.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/ObjectValue.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Reject.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Reject.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Reject.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Reject.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Tombstone.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Tombstone.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Tombstone.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Tombstone.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/shared/jobqueue/TaskPublisher.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/shared/jobqueue/TaskPublisher.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/shared/jobqueue/TaskPublisher.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/shared/jobqueue/TaskPublisher.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/task/Task.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/task/Task.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/task/Task.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/task/Task.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/task/TaskBody.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/task/TaskBody.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/task/TaskBody.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/task/TaskBody.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/owl/OwlTaskPublisher.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/owl/OwlTaskPublisher.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/owl/OwlTaskPublisher.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/owl/OwlTaskPublisher.kt diff --git a/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interface/api/APActorController.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interface/api/APActorController.kt similarity index 100% rename from hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interface/api/APActorController.kt rename to hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interface/api/APActorController.kt