0.15.8-kotlin-2.1.0 #51

Merged
altavir merged 54 commits from dev into master 2024-12-09 09:49:38 +03:00
3 changed files with 5 additions and 36 deletions
Showing only changes of commit 4f41d90308 - Show all commits

View File

@ -10,11 +10,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add development mode for fullstack. - Add development mode for fullstack.
### Changed ### Changed
- Kotlin 1.9.20
- Remove publishing defaults for Space and GitHub. Now publishing repositories is configured quasi-manually. Property keys for username and tokens are generated automatically.
- All publishing targets are enabled by default. Introduce `publishing.targets` variable to regulate what is added to the module. - All publishing targets are enabled by default. Introduce `publishing.targets` variable to regulate what is added to the module.
### Deprecated ### Deprecated
### Removed ### Removed
- Unnecessary `dependsOn` for native dependencies.
- Groovy gradle dependency notation. - Groovy gradle dependency notation.
### Fixed ### Fixed

View File

@ -1,5 +1,5 @@
[versions] [versions]
tools = "0.14.11-kotlin-1.9.20-Beta" tools = "0.15.0-kotlin-1.9.20-Beta"
kotlin = "1.9.20-Beta" kotlin = "1.9.20-Beta"
# https://github.com/Kotlin/kotlinx-atomicfu # https://github.com/Kotlin/kotlinx-atomicfu
atomicfu = "0.22.0" atomicfu = "0.22.0"

View File

@ -503,8 +503,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro
val nativeConfiguration = KScienceNativeConfiguration(this).apply(block) val nativeConfiguration = KScienceNativeConfiguration(this).apply(block)
pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") { pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
configure<KotlinMultiplatformExtension> { configure<KotlinMultiplatformExtension> {
val nativeTargets: List<KotlinNativeTarget> = nativeConfiguration.targets.values.forEach { nativeTarget ->
nativeConfiguration.targets.values.map { nativeTarget ->
when (nativeTarget.preset) { when (nativeTarget.preset) {
KotlinNativePreset.linuxX64 -> linuxX64( KotlinNativePreset.linuxX64 -> linuxX64(
nativeTarget.targetName, nativeTarget.targetName,
@ -540,42 +539,9 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro
nativeTarget.targetName, nativeTarget.targetName,
nativeTarget.targetConfiguration nativeTarget.targetConfiguration
) )
// else -> {
// logger.error("Native preset ${nativeTarget.preset} not recognised.")
// null
// }
} }
} }
sourceSets {
val commonMain by getting
val commonTest by getting
val nativeMain by creating {
dependsOn(commonMain)
}
val nativeTest by creating {
//should NOT depend on nativeMain because automatic dependency by plugin
dependsOn(commonTest)
}
configure(nativeTargets) {
compilations["main"]?.apply {
configure(kotlinSourceSets) {
dependsOn(nativeMain)
}
}
compilations["test"]?.apply {
configure(kotlinSourceSets) {
dependsOn(nativeTest)
}
}
}
}
} }
} }
} }