Add protobuf-kotlin-lite and use new builders

grote · Sep 6, 2024 · 4a55998 · 4a55998
1 parent 68da53b
commit 4a55998
Show file tree

Hide file tree

Showing 18 changed files with 1,081 additions and 178 deletions.
diff --git a/Android.bp b/Android.bp
@@ -9,6 +9,8 @@ android_app {
         "app/src/main/java/**/*.kt",
         "app/src/main/java/**/*.java",
         "app/src/main/proto/*.proto",
+        // as of Android 15, there is no way to pass --kotlin_out to aprotoc compiler
+        "app/build/generated/source/proto/debug/kotlin/com/stevesoltys/seedvault/proto/*.kt",
     ],
     resource_dirs: [
         "app/src/main/res",
@@ -33,6 +35,7 @@ android_app {
         "kotlinx-coroutines-android",
         "kotlinx-coroutines-core",
         // app backup related libs
+        "seedvault-lib-protobuf-kotlin-lite",
         "seedvault-lib-kotlin-logging-jvm",
         "seedvault-lib-chunker",
         "seedvault-lib-zstd-jni",

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -111,6 +111,9 @@ android {
                     id("java") {
                         option("lite")
                     }
+                    id("kotlin") {
+                        option("lite")
+                    }
                 }
             }
         }
@@ -177,6 +180,9 @@ dependencies {
     implementation(fileTree("${rootProject.rootDir}/libs/koin-android").include("*.jar"))
     implementation(fileTree("${rootProject.rootDir}/libs/koin-android").include("*.aar"))
 
+    implementation(
+        fileTree("${rootProject.rootDir}/libs").include("protobuf-kotlin-lite-3.21.12.jar")
+    )
     implementation(fileTree("${rootProject.rootDir}/libs").include("seedvault-chunker-0.1.jar"))
     implementation(fileTree("${rootProject.rootDir}/libs").include("zstd-jni-1.5.6-5.aar"))
     implementation(fileTree("${rootProject.rootDir}/libs").include("kotlin-bip39-jvm-1.0.6.jar"))