feat: マルチプロジェクト構成に

.gitignore

@@ -2,4 +2,5 @@
 /local.properties
 /build/
 /.gradle/
-*.log
+*.log
+build/

build.gradle.kts

@@ -1,60 +1,72 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.util.Properties
-
-
 plugins {
-    kotlin("jvm") version "1.8.0"
-    kotlin("plugin.serialization") version "1.8.0"
+    kotlin("jvm") version "1.8.0" apply false
+    kotlin("plugin.serialization") version "1.8.0" apply false
 }
 
+
+
 group = "org.example"
 version = "1.0-SNAPSHOT"
 
-repositories {
-    mavenCentral()
+allprojects {
+    repositories {
+        mavenCentral()
+    }
 }
 
+subprojects {
+    apply {
+        plugin("org.jetbrains.kotlin.jvm")
+        plugin("org.jetbrains.kotlin.plugin.serialization")
+    }
+
+    group = "org.example"
+    version = "1.0-SNAPSHOT"
 
-tasks.test {
-    val props = Properties()
+    tasks.withType<KotlinCompile> {
+        kotlinOptions.jvmTarget = "1.8"
+    }
+
+    tasks.getByName("test",Test::class) {
+        val props = Properties()
 //
-    try {
-        props.load(file("local.properties").inputStream())
-        systemProperties("multim_misskey_token" to props["multim_misskey_token"])
-        systemProperties("multim_misskey_instance" to props["multim_misskey_instance"])
-
-    } catch (e: Exception) {
-        e.printStackTrace()
-        systemProperties("multim_misskey_token" to System.getenv("multim_misskey_token"))
-        systemProperties("multim_misskey_instance" to System.getenv("multim_misskey_instance"))
+        try {
+            props.load(file("${project.rootProject.projectDir}/local.properties").inputStream())
+            systemProperties("multim_misskey_token" to props["multim_misskey_token"])
+            systemProperties("multim_misskey_instance" to props["multim_misskey_instance"])
+
+        } catch (e: Exception) {
+            e.printStackTrace()
+            systemProperties("multim_misskey_token" to System.getenv("multim_misskey_token"))
+            systemProperties("multim_misskey_instance" to System.getenv("multim_misskey_instance"))
+        }
+
+        useJUnitPlatform()
     }
 
-    useJUnitPlatform()
-}
+    val ktor_version = "2.2.2"
+    dependencies {
+        "implementation"("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1")
+        "implementation"("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
+        "implementation"("io.ktor:ktor-client-core:$ktor_version")
+        "implementation"("io.ktor:ktor-client-cio:$ktor_version")
+        "implementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
+        "implementation"("io.ktor:ktor-client-content-negotiation:$ktor_version")
+        "implementation"("io.ktor:ktor-client-logging:$ktor_version")
+        "implementation"("io.ktor:ktor-client-websockets:$ktor_version")
+        "implementation"("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
-}
 
-val ktor_version = "2.2.2"
-dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
-    implementation("io.ktor:ktor-client-core:$ktor_version")
-    implementation("io.ktor:ktor-client-cio:$ktor_version")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-    implementation("io.ktor:ktor-client-content-negotiation:$ktor_version")
-    implementation("io.ktor:ktor-client-logging:$ktor_version")
-    implementation("io.ktor:ktor-client-websockets:$ktor_version")
-    implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
-
-
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
-    testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.0")
-    testImplementation("org.assertj:assertj-core:3.2.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
-    testImplementation("io.ktor:ktor-client-mock:$ktor_version")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
-    testImplementation("org.slf4j:slf4j-simple:2.0.4")
-    testImplementation("io.github.artsok:rerunner-jupiter:2.1.6")
+        "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.9.0")
+        "testImplementation"("org.junit.jupiter:junit-jupiter-params:5.9.0")
+        "testImplementation"("org.assertj:assertj-core:3.2.0")
+        "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.9.0")
+        "testImplementation"("io.ktor:ktor-client-mock:$ktor_version")
+        "testImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
+        "testImplementation"("org.slf4j:slf4j-simple:2.0.4")
+        "testImplementation"("io.github.artsok:rerunner-jupiter:2.1.6")
+    }
+
 }

src/main/kotlin/dev/usbharu/multim/api/factory/MultiMApis.kt → core/src/main/kotlin/dev/usbharu/multim/factory/MultiMApis.kt

@@ -1,9 +1,9 @@
-package dev.usbharu.multim.api.factory
+package dev.usbharu.multim.factory
 
 import dev.usbharu.multim.api.common.AccountApi
 import dev.usbharu.multim.api.common.StatusApi
 
 abstract class MultiMApis(
     var statusApi: StatusApi,
     var accountApi: AccountApi
-)
+)

src/main/kotlin/dev/usbharu/multim/api/factory/PlatformApiFactory.kt → core/src/main/kotlin/dev/usbharu/multim/factory/PlatformApiFactory.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.multim.api.factory
+package dev.usbharu.multim.factory
 
 import dev.usbharu.multim.api.common.PlatformApis
 import dev.usbharu.multim.model.nodeinfo.NodeInfo
@@ -12,4 +12,4 @@ interface PlatformApiFactory {
         baseUrl: String,
         build: MultiMApis.(PlatformApis) -> Unit = {}
     ): MultiMApis
-}
+}

src/test/kotlin/dev/usbharu/multim/api/common/TestUtil.kt → core/src/test/kotlin/dev/usbharu/multim/api/common/TestUtil.kt

@@ -1,14 +1,11 @@
 package dev.usbharu.multim.api.common
 
-import dev.usbharu.multim.model.misskey.v12.components.Note
-import dev.usbharu.multim.model.misskey.v12.components.UserLite
 import io.ktor.client.*
 import io.ktor.client.engine.mock.*
 import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.request.*
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.jsonObject
 import org.assertj.core.api.Fail.fail
@@ -50,20 +47,7 @@ object TestUtil {
         }
     }
 
-    fun createFakeNote(id: String, userId: String, username: String, text: String?): Note {
-        return Note(
-            id = id,
-            userId = userId,
-            user = UserLite(id = userId, name = username, username = username),
-            text = text
-        )
-    }
-
-    fun createFakeNoteToString(id: String, userId: String, username: String, text: String?): String {
-        return json.encodeToString(createFakeNote(id, userId, username, text))
-    }
-
-    fun checkAuth(
+        fun checkAuth(
         respond: String,
         status: HttpStatusCode = HttpStatusCode.OK,
         headers: Headers = headersOf()

impl/misskey/build.gradle.kts

@@ -0,0 +1,3 @@
+dependencies {
+    implementation(project(":core"))
+}

src/main/kotlin/dev/usbharu/multim/api/factory/impl/DefaultPlatformApiFactory.kt → impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/factory/DefaultPlatformApiFactory.kt

@@ -1,12 +1,12 @@
-package dev.usbharu.multim.api.factory.impl
+package dev.usbharu.multim.misskey.factory
 
 import dev.usbharu.multim.api.common.PlatformApis
-import dev.usbharu.multim.api.common.impl.misskey.MisskeyAccountApi
-import dev.usbharu.multim.api.common.impl.misskey.MisskeyApis
-import dev.usbharu.multim.api.common.impl.misskey.MisskeyStatusApi
-import dev.usbharu.multim.api.factory.MultiMApis
-import dev.usbharu.multim.api.factory.PlatformApiFactory
-import dev.usbharu.multim.api.misskey.v12.MisskeyApiClient
+import dev.usbharu.multim.factory.MultiMApis
+import dev.usbharu.multim.factory.PlatformApiFactory
+import dev.usbharu.multim.misskey.v12.api.MisskeyApis
+import dev.usbharu.multim.misskey.v12.common.api.MisskeyAccountApi
+import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient
+import dev.usbharu.multim.misskey.v12.common.api.MisskeyStatusApi
 import dev.usbharu.multim.model.nodeinfo.NodeInfo
 import io.ktor.client.*
 
@@ -42,4 +42,4 @@ open class DefaultPlatformApiFactory : PlatformApiFactory {
         }
         TODO()
     }
-}
+}

impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/factory/MisskeyMultiMApis.kt

@@ -0,0 +1,8 @@
+package dev.usbharu.multim.misskey.factory
+
+import dev.usbharu.multim.factory.MultiMApis
+import dev.usbharu.multim.misskey.v12.common.api.MisskeyAccountApi
+import dev.usbharu.multim.misskey.v12.common.api.MisskeyStatusApi
+
+class MisskeyMultiMApis(statusApi: MisskeyStatusApi, accountApi: MisskeyAccountApi) :
+    MultiMApis(statusApi, accountApi)

impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Ap.kt

@@ -0,0 +1,11 @@
+package dev.usbharu.multim.misskey.v12.api
+
+import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient
+import dev.usbharu.multim.misskey.v12.model.ApShowRequest
+import dev.usbharu.multim.misskey.v12.model.ApShowResponse
+
+class Ap(val client: MisskeyApiClient) {
+    suspend fun show(apShowRequest: ApShowRequest): ApShowResponse {
+        return client.post(apShowRequest, "api/ap/show")
+    }
+}

src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Following.kt → impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Following.kt

@@ -1,6 +1,7 @@
-package dev.usbharu.multim.api.misskey.v12
+package dev.usbharu.multim.misskey.v12.api
 
-import dev.usbharu.multim.model.misskey.v12.*
+import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient
+import dev.usbharu.multim.misskey.v12.model.*
 
 class Following(val client: MisskeyApiClient) {
     suspend fun create(followingCreateRequest: FollowingCreateRequest): FollowingCreateResponse {
@@ -41,4 +42,4 @@ class Following(val client: MisskeyApiClient) {
             )
         }
     }
-}
+}

src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Miauth.kt → impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Miauth.kt

@@ -1,7 +1,8 @@
-package dev.usbharu.multim.api.misskey.v12
+package dev.usbharu.multim.misskey.v12.api
 
-import dev.usbharu.multim.model.misskey.v12.MiauthCheckRequest
-import dev.usbharu.multim.model.misskey.v12.MiauthCheckResponse
+import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient
+import dev.usbharu.multim.misskey.v12.model.MiauthCheckRequest
+import dev.usbharu.multim.misskey.v12.model.MiauthCheckResponse
 import io.ktor.client.statement.*
 import java.util.*
 

src/main/kotlin/dev/usbharu/multim/api/common/impl/misskey/MisskeyApis.kt → impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/MisskeyApis.kt

@@ -1,7 +1,7 @@
-package dev.usbharu.multim.api.common.impl.misskey
+package dev.usbharu.multim.misskey.v12.api
 
 import dev.usbharu.multim.api.common.PlatformApis
-import dev.usbharu.multim.api.misskey.v12.*
+import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient
 
 class MisskeyApis(misskeyApiClient: MisskeyApiClient) : PlatformApis(misskeyApiClient) {
     val notes = Notes(misskeyApiClient)

src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Notes.kt → impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Notes.kt

@@ -1,6 +1,7 @@
-package dev.usbharu.multim.api.misskey.v12
+package dev.usbharu.multim.misskey.v12.api
 
-import dev.usbharu.multim.model.misskey.v12.*
+import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient
+import dev.usbharu.multim.misskey.v12.model.*
 
 class Notes(val client: MisskeyApiClient) {
 

src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Timeline.kt → impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Timeline.kt

@@ -1,6 +1,7 @@
-package dev.usbharu.multim.api.misskey.v12
+package dev.usbharu.multim.misskey.v12.api
 
-import dev.usbharu.multim.api.misskey.v12.Miauth.Companion.baseUrl
+import dev.usbharu.multim.misskey.v12.api.Miauth.Companion.baseUrl
+import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient
 import io.ktor.client.plugins.websocket.*
 import io.ktor.websocket.*
 import kotlinx.coroutines.async

src/main/kotlin/dev/usbharu/multim/api/misskey/v12/Users.kt → impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/api/Users.kt

@@ -1,6 +1,7 @@
-package dev.usbharu.multim.api.misskey.v12
+package dev.usbharu.multim.misskey.v12.api
 
-import dev.usbharu.multim.model.misskey.v12.*
+import dev.usbharu.multim.misskey.v12.common.api.MisskeyApiClient
+import dev.usbharu.multim.misskey.v12.model.*
 
 class Users(val client: MisskeyApiClient) {
     suspend fun relation(relationRequest: UsersRelationRequest): UsersRelationResponse {
@@ -14,4 +15,4 @@ class Users(val client: MisskeyApiClient) {
     suspend fun show(showRequest: UsersShowRequest): UsersShowResponse {
         return client.post(showRequest, "api/users/show")
     }
-}
+}

src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyAccount.kt → impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyAccount.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.multim.model.common.impl.misskey
+package dev.usbharu.multim.misskey.v12.common
 
 import dev.usbharu.multim.model.common.Account
 import dev.usbharu.multim.model.common.Avatar

src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyAvatar.kt → impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyAvatar.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.multim.model.common.impl.misskey
+package dev.usbharu.multim.misskey.v12.common
 
 import dev.usbharu.multim.model.common.Avatar
 

src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyContent.kt → impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyContent.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.multim.model.common.impl.misskey
+package dev.usbharu.multim.misskey.v12.common
 
 import dev.usbharu.multim.model.common.StatusContent
 

src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyProfile.kt → impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyProfile.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.multim.model.common.impl.misskey
+package dev.usbharu.multim.misskey.v12.common
 
 import dev.usbharu.multim.model.common.Account
 import dev.usbharu.multim.model.common.Field
@@ -12,4 +12,4 @@ class MisskeyProfile(
     followingCount: Int = 0,
     followersCount: Int = 0,
     fields: List<Field> = emptyList()
-) : Profile(account, isBot, profileContent, followingCount, followersCount, fields)
+) : Profile(account, isBot, profileContent, followingCount, followersCount, fields)

src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyProfileContent.kt → impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyProfileContent.kt

@@ -1,5 +1,5 @@
-package dev.usbharu.multim.model.common.impl.misskey
+package dev.usbharu.multim.misskey.v12.common
 
 import dev.usbharu.multim.model.common.ProfileContent
 
-class MisskeyProfileContent(text: String) : ProfileContent(text)
+class MisskeyProfileContent(text: String) : ProfileContent(text)

src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyReaction.kt → impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyReaction.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.multim.model.common.impl.misskey
+package dev.usbharu.multim.misskey.v12.common
 
 import dev.usbharu.multim.model.common.Reaction
 

src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyRelation.kt → impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyRelation.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.multim.model.common.impl.misskey
+package dev.usbharu.multim.misskey.v12.common
 
 import dev.usbharu.multim.model.common.Relation
 
@@ -9,4 +9,4 @@ class MisskeyRelation(
     follower: Boolean,
     mute: Boolean,
     block: Boolean
-) : Relation(myself, other, following, follower, mute, block)
+) : Relation(myself, other, following, follower, mute, block)

src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyStatus.kt → impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyStatus.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.multim.model.common.impl.misskey
+package dev.usbharu.multim.misskey.v12.common
 
 import dev.usbharu.multim.model.common.*
 

src/main/kotlin/dev/usbharu/multim/model/common/impl/misskey/MisskeyStatusId.kt → impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/MisskeyStatusId.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.multim.model.common.impl.misskey
+package dev.usbharu.multim.misskey.v12.common
 
 import dev.usbharu.multim.model.common.StatusId