Skip to content

Commit 55698a1

Browse files
committed
chore: remove legacy Google Protobuf dependencies and configuration
1 parent 9063a3f commit 55698a1

File tree

5 files changed

+2
-8
lines changed

5 files changed

+2
-8
lines changed

app/proguard-rules.pro

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#-renamesourcefileattribute SourceFile
2222

2323
# Needed for protobufs
24-
-keep class com.google.protobuf.** { *; }
2524
-keep class org.meshtastic.proto.** { *; }
2625

2726
# eclipse.paho.client

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ plugins {
3434
alias(libs.plugins.kotlin.multiplatform) apply false
3535
alias(libs.plugins.kotlin.parcelize) apply false
3636
alias(libs.plugins.kotlin.serialization) apply false
37-
alias(libs.plugins.protobuf) apply false
3837
alias(libs.plugins.secrets) apply false
3938
alias(libs.plugins.detekt) apply false
4039
alias(libs.plugins.kover)

compose_compiler_config.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ org.meshtastic.core.database.model.Node
77
org.meshtastic.core.database.model.Message
88
org.meshtastic.core.database.entity.Reaction
99
org.meshtastic.proto.**
10-
com.google.protobuf.ByteString
10+
java.time.ZoneId
11+
java.time.ZoneOffset

core/network/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ plugins {
3737
alias(libs.plugins.meshtastic.android.library)
3838
alias(libs.plugins.meshtastic.hilt)
3939
alias(libs.plugins.kotlin.serialization)
40-
alias(libs.plugins.protobuf)
4140
}
4241

4342
configure<LibraryExtension> {

gradle/libs.versions.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ detekt = "1.23.8"
4141
devtools-ksp = "2.3.4"
4242
markdownRenderer = "0.39.1"
4343
osmdroid-android = "6.1.20"
44-
protobuf = "4.33.4"
4544
wire = "6.0.0-alpha01"
4645

4746

@@ -111,8 +110,6 @@ maps-compose = { module = "com.google.maps.android:maps-compose", version.ref =
111110
maps-compose-utils = { module = "com.google.maps.android:maps-compose-utils", version.ref = "maps-compose" }
112111
maps-compose-widgets = { module = "com.google.maps.android:maps-compose-widgets", version.ref = "maps-compose" }
113112
play-services-maps = { module = "com.google.android.gms:play-services-maps", version = "20.0.0" }
114-
protobuf-kotlin = { module = "com.google.protobuf:protobuf-kotlin", version.ref = "protobuf" }
115-
protobuf-protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" }
116113
zxing-core = { module = "com.google.zxing:core", version = "3.5.4" }
117114
truth = { module = "com.google.truth:truth", version = "1.4.5" }
118115

@@ -231,7 +228,6 @@ datadog = { id = "com.datadoghq.dd-sdk-android-gradle-plugin", version = "1.21.0
231228
# Removed dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version = "3.5.1" }
232229
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
233230
dokka = { id = "org.jetbrains.dokka", version = "2.1.0" }
234-
protobuf = { id = "com.google.protobuf", version = "0.9.6" }
235231
room = { id = "androidx.room", version.ref = "room" }
236232
spotless = { id = "com.diffplug.spotless", version = "8.1.0" }
237233
wire = { id = "com.squareup.wire", version.ref = "wire" }

0 commit comments

Comments
 (0)