Skip to content

Commit 1ed7371

Browse files
SessionHero01SessionHero01
authored andcommitted
Remove kotlin
1 parent 2a15fe7 commit 1ed7371

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

gradle/libs.versions.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ androidx-test-rules = { module = "androidx.test:rules", version = "1.7.0" }
1010
androidx-test-ext = { module = "androidx.test.ext:junit", version = "1.3.0" }
1111
androidx-annotations = { module = "androidx.annotation:annotation", version = "1.9.1" }
1212
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version = "1.9.0" }
13-
protoc-core = { module = "com.google.protobuf:protoc", version = "4.33.1" }
14-
protoc-kotlin = { module = "com.google.protobuf:protoc-gen-kotlin", version = "1.28.0" }
15-
protobuf-kotlin = { module = "com.google.protobuf:protobuf-kotlin", version.ref = "protobufVersion" }
13+
protoc = { module = "com.google.protobuf:protoc", version = "4.33.1" }
14+
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobufVersion" }
1615

1716
[plugins]
1817
android-library = { id = "com.android.library", version.ref = "agp" }

library/build.gradle.kts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,7 @@ kotlin {
8181

8282
protobuf {
8383
protoc {
84-
artifact = libs.protoc.core.get().toString()
85-
}
86-
87-
plugins {
88-
id("kotlin") {
89-
artifact = libs.protoc.kotlin.get().toString()
90-
}
84+
artifact = libs.protoc.get().toString()
9185
}
9286

9387
plugins {
@@ -147,7 +141,7 @@ dependencies {
147141
implementation(libs.androidx.annotations)
148142
implementation(libs.kotlinx.serialization.core)
149143

150-
api(libs.protobuf.kotlin)
144+
api(libs.protobuf.java)
151145

152146
protobuf(files("../libsession-util/proto/SessionProtos.proto"))
153147
}

0 commit comments

Comments
 (0)