Migrate to ADB kotlin support

Update sourceSets
This commit is contained in:
Geoffroy Bonneville
2026-07-16 18:24:17 -04:00
parent 210b509132
commit 1db7d4f37f
3 changed files with 9 additions and 10 deletions
+1 -1
View File
@@ -23,7 +23,7 @@ buildscript {
} }
plugins { 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 id("com.google.dagger.hilt.android") version "2.60.1" apply false
} }
+7 -7
View File
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins { plugins {
id("com.android.application") id("com.android.application")
id("org.jetbrains.kotlin.android")
id("org.jetbrains.kotlin.plugin.compose") id("org.jetbrains.kotlin.plugin.compose")
id("com.google.devtools.ksp") id("com.google.devtools.ksp")
id("com.google.dagger.hilt.android") id("com.google.dagger.hilt.android")
@@ -36,7 +35,7 @@ android {
} }
sourceSets { sourceSets {
getByName("debug").assets.srcDirs(files("$projectDir/schemas")) getByName("debug").assets.directories.add("$projectDir/schemas")
} }
buildTypes { buildTypes {
@@ -56,11 +55,6 @@ android {
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11
} }
kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_11
}
}
buildFeatures { buildFeatures {
compose = true compose = true
viewBinding = true viewBinding = true
@@ -78,6 +72,12 @@ android {
} }
} }
kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_11
}
}
dependencies { dependencies {
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.11.0") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.11.0")
implementation("androidx.activity:activity-compose:1.13.0") implementation("androidx.activity:activity-compose:1.13.0")
+1 -2
View File
@@ -16,12 +16,11 @@
# This option should only be used with decoupled projects. More details, visit # 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 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true # org.gradle.parallel=true
android.builtInKotlin=false
android.defaults.buildfeatures.resvalues=true android.defaults.buildfeatures.resvalues=true
android.dependency.excludeLibraryComponentsFromConstraints=true
android.dependency.useConstraints=true android.dependency.useConstraints=true
android.enableAppCompileTimeRClass=false android.enableAppCompileTimeRClass=false
android.enableJetifier=false android.enableJetifier=false
android.newDsl=false
android.r8.optimizedResourceShrinking=false android.r8.optimizedResourceShrinking=false
android.r8.strictFullModeForKeepRules=false android.r8.strictFullModeForKeepRules=false
android.sdk.defaultTargetSdkToCompileSdkIfUnset=false android.sdk.defaultTargetSdkToCompileSdkIfUnset=false