改名, 修正包名

README.MD

@@ -22,7 +22,7 @@ build.gradle.kts
 
 ```kotlin
 maven {
-    url = uri("https://maven.pkg.github.com/Nyayurn/yutorix-satori")
+    url = uri("https://maven.pkg.github.com/Nyayurin/yutorix-satori")
     credentials {
         username = project.findProperty("gpr.actor") as String? ?: System.getenv("GITHUB_ACTOR")
         password = project.findProperty("gpr.token") as String? ?: System.getenv("GITHUB_TOKEN")
@@ -34,7 +34,7 @@ settings.gradle.kts
 
 ```kotlin
 maven {     
-    url = uri("https://maven.pkg.github.com/Nyayurn/yutorix-satori")
+    url = uri("https://maven.pkg.github.com/Nyayurin/yutorix-satori")
     credentials {
         username = providers.gradleProperty("gpr.actor").orNull ?: System.getenv("GITHUB_ACTOR")
         password = providers.gradleProperty("gpr.token").orNull ?: System.getenv("GITHUB_TOKEN")
@@ -55,12 +55,12 @@ implementation(libs.yutorix.satori.server) // 可选
 yutorix-satori = "version"
 
 [libraries]
-yutorix-satori-core = { module = "cn.yurn.yutorix:yutorix-satori-core", version.ref = "yutorix-satori" }
-yutorix-satori-adapter = { module = "cn.yurn.yutorix:yutorix-satori-adapter", version.ref = "yutorix-satori" }
-yutorix-satori-server = { module = "cn.yurn.yutorix:yutorix-satori-server", version.ref = "yutorix-satori" }
+yutorix-satori-core = { module = "cn.yurin.yutorix:yutorix-satori-core", version.ref = "yutorix-satori" }
+yutorix-satori-adapter = { module = "cn.yurin.yutorix:yutorix-satori-adapter", version.ref = "yutorix-satori" }
+yutorix-satori-server = { module = "cn.yurin.yutorix:yutorix-satori-server", version.ref = "yutorix-satori" }
 ```
 
-请从 [Github Packages](https://github.com/Nyayurn?tab=packages&repo_name=yutorix-satori) 获取版本<br>
+请从 [Github Packages](https://github.com/Nyayurin?tab=packages&repo_name=yutorix-satori) 获取版本<br>
 对于稳定版, 它的版本号应该和 Release 中的 tag 一致<br>
 对于开发板, 它的版本号应该和 Commit 的完整 SHA 值一致<br>
 要获取一个 Commit 的完整 SHA 值, 请在 Commits 页面对应 Commit 处点击 Commit ID 右侧的复制按钮(Copy full SHA for *******)

adapter/src/commonMain/kotlin/cn/yurn/yutori/module/satori/adapter/ActionService.kt → adapter/src/commonMain/kotlin/cn/yurin/yutorix/module/satori/adapter/ActionService.kt

@@ -5,7 +5,7 @@
     "UastIncorrectHttpHeaderInspection", "UNCHECKED_CAST"
 )
 
-package cn.yurn.yutori.module.satori.adapter
+package cn.yurin.yutorix.module.satori.adapter
 
 import cn.yurn.yutori.AdapterActionService
 import cn.yurn.yutori.Channel
@@ -17,17 +17,17 @@ import cn.yurn.yutori.Message
 import cn.yurn.yutori.User
 import cn.yurn.yutori.Yutori
 import cn.yurn.yutori.message.element.MessageElement
-import cn.yurn.yutori.module.satori.SatoriAdapterProperties
-import cn.yurn.yutori.module.satori.SerializableBidiPagingList
-import cn.yurn.yutori.module.satori.SerializableChannel
-import cn.yurn.yutori.module.satori.SerializableGuild
-import cn.yurn.yutori.module.satori.SerializableGuildMember
-import cn.yurn.yutori.module.satori.SerializableGuildRole
-import cn.yurn.yutori.module.satori.SerializableLogin
-import cn.yurn.yutori.module.satori.SerializableMessage
-import cn.yurn.yutori.module.satori.SerializablePagingList
-import cn.yurn.yutori.module.satori.SerializableUser
-import cn.yurn.yutori.module.satori.serialize
+import cn.yurin.yutorix.module.satori.SatoriAdapterProperties
+import cn.yurin.yutorix.module.satori.SerializableBidiPagingList
+import cn.yurin.yutorix.module.satori.SerializableChannel
+import cn.yurin.yutorix.module.satori.SerializableGuild
+import cn.yurin.yutorix.module.satori.SerializableGuildMember
+import cn.yurin.yutorix.module.satori.SerializableGuildRole
+import cn.yurin.yutorix.module.satori.SerializableLogin
+import cn.yurin.yutorix.module.satori.SerializableMessage
+import cn.yurin.yutorix.module.satori.SerializablePagingList
+import cn.yurin.yutorix.module.satori.SerializableUser
+import cn.yurin.yutorix.module.satori.serialize
 import co.touchlab.kermit.Logger
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body

adapter/src/commonMain/kotlin/cn/yurn/yutori/module/satori/adapter/Adapter.kt → adapter/src/commonMain/kotlin/cn/yurin/yutorix/module/satori/adapter/Adapter.kt

@@ -1,13 +1,13 @@
 @file:Suppress("MemberVisibilityCanBePrivate", "unused", "HttpUrlsUsage")
 
-package cn.yurn.yutori.module.satori.adapter
+package cn.yurin.yutorix.module.satori.adapter
 
 import cn.yurn.yutori.Adapter
 import cn.yurn.yutori.BuilderMarker
 import cn.yurn.yutori.Login
 import cn.yurn.yutori.Reinstallable
 import cn.yurn.yutori.Yutori
-import cn.yurn.yutori.module.satori.SatoriAdapterProperties
+import cn.yurin.yutorix.module.satori.SatoriAdapterProperties
 import co.touchlab.kermit.Logger
 import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.delay

adapter/src/commonMain/kotlin/cn/yurn/yutori/module/satori/adapter/EventService.kt → adapter/src/commonMain/kotlin/cn/yurin/yutorix/module/satori/adapter/EventService.kt

@@ -1,6 +1,6 @@
 @file:Suppress("MemberVisibilityCanBePrivate", "HttpUrlsUsage")
 
-package cn.yurn.yutori.module.satori.adapter
+package cn.yurin.yutorix.module.satori.adapter
 
 import cn.yurn.yutori.AdapterContext
 import cn.yurn.yutori.AdapterEventService
@@ -10,14 +10,14 @@ import cn.yurn.yutori.MessageEvents
 import cn.yurn.yutori.RootActions
 import cn.yurn.yutori.SigningEvent
 import cn.yurn.yutori.Yutori
-import cn.yurn.yutori.module.satori.EventSignal
-import cn.yurn.yutori.module.satori.Identify
-import cn.yurn.yutori.module.satori.IdentifySignal
-import cn.yurn.yutori.module.satori.PingSignal
-import cn.yurn.yutori.module.satori.PongSignal
-import cn.yurn.yutori.module.satori.ReadySignal
-import cn.yurn.yutori.module.satori.SatoriAdapterProperties
-import cn.yurn.yutori.module.satori.Signal
+import cn.yurin.yutorix.module.satori.EventSignal
+import cn.yurin.yutorix.module.satori.Identify
+import cn.yurin.yutorix.module.satori.IdentifySignal
+import cn.yurin.yutorix.module.satori.PingSignal
+import cn.yurin.yutorix.module.satori.PongSignal
+import cn.yurin.yutorix.module.satori.ReadySignal
+import cn.yurin.yutorix.module.satori.SatoriAdapterProperties
+import cn.yurin.yutorix.module.satori.Signal
 import cn.yurn.yutori.nick
 import co.touchlab.kermit.Logger
 import io.ktor.client.HttpClient

build.gradle.kts

@@ -8,13 +8,13 @@ plugins {
 subprojects {
     apply(plugin = "maven-publish")
 
-    group = "cn.yurn.yutorix"
+    group = "cn.yurin.yutorix"
 
     configure<PublishingExtension> {
         repositories {
             maven {
                 name = "GitHubPackages"
-                url = uri("https://maven.pkg.github.com/Nyayurn/yutorix-satori")
+                url = uri("https://maven.pkg.github.com/Nyayurin/yutorix-satori")
                 credentials {
                     username = System.getenv("GITHUB_ACTOR")
                     password = System.getenv("GITHUB_TOKEN")

core/build.gradle.kts

@@ -95,7 +95,7 @@ kotlin {
 }
 
 android {
-    namespace = "cn.yurn.yutorix.satori.core"
+    namespace = "cn.yurin.yutorix.satori.core"
     compileSdk = 34
 
     defaultConfig {
@@ -113,17 +113,17 @@ publishing {
             name = "Yutorix-Satori-Core"
             version = System.getenv("VERSION")
             description = "Kotlin Multiplatform library"
-            url = "https://github.com/Nyayurn/yutorix-satori"
+            url = "https://github.com/Nyayurin/yutorix-satori"
 
             developers {
                 developer {
-                    id = "Nyayurn"
-                    name = "Yurn"
+                    id = "Nyayurin"
+                    name = "Yurin"
                     email = "[email protected]"
                 }
             }
             scm {
-                url = "https://github.com/Nyayurn/yutorix-satori"
+                url = "https://github.com/Nyayurin/yutorix-satori"
             }
         }
     }

core/src/commonMain/kotlin/cn/yurn/yutori/module/satori/Entity.kt → core/src/commonMain/kotlin/cn/yurin/yutorix/module/satori/Entity.kt

@@ -1,6 +1,6 @@
 @file:Suppress("UNCHECKED_CAST")
 
-package cn.yurn.yutori.module.satori
+package cn.yurin.yutorix.module.satori
 
 import cn.yurn.yutori.BidiPagingList
 import cn.yurn.yutori.Channel

core/src/commonMain/kotlin/cn/yurn/yutori/module/satori/Serializer.kt → core/src/commonMain/kotlin/cn/yurin/yutorix/module/satori/Serializer.kt

@@ -1,4 +1,4 @@
-package cn.yurn.yutori.module.satori
+package cn.yurin.yutorix.module.satori
 
 import kotlinx.serialization.ContextualSerializer
 import kotlinx.serialization.ExperimentalSerializationApi

core/src/commonMain/kotlin/cn/yurn/yutori/module/satori/Util.kt → core/src/commonMain/kotlin/cn/yurin/yutorix/module/satori/Util.kt

@@ -1,6 +1,6 @@
 @file:Suppress("unused")
 
-package cn.yurn.yutori.module.satori
+package cn.yurin.yutorix.module.satori
 
 import cn.yurn.yutori.Yutori
 import cn.yurn.yutori.message.element.MessageElement

server/build.gradle.kts

@@ -68,7 +68,7 @@ kotlin {
 }
 
 android {
-    namespace = "cn.yurn.yutorix.satori.server"
+    namespace = "cn.yurin.yutorix.satori.server"
     compileSdk = 34
 
     defaultConfig {
@@ -86,17 +86,17 @@ publishing {
             name = "Yutorix-Satori-Server"
             version = System.getenv("VERSION")
             description = "Kotlin Multiplatform library"
-            url = "https://github.com/Nyayurn/yutorix-satori"
+            url = "https://github.com/Nyayurin/yutorix-satori"
 
             developers {
                 developer {
-                    id = "Nyayurn"
-                    name = "Yurn"
+                    id = "Nyayurin"
+                    name = "Yurin"
                     email = "[email protected]"
                 }
             }
             scm {
-                url = "https://github.com/Nyayurn/yutorix-satori"
+                url = "https://github.com/Nyayurin/yutorix-satori"
             }
         }
     }

server/src/commonMain/kotlin/cn/yurn/yutori/module/satori/server/Server.kt → server/src/commonMain/kotlin/cn/yurin/yutorix/module/satori/server/Server.kt

@@ -1,14 +1,14 @@
 @file:Suppress("MemberVisibilityCanBePrivate", "unused", "HttpUrlsUsage")
 
-package cn.yurn.yutori.module.satori.server
+package cn.yurin.yutorix.module.satori.server
 
 import cn.yurn.yutori.BuilderMarker
 import cn.yurn.yutori.Event
 import cn.yurn.yutori.Reinstallable
 import cn.yurn.yutori.Server
 import cn.yurn.yutori.SigningEvent
 import cn.yurn.yutori.Yutori
-import cn.yurn.yutori.module.satori.SatoriServerProperties
+import cn.yurin.yutorix.module.satori.SatoriServerProperties
 import kotlinx.atomicfu.atomic
 
 fun Server.Companion.satori(alias: String? = null) = SatoriServer(alias)

server/src/commonMain/kotlin/cn/yurn/yutori/module/satori/server/ServerService.kt → server/src/commonMain/kotlin/cn/yurin/yutorix/module/satori/server/ServerService.kt

@@ -1,4 +1,4 @@
-package cn.yurn.yutori.module.satori.server
+package cn.yurin.yutorix.module.satori.server
 
 import cn.yurn.yutori.Event
 import cn.yurn.yutori.Login
@@ -8,20 +8,20 @@ import cn.yurn.yutori.ServerContext
 import cn.yurn.yutori.ServerService
 import cn.yurn.yutori.SigningEvent
 import cn.yurn.yutori.Yutori
-import cn.yurn.yutori.module.satori.EventSignal
-import cn.yurn.yutori.module.satori.IdentifySignal
-import cn.yurn.yutori.module.satori.PingSignal
-import cn.yurn.yutori.module.satori.PongSignal
-import cn.yurn.yutori.module.satori.Ready
-import cn.yurn.yutori.module.satori.ReadySignal
-import cn.yurn.yutori.module.satori.SatoriServerProperties
-import cn.yurn.yutori.module.satori.SerializableBidiPagingList
-import cn.yurn.yutori.module.satori.SerializableChannel
-import cn.yurn.yutori.module.satori.SerializableEvent
-import cn.yurn.yutori.module.satori.SerializableGuildRole
-import cn.yurn.yutori.module.satori.SerializableLogin
-import cn.yurn.yutori.module.satori.Signal
-import cn.yurn.yutori.module.satori.deserialize
+import cn.yurin.yutorix.module.satori.EventSignal
+import cn.yurin.yutorix.module.satori.IdentifySignal
+import cn.yurin.yutorix.module.satori.PingSignal
+import cn.yurin.yutorix.module.satori.PongSignal
+import cn.yurin.yutorix.module.satori.Ready
+import cn.yurin.yutorix.module.satori.ReadySignal
+import cn.yurin.yutorix.module.satori.SatoriServerProperties
+import cn.yurin.yutorix.module.satori.SerializableBidiPagingList
+import cn.yurin.yutorix.module.satori.SerializableChannel
+import cn.yurin.yutorix.module.satori.SerializableEvent
+import cn.yurin.yutorix.module.satori.SerializableGuildRole
+import cn.yurin.yutorix.module.satori.SerializableLogin
+import cn.yurin.yutorix.module.satori.Signal
+import cn.yurin.yutorix.module.satori.deserialize
 import co.touchlab.kermit.Logger
 import io.ktor.http.HttpStatusCode
 import io.ktor.serialization.kotlinx.KotlinxWebsocketSerializationConverter

settings.gradle.kts

@@ -11,7 +11,7 @@ pluginManagement {
 dependencyResolutionManagement {
     repositories {
         maven {
-            url = uri("https://maven.pkg.github.com/Nyayurn/yutori")
+            url = uri("https://maven.pkg.github.com/Nyayurin/yutori")
             credentials {
                 username = providers.gradleProperty("gpr.actor").orNull ?: System.getenv("GITHUB_ACTOR")
                 password = providers.gradleProperty("gpr.token").orNull ?: System.getenv("GITHUB_TOKEN")