Cleanup and rework build logic (#3113)
# Conflicts: # app/build.gradle.kts # app/shortcuts.xml # app/src/main/res/xml/shortcuts.xml # app/src/main/shortcuts.xml # build.gradle.kts # buildSrc/src/main/kotlin/mihon/buildlogic/AndroidConfig.kt # core/archive/build.gradle.kts # core/common/build.gradle.kts # gradle/build-logic/src/main/kotlin/mihon/gradle/BuildConfig.kt # settings.gradle.kts # source-api/build.gradle.kts # source-local/build.gradle.kts # telemetry/build.gradle.kts
This commit is contained in:
+31
-32
@@ -1,39 +1,46 @@
|
||||
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
|
||||
|
||||
plugins {
|
||||
id("mihon.library")
|
||||
kotlin("multiplatform")
|
||||
kotlin("plugin.serialization")
|
||||
alias(mihonx.plugins.kotlin.multiplatform)
|
||||
alias(mihonx.plugins.spotless)
|
||||
|
||||
alias(libs.plugins.kotlin.serialization)
|
||||
|
||||
id("com.github.ben-manes.versions")
|
||||
}
|
||||
|
||||
kotlin {
|
||||
androidTarget()
|
||||
sourceSets {
|
||||
val commonMain by getting {
|
||||
dependencies {
|
||||
api(libs.kotlinx.serialization.json)
|
||||
api(libs.injekt)
|
||||
api(libs.rxJava)
|
||||
api(libs.jsoup)
|
||||
android {
|
||||
namespace = "eu.kanade.tachiyomi.source"
|
||||
|
||||
implementation(project.dependencies.platform(libs.androidx.compose.bom))
|
||||
implementation(libs.androidx.compose.runtime)
|
||||
|
||||
// SY -->
|
||||
api(projects.i18n)
|
||||
api(projects.i18nSy)
|
||||
api(libs.kotlin.reflect)
|
||||
// SY <--
|
||||
}
|
||||
defaultConfig {
|
||||
consumerProguardFile("consumer-proguard.pro")
|
||||
}
|
||||
val androidMain by getting {
|
||||
}
|
||||
|
||||
@OptIn(ExperimentalKotlinGradlePluginApi::class)
|
||||
@Suppress("UnstableApiUsage")
|
||||
dependencies {
|
||||
api(libs.kotlinx.serialization.json)
|
||||
api(libs.injekt)
|
||||
api(libs.rxJava)
|
||||
api(libs.jsoup)
|
||||
|
||||
implementation(platform(libs.androidx.compose.bom))
|
||||
implementation(libs.androidx.compose.runtime)
|
||||
|
||||
// SY -->
|
||||
api(projects.i18n)
|
||||
api(projects.i18nSy)
|
||||
api(libs.kotlin.reflect)
|
||||
// SY <--
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
androidMain {
|
||||
dependencies {
|
||||
implementation(projects.core.common)
|
||||
api(libs.androidx.preference)
|
||||
|
||||
// Workaround for https://youtrack.jetbrains.com/issue/KT-57605
|
||||
implementation(libs.kotlinx.coroutines.android)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -43,11 +50,3 @@ kotlin {
|
||||
freeCompilerArgs.add("-Xexpect-actual-classes")
|
||||
}
|
||||
}
|
||||
|
||||
android {
|
||||
namespace = "eu.kanade.tachiyomi.source"
|
||||
|
||||
defaultConfig {
|
||||
consumerProguardFile("consumer-proguard.pro")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user