From 6ee2bf690960bd62e06ce67b9da9e2d2e5f8cbd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20M=C3=A9a?= <mathieu.mea@gmail.com>
Date: Tue, 3 Feb 2026 16:23:17 -0500
Subject: [PATCH 1/3] APG 9.0.0 migration

- https://github.com/mtransitapps/commons-java/pull/14
- https://github.com/mtransitapps/commons/pull/523
---
 build.gradle | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4b9c2c9e..16905208 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
+            // allWarningsAsErrors = true // replaced by "DeprecatedCall" in lint
+        }
     }
 
     namespace = "org.mtransit.android.commons"

From 210761fa121325a3db24f5190a1b41326880c165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20M=C3=A9a?= <mathieu.mea@gmail.com>
Date: Tue, 3 Feb 2026 16:42:42 -0500
Subject: [PATCH 2/3] clean

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 16905208..8329ad1d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ android {
     }
     kotlin {
         compilerOptions {
-            jvmTarget = rootProject.kotlinJvmTarget
+            // jvmTarget = rootProject.kotlinJvmTarget // same as android.compileOptions.targetCompatibility
             // allWarningsAsErrors = true // replaced by "DeprecatedCall" in lint
         }
     }

From cb8355dda7bdd41874af30c4f4d08742d027c1fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20M=C3=A9a?= <mathieu.mea@gmail.com>
Date: Wed, 4 Feb 2026 10:55:05 -0500
Subject: [PATCH 3/3] wip

---
 build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.gradle b/build.gradle
index 8329ad1d..df35d90d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -102,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)
@@ -124,6 +125,9 @@ protobuf {
                 java {
                     option("lite")
                 }
+                kotlin {
+                    option("lite")
+                }
             }
         }
     }