From 5850f5342dd092bd8849c533e106767a30e9f65f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 13 Nov 2023 09:58:00 +0100
Subject: [PATCH] Move Knit to Gradle catalog and use
 alias(libs.plugins.kotlin.serialization). Fix issue with JNA

---
 app/build.gradle.kts                                 | 2 +-
 features/login/impl/build.gradle.kts                 | 2 +-
 gradle/libs.versions.toml                            | 2 +-
 libraries/matrix/api/build.gradle.kts                | 2 +-
 libraries/matrix/impl/build.gradle.kts               | 4 ++--
 libraries/push/impl/build.gradle.kts                 | 2 +-
 libraries/pushproviders/unifiedpush/build.gradle.kts | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c4ff2bdaf9..69a1877455 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -28,7 +28,7 @@ plugins {
     alias(libs.plugins.ksp)
     alias(libs.plugins.kapt)
     alias(libs.plugins.firebaseAppDistribution)
-    id("org.jetbrains.kotlinx.knit") version "0.4.0"
+    alias(libs.plugins.knit)
     id("kotlin-parcelize")
     // To be able to update the firebase.xml files, uncomment and build the project
     // id("com.google.gms.google-services")
diff --git a/features/login/impl/build.gradle.kts b/features/login/impl/build.gradle.kts
index 3968ef8ab2..227c512043 100644
--- a/features/login/impl/build.gradle.kts
+++ b/features/login/impl/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
     alias(libs.plugins.anvil)
     alias(libs.plugins.ksp)
     id("kotlin-parcelize")
-    kotlin("plugin.serialization") version libs.versions.kotlin
+    alias(libs.plugins.kotlin.serialization)
 }
 
 android {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 225c793e95..3f9ede419f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -162,7 +162,6 @@ maplibre_ktx = "org.maplibre.gl:android-sdk-ktx-v7:2.0.2"
 maplibre_annotation = "org.maplibre.gl:android-plugin-annotation-v9:2.0.2"
 opusencoder = "io.element.android:opusencoder:1.1.0"
 kotlinpoet = "com.squareup:kotlinpoet:1.14.2"
-jna = "net.java.dev.jna:jna:5.13.0@aar"
 
 # Analytics
 posthog = "com.posthog.android:posthog:2.0.3"
@@ -213,6 +212,7 @@ paparazzi = "app.cash.paparazzi:1.3.1"
 kover = "org.jetbrains.kotlinx.kover:0.6.1"
 sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
 firebaseAppDistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebaseAppDistribution" }
+knit = { id = "org.jetbrains.kotlinx.knit", version = "0.4.0" }
 
 # Version '4.3.1.3277' introduced some regressions in CI time (more than 2x slower), so make sure
 # this is no longer the case before upgrading.
diff --git a/libraries/matrix/api/build.gradle.kts b/libraries/matrix/api/build.gradle.kts
index f1fec9b60b..f8a600df1e 100644
--- a/libraries/matrix/api/build.gradle.kts
+++ b/libraries/matrix/api/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
     id("io.element.android-compose-library")
     id("kotlin-parcelize")
     alias(libs.plugins.anvil)
-    kotlin("plugin.serialization") version libs.versions.kotlin
+    alias(libs.plugins.kotlin.serialization)
 }
 
 android {
diff --git a/libraries/matrix/impl/build.gradle.kts b/libraries/matrix/impl/build.gradle.kts
index 026b06f765..81b5f70a11 100644
--- a/libraries/matrix/impl/build.gradle.kts
+++ b/libraries/matrix/impl/build.gradle.kts
@@ -17,7 +17,7 @@
 plugins {
     id("io.element.android-library")
     alias(libs.plugins.anvil)
-    kotlin("plugin.serialization") version libs.versions.kotlin
+    alias(libs.plugins.kotlin.serialization)
 }
 
 android {
@@ -44,7 +44,7 @@ dependencies {
     api(projects.libraries.matrix.api)
     implementation(libs.dagger)
     implementation(projects.libraries.core)
-    implementation(libs.jna)
+    implementation("net.java.dev.jna:jna:5.13.0@aar")
     implementation(libs.androidx.datastore.preferences)
     implementation(libs.serialization.json)
 
diff --git a/libraries/push/impl/build.gradle.kts b/libraries/push/impl/build.gradle.kts
index 65e4c0939f..05f552dd9a 100644
--- a/libraries/push/impl/build.gradle.kts
+++ b/libraries/push/impl/build.gradle.kts
@@ -16,7 +16,7 @@
 plugins {
     id("io.element.android-library")
     alias(libs.plugins.anvil)
-    kotlin("plugin.serialization") version libs.versions.kotlin
+    alias(libs.plugins.kotlin.serialization)
 }
 
 android {
diff --git a/libraries/pushproviders/unifiedpush/build.gradle.kts b/libraries/pushproviders/unifiedpush/build.gradle.kts
index dfc999c897..733309e00d 100644
--- a/libraries/pushproviders/unifiedpush/build.gradle.kts
+++ b/libraries/pushproviders/unifiedpush/build.gradle.kts
@@ -16,7 +16,7 @@
 plugins {
     id("io.element.android-library")
     alias(libs.plugins.anvil)
-    kotlin("plugin.serialization") version libs.versions.kotlin
+    alias(libs.plugins.kotlin.serialization)
 }
 
 android {