From 07364c8298ea07202f8da2aa3624c63878241683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E6=B1=A0?= Date: Sun, 10 Mar 2024 02:26:53 +0800 Subject: [PATCH] =?UTF-8?q?`Shamrock`:=20=E4=BF=AE=E5=A4=8Dkritor=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 白池 --- annotations/build.gradle.kts | 2 +- .../java/moe/fuqiuluo/symbols/Protobuf.kt | 2 ++ buildSrc/src/main/kotlin/Dependencies.kt | 3 -- kritor | 2 +- processor/build.gradle.kts | 2 +- protobuf/build.gradle.kts | 2 +- .../oidb/cmd0x11c5/NtV2RichMediaRsp.kt | 2 +- .../protobuf/oidb/cmd0x388/Cmd0x388Req.kt | 2 +- .../protobuf/oidb/cmd0x388/Cmd0x388Rsp.kt | 2 +- xposed/build.gradle.kts | 31 ++++++++++++++----- 10 files changed, 33 insertions(+), 17 deletions(-) diff --git a/annotations/build.gradle.kts b/annotations/build.gradle.kts index cebd7f6..dbb3902 100644 --- a/annotations/build.gradle.kts +++ b/annotations/build.gradle.kts @@ -9,6 +9,6 @@ java { } dependencies { - implementation(DEPENDENCY_PROTOBUF) + //implementation(DEPENDENCY_PROTOBUF) implementation(kotlinx("serialization-protobuf", "1.6.2")) } \ No newline at end of file diff --git a/annotations/src/main/java/moe/fuqiuluo/symbols/Protobuf.kt b/annotations/src/main/java/moe/fuqiuluo/symbols/Protobuf.kt index a9e148e..43ec4e3 100644 --- a/annotations/src/main/java/moe/fuqiuluo/symbols/Protobuf.kt +++ b/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> inline fun > ByteArray.decodeProtobuf(to: KClass? = null): T { diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 9717f3b..b289728 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -7,9 +7,6 @@ val DEPENDENCY_ANDROIDX = arrayOf( "androidx.activity:activity-compose:1.7.2", ) - -const val DEPENDENCY_PROTOBUF = "com.google.protobuf:protobuf-java:3.24.0" - fun room(name: String) = "androidx.room:room-$name:${Versions.roomVersion}" fun kotlinx(name: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$name:$version" diff --git a/kritor b/kritor index 1d0e13d..0dd59dd 160000 --- a/kritor +++ b/kritor @@ -1 +1 @@ -Subproject commit 1d0e13d88729263caeded17889a5d21fa808cbaa +Subproject commit 0dd59dd2d43324ba13f14e2b8ebc5df07ed9821d diff --git a/processor/build.gradle.kts b/processor/build.gradle.kts index fc61b86..22df2e4 100644 --- a/processor/build.gradle.kts +++ b/processor/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { implementation("com.google.devtools.ksp:symbol-processing-api:1.9.21-1.0.15") implementation("com.squareup:kotlinpoet:1.14.2") - implementation(DEPENDENCY_PROTOBUF) + //implementation(DEPENDENCY_PROTOBUF) implementation(kotlinx("serialization-protobuf", "1.6.2")) ksp("dev.zacsweers.autoservice:auto-service-ksp:1.1.0") diff --git a/protobuf/build.gradle.kts b/protobuf/build.gradle.kts index 4125f0b..db8dae5 100644 --- a/protobuf/build.gradle.kts +++ b/protobuf/build.gradle.kts @@ -37,7 +37,7 @@ android { } dependencies { - implementation(DEPENDENCY_PROTOBUF) + //implementation(DEPENDENCY_PROTOBUF) implementation(kotlinx("serialization-protobuf", "1.6.2")) implementation(kotlinx("serialization-json", "1.6.2")) diff --git a/protobuf/src/main/java/protobuf/oidb/cmd0x11c5/NtV2RichMediaRsp.kt b/protobuf/src/main/java/protobuf/oidb/cmd0x11c5/NtV2RichMediaRsp.kt index bf5fd13..96b8f28 100644 --- a/protobuf/src/main/java/protobuf/oidb/cmd0x11c5/NtV2RichMediaRsp.kt +++ b/protobuf/src/main/java/protobuf/oidb/cmd0x11c5/NtV2RichMediaRsp.kt @@ -1,7 +1,7 @@ @file:OptIn(ExperimentalSerializationApi::class) package protobuf.oidb.cmd0x11c5 -import com.google.protobuf.Internal.EMPTY_BYTE_ARRAY +import moe.fuqiuluo.symbols.EMPTY_BYTE_ARRAY import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber diff --git a/protobuf/src/main/java/protobuf/oidb/cmd0x388/Cmd0x388Req.kt b/protobuf/src/main/java/protobuf/oidb/cmd0x388/Cmd0x388Req.kt index ea1f666..b7882fe 100644 --- a/protobuf/src/main/java/protobuf/oidb/cmd0x388/Cmd0x388Req.kt +++ b/protobuf/src/main/java/protobuf/oidb/cmd0x388/Cmd0x388Req.kt @@ -1,6 +1,6 @@ package protobuf.oidb.cmd0x388 -import com.google.protobuf.Internal.EMPTY_BYTE_ARRAY +import moe.fuqiuluo.symbols.EMPTY_BYTE_ARRAY import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber import moe.fuqiuluo.symbols.Protobuf diff --git a/protobuf/src/main/java/protobuf/oidb/cmd0x388/Cmd0x388Rsp.kt b/protobuf/src/main/java/protobuf/oidb/cmd0x388/Cmd0x388Rsp.kt index 8d7f107..75f441e 100644 --- a/protobuf/src/main/java/protobuf/oidb/cmd0x388/Cmd0x388Rsp.kt +++ b/protobuf/src/main/java/protobuf/oidb/cmd0x388/Cmd0x388Rsp.kt @@ -2,7 +2,7 @@ package protobuf.oidb.cmd0x388 -import com.google.protobuf.Internal.EMPTY_BYTE_ARRAY +import moe.fuqiuluo.symbols.EMPTY_BYTE_ARRAY import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber diff --git a/xposed/build.gradle.kts b/xposed/build.gradle.kts index c8d9842..8048a78 100644 --- a/xposed/build.gradle.kts +++ b/xposed/build.gradle.kts @@ -75,7 +75,7 @@ dependencies { DEPENDENCY_ANDROIDX.forEach { implementation(it) } - implementation(DEPENDENCY_PROTOBUF) + //implementation(DEPENDENCY_PROTOBUF) implementation(room("runtime")) kapt(room("compiler")) @@ -89,9 +89,8 @@ dependencies { implementation(ktor("serialization", "kotlinx-json")) implementation("io.grpc:grpc-stub:1.62.2") - implementation("io.grpc:grpc-protobuf:1.62.2") - implementation("com.google.protobuf:protobuf-java-util:3.25.1") - implementation("com.google.protobuf:protobuf-kotlin:3.25.3") + implementation("io.grpc:grpc-protobuf-lite:1.62.2") + implementation("com.google.protobuf:protobuf-kotlin-lite:3.25.3") implementation("io.grpc:grpc-kotlin-stub:1.4.1") implementation("io.grpc:grpc-okhttp:1.62.2") @@ -102,11 +101,20 @@ dependencies { androidTestImplementation("androidx.compose.ui:ui-test-junit4") } +tasks.withType().all { + kotlinOptions { + freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn") + } +} + protobuf { protoc { artifact = "com.google.protobuf:protoc:3.25.3" } plugins { + create("java") { + artifact = "io.grpc:protoc-gen-grpc-java:1.62.2" + } create("grpc") { artifact = "io.grpc:protoc-gen-grpc-java:1.62.2" } @@ -117,11 +125,20 @@ protobuf { generateProtoTasks { all().forEach { it.plugins { - create("grpc") - create("grpckt") + create("java") { + option("lite") + } + create("grpc") { + option("lite") + } + create("grpckt") { + option("lite") + } } it.builtins { - create("kotlin") + create("kotlin") { + option("lite") + } } } }