Skip to content
This repository has been archived by the owner on Oct 11, 2024. It is now read-only.

Commit

Permalink
fix java and kapt
Browse files Browse the repository at this point in the history
  • Loading branch information
greenart7c3 committed Jul 31, 2024
1 parent 38a92cd commit f83ab66
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 7 deletions.
21 changes: 15 additions & 6 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.jetbrains.kotlin.android)
alias(libs.plugins.compose.compiler)
alias(libs.plugins.serialization)
alias(libs.plugins.ktlint)
kotlin("kapt") version "2.0.0"
id("org.jetbrains.kotlin.kapt") version "2.0.0"
}

android {
Expand Down Expand Up @@ -41,8 +43,8 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "1.8"
Expand All @@ -52,9 +54,6 @@ android {
dataBinding = true
viewBinding = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.1"
}
packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
Expand All @@ -70,6 +69,16 @@ android {
}
}

kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_17
}
}

composeCompiler {
reportsDestination = layout.buildDirectory.dir("compose_compiler")
}

dependencies {
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
alias(libs.plugins.compose.compiler) apply false
alias(libs.plugins.ktlint) apply false
alias(libs.plugins.serialization) apply false
kotlin("kapt") version "2.0.0" apply false
id("org.jetbrains.kotlin.kapt") version "2.0.0" apply false
}

tasks.register<Copy>("installGitHook") {
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ kotlin.code.style=official
android.nonTransitiveRClass=true
android.enableR8.fullMode=true
android.nonFinalResIds=false
kapt.use.k2=true

0 comments on commit f83ab66

Please sign in to comment.