From 1db7d4f37f97e8d5e3fd48df311b1b70582e4a89 Mon Sep 17 00:00:00 2001
From: Geoffroy Bonneville <24917789+wismna@users.noreply.github.com>
Date: Thu, 16 Jul 2026 18:24:17 -0400
Subject: [PATCH] Migrate to ADB kotlin support Update sourceSets

---
 build.gradle              |  2 +-
 donextv2/build.gradle.kts | 14 +++++++-------
 gradle.properties         |  3 +--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 97ec266..1242236 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ buildscript {
 }
 
 plugins {
-    id("com.google.devtools.ksp") version '2.3.2' apply false
+    id("com.google.devtools.ksp") version '2.3.10' apply false
     id("com.google.dagger.hilt.android") version "2.60.1" apply false
 }
 
diff --git a/donextv2/build.gradle.kts b/donextv2/build.gradle.kts
index 5a35fb6..884462d 100644
--- a/donextv2/build.gradle.kts
+++ b/donextv2/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
-    id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.plugin.compose")
     id("com.google.devtools.ksp")
     id("com.google.dagger.hilt.android")
@@ -36,7 +35,7 @@ android {
     }
 
     sourceSets {
-        getByName("debug").assets.srcDirs(files("$projectDir/schemas"))
+        getByName("debug").assets.directories.add("$projectDir/schemas")
     }
 
     buildTypes {
@@ -56,11 +55,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_11
-        }
-    }
     buildFeatures {
         compose = true
         viewBinding = true
@@ -78,6 +72,12 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_11
+    }
+}
+
 dependencies {
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.11.0")
     implementation("androidx.activity:activity-compose:1.13.0")
diff --git a/gradle.properties b/gradle.properties
index 1040884..0ee08cb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,12 +16,11 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-android.builtInKotlin=false
 android.defaults.buildfeatures.resvalues=true
+android.dependency.excludeLibraryComponentsFromConstraints=true
 android.dependency.useConstraints=true
 android.enableAppCompileTimeRClass=false
 android.enableJetifier=false
-android.newDsl=false
 android.r8.optimizedResourceShrinking=false
 android.r8.strictFullModeForKeepRules=false
 android.sdk.defaultTargetSdkToCompileSdkIfUnset=false