Skip to content

Commit 864f9ac

Browse files
committed
Merge branch 'protobuf-cleanup' into main
2 parents 57cf887 + 90c36af commit 864f9ac

File tree

3 files changed

+0
-24
lines changed

3 files changed

+0
-24
lines changed

app/build.gradle.kts

-18
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ plugins {
66
id("com.google.dagger.hilt.android")
77
id("kotlin-kapt")
88
id("com.google.devtools.ksp")
9-
id("com.google.protobuf")
109
kotlin("plugin.serialization")
1110
}
1211

@@ -115,7 +114,6 @@ dependencies {
115114

116115
// DataStore
117116
implementation("androidx.datastore:datastore:1.0.0")
118-
implementation("com.google.protobuf:protobuf-javalite:3.22.2")
119117
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
120118

121119
// Coil
@@ -155,19 +153,3 @@ fun getApiKey(): String {
155153

156154
return apikeyProperties.getProperty("API_KEY")
157155
}
158-
159-
protobuf {
160-
protoc {
161-
artifact = "com.google.protobuf:protoc:3.24.4"
162-
}
163-
164-
generateProtoTasks {
165-
all().forEach { task ->
166-
task.builtins {
167-
create("java") {
168-
option("lite")
169-
}
170-
}
171-
}
172-
}
173-
}

app/proguard-rules.pro

-5
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,3 @@
1010
-keepclasseswithmembers,allowobfuscation class * {
1111
@com.google.gson.annotations.SerializedName <fields>;
1212
}
13-
14-
# Proto DataStore
15-
-keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite {
16-
<fields>;
17-
}

build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ plugins {
44
id("org.jetbrains.kotlin.android") version "1.8.20" apply false
55
id("com.google.dagger.hilt.android") version "2.48.1" apply false
66
id("com.google.devtools.ksp") version "1.8.20-1.0.11" apply false
7-
id("com.google.protobuf") version "0.9.4" apply false
87
kotlin("plugin.serialization") version "1.8.20" apply false
98
}

0 commit comments

Comments
 (0)