diff --git a/build.gradle b/build.gradle
index 4b9c2c9e..df35d90d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.gradle.androidCacheFix)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlinx.serialization)
     alias(libs.plugins.protobuf)
 }
@@ -20,9 +19,11 @@ android {
         sourceCompatibility = rootProject.javaVersion
         targetCompatibility = rootProject.javaVersion
     }
-    kotlinOptions {
-        jvmTarget = rootProject.javaVersion
-        // allWarningsAsErrors = true // replaced by "DeprecatedCall" in lint
+    kotlin {
+        compilerOptions {
+            // jvmTarget = rootProject.kotlinJvmTarget // same as android.compileOptions.targetCompatibility
+            // allWarningsAsErrors = true // replaced by "DeprecatedCall" in lint
+        }
     }
 
     namespace = "org.mtransit.android.commons"
@@ -101,6 +102,7 @@ dependencies {
     implementation(libs.play.appUpdate)
     implementation(libs.protobuf.javaLite)
     // implementation(libs.protobuf.java)
+    implementation(libs.protobuf.kotlin)
     implementation(libs.bundles.retrofit)
     implementation(platform(libs.okhttp.bom))
     implementation(libs.bundles.okHttp)
@@ -123,6 +125,9 @@ protobuf {
                 java {
                     option("lite")
                 }
+                kotlin {
+                    option("lite")
+                }
             }
         }
     }