[Pill] Update module structure
This commit is contained in:
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.kotlinNativeDist
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm")
|
kotlin("jvm")
|
||||||
id("jps-compatible")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm")
|
kotlin("jvm")
|
||||||
id("jps-compatible")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm")
|
kotlin("jvm")
|
||||||
id("jps-compatible")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ description = "kotlinp"
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm")
|
kotlin("jvm")
|
||||||
|
id("jps-compatible")
|
||||||
}
|
}
|
||||||
|
|
||||||
val kotlinpAsmVersion = "9.0"
|
val kotlinpAsmVersion = "9.0"
|
||||||
|
|||||||
@@ -10,6 +10,14 @@ plugins {
|
|||||||
kotlin("jvm")
|
kotlin("jvm")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val isNativeBuildToolsProject = rootProject.name == "native-build-tools"
|
||||||
|
|
||||||
|
if (!isNativeBuildToolsProject) {
|
||||||
|
// The module is shared between the main project and 'native-build-tools',
|
||||||
|
// in which there is no 'jps-compatible' plugin configured.
|
||||||
|
apply(plugin = "jps-compatible")
|
||||||
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
@@ -29,7 +37,7 @@ dependencies {
|
|||||||
|
|
||||||
// KT-61897: Workaround for https://github.com/gradle/gradle/issues/26358
|
// KT-61897: Workaround for https://github.com/gradle/gradle/issues/26358
|
||||||
// (wrong conflict resolution, causing selection of not the latest version of `:kotlin-util-klib` module)
|
// (wrong conflict resolution, causing selection of not the latest version of `:kotlin-util-klib` module)
|
||||||
if (rootProject.name == "native-build-tools") {
|
if (isNativeBuildToolsProject) {
|
||||||
implementation("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
|
implementation("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
|
||||||
} else {
|
} else {
|
||||||
implementation(project(":native:kotlin-native-utils"))
|
implementation(project(":native:kotlin-native-utils"))
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import java.nio.file.Paths
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm")
|
kotlin("jvm")
|
||||||
id("jps-compatible")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
Reference in New Issue
Block a user