mirror of
https://github.com/iSoron/uhabits.git
synced 2025-12-06 01:08:50 -06:00
Merge branch 'improve-gradle' into dev
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
|
||||
plugins {
|
||||
kotlin("multiplatform")
|
||||
id("org.jlleitschuh.gradle.ktlint")
|
||||
alias(libs.plugins.ktlint.plugin)
|
||||
}
|
||||
|
||||
kotlin {
|
||||
@@ -30,7 +30,7 @@ kotlin {
|
||||
val commonMain by getting {
|
||||
dependencies {
|
||||
implementation(kotlin("stdlib-common"))
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.8")
|
||||
implementation(libs.kotlinx.coroutines.core.common)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,14 +44,14 @@ kotlin {
|
||||
val jvmMain by getting {
|
||||
dependencies {
|
||||
implementation(kotlin("stdlib-jdk8"))
|
||||
compileOnly("com.google.dagger:dagger:2.51.1")
|
||||
implementation("com.google.guava:guava:33.1.0-android")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.1")
|
||||
implementation("androidx.annotation:annotation:1.7.1")
|
||||
implementation("com.google.code.findbugs:jsr305:3.0.2")
|
||||
implementation("com.opencsv:opencsv:5.9")
|
||||
implementation("commons-codec:commons-codec:1.16.0")
|
||||
implementation("org.apache.commons:commons-lang3:3.14.0")
|
||||
compileOnly(libs.dagger)
|
||||
implementation(libs.guava)
|
||||
implementation(libs.kotlinx.coroutines.core.jvm)
|
||||
implementation(libs.annotation)
|
||||
implementation(libs.jsr305)
|
||||
implementation(libs.opencsv)
|
||||
implementation(libs.commons.codec)
|
||||
implementation(libs.commons.lang3)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,19 +59,16 @@ kotlin {
|
||||
dependencies {
|
||||
implementation(kotlin("test"))
|
||||
implementation(kotlin("test-junit"))
|
||||
implementation("org.xerial:sqlite-jdbc:3.45.1.0")
|
||||
implementation("org.hamcrest:hamcrest:2.2")
|
||||
implementation("org.apache.commons:commons-io:1.3.2")
|
||||
implementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
|
||||
implementation("org.junit.jupiter:junit-jupiter:5.10.1")
|
||||
implementation(libs.sqlite.jdbc)
|
||||
implementation(libs.hamcrest)
|
||||
implementation(libs.commons.io)
|
||||
implementation(libs.mockito.kotlin)
|
||||
implementation(libs.junit.jupiter)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tasks.named<org.gradle.language.jvm.tasks.ProcessResources>("jvmProcessResources") {
|
||||
duplicatesStrategy = DuplicatesStrategy.INCLUDE
|
||||
}
|
||||
tasks.named<org.gradle.language.jvm.tasks.ProcessResources>("jvmTestProcessResources") {
|
||||
tasks.withType<ProcessResources> {
|
||||
duplicatesStrategy = DuplicatesStrategy.INCLUDE
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user