kritorをmasterブランチに設定する

kritorをmasterブランチに設定する

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "kritor"]
+	path = kritor
+	url = https://github.com/KarinJS/kritor

README.md

@@ -28,24 +28,8 @@
 ## 兼容|迁移|替代 说明
 
 - 一键移植：本项目基于 go-cqhttp 的文档进行开发实现。
-- 平行部署：可多平台部署，未来将会支持 Docker 部署的教程。
-
-## 相关项目
-
-<table>
-<tr>
-  <td><a href="https://github.com/LagrangeDev/Lagrange.Core">Lagrange.Core</a></td>
-  <td>NTQQ 的协议实现</td>
-</tr>
-<tr>
-  <td><a href="https://github.com/whitechi73/OpenShamrock">OpenShamrock</a></td>
-  <td>基于 Xposed 实现 OneBot 标准的机器人框架（👈你在这里</td>
-</tr>
-<tr>
-  <td><a href="https://github.com/chrononeko/chronocat">Chronocat</a></td>
-  <td>基于 Electron 的、模块化的 Satori 框架</td>
-</tr>
-</table>
+- 平行部署：可多平台部署，未来将会支持 Docker 部署的教程。  
+- 替代方案：[Lagrange.Core](https://github.com/LagrangeDev/Lagrange.Core)
 
 ## 权限声明
 

annotations/build.gradle.kts

@@ -9,6 +9,6 @@ java {
 }
 
 dependencies {
-    implementation(DEPENDENCY_PROTOBUF)
+    //implementation(DEPENDENCY_PROTOBUF)
     implementation(kotlinx("serialization-protobuf", "1.6.2"))
 }

annotations/src/main/java/kritor/service/Grpc.kt

@@ -0,0 +1,11 @@
+package kritor.service
+
+import kotlin.reflect.KClass
+
+@Retention(AnnotationRetention.SOURCE)
+@Target(AnnotationTarget.FUNCTION)
+annotation class Grpc(
+    val serviceName: String,
+    val funcName: String,
+
+)

annotations/src/main/java/moe/fuqiuluo/symbols/Protobuf.kt

@@ -5,6 +5,8 @@ import kotlinx.serialization.protobuf.ProtoBuf
 
 import kotlin.reflect.KClass
 
+val EMPTY_BYTE_ARRAY = ByteArray(0)
+
 interface Protobuf<T: Protobuf<T>>
 
 inline fun <reified T: Protobuf<T>> ByteArray.decodeProtobuf(to: KClass<T>? = null): T {

app/build.gradle.kts

@@ -17,7 +17,7 @@ android {
         minSdk = 27
         targetSdk = 34
         versionCode = getVersionCode()
-        versionName = "1.0.9" + ".r${getGitCommitCount()}." + getVersionName()
+        versionName = "1.1.0" + ".r${getGitCommitCount()}." + getVersionName()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -201,14 +201,8 @@ dependencies {
     implementation("io.coil-kt:coil-compose:2.4.0")
 
     implementation(kotlinx("io-jvm", "0.1.16"))
-    implementation(ktor("server", "core"))
-    implementation(ktor("server", "host-common"))
-    implementation(ktor("server", "status-pages"))
-    implementation(ktor("server", "netty"))
-    implementation(ktor("server", "content-negotiation"))
     implementation(ktor("client", "core"))
-    implementation(ktor("client", "content-negotiation"))
-    implementation(ktor("client", "cio"))
+    implementation(ktor("client", "okhttp"))
     implementation(ktor("serialization", "kotlinx-json"))
 
     implementation(project(":xposed"))

app/src/main/cpp/CMakeLists.txt

@@ -37,7 +37,6 @@ add_library(${CMAKE_PROJECT_NAME} SHARED
     # List C/C++ source files with relative paths to this CMakeLists.txt.
         ${SRC_DIR}
         md5.cpp
-        cqcode.cpp
         silk.cpp
         message.cpp
         shamrock.cpp)