diff --git a/app/build.gradle b/app/build.gradle index 4dc81d9..27f3eb1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -220,9 +220,13 @@ android { dependencies { implementation fileTree(dir: 'libs', include: '*.jar') - implementation 'com.paulmandal.atak:libcotshrink:1.0.4' + implementation ('com.paulmandal.atak:libcotshrink:1.0.4') { + exclude group: 'com.google.protobuf', module: 'protobuf-javalite' + } implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc" - implementation 'com.google.protobuf:protobuf-kotlin-lite:3.21.12' + implementation 'com.google.protobuf:protobuf-kotlin:3.21.12' + + @@ -231,22 +235,22 @@ dependencies { protobuf { protoc { - artifact = 'com.google.protobuf:protoc:3.21.9' + artifact = 'com.google.protobuf:protoc:3.21.12' } + /* plugins { javalite { // The codegen for lite comes as a separate artifact artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0' } } + */ generateProtoTasks { all().each { task -> task.builtins { java { - option 'lite' } kotlin { - option 'lite' } } } diff --git a/app/src/main/protobufs b/app/src/main/protobufs index 1bfe035..86640f2 160000 --- a/app/src/main/protobufs +++ b/app/src/main/protobufs @@ -1 +1 @@ -Subproject commit 1bfe0354d101a6a71ea1354ea158e59193671a0b +Subproject commit 86640f20db7b9b5be42949d18e8d96ad10d47a68