kscience/gradle-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 9 Wiki Activity

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
Conversation 0 Commits 54 Files Changed 16 +4 -6
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ed5faa0335 - Show all commits

6
gradle/libs.versions.toml
View File

@ -1,6 +1,6 @@
[versions] [versions]
tools = "0.15.0-kotlin-1.9.20" tools = "0.15.0-kotlin-2.0.0-Beta1"
kotlin = "1.9.20" kotlin = "2.0.0-Beta1"
# https://github.com/Kotlin/kotlinx-atomicfu # https://github.com/Kotlin/kotlinx-atomicfu
atomicfu = "0.22.0" atomicfu = "0.22.0"
# https://github.com/Kotlin/binary-compatibility-validator # https://github.com/Kotlin/binary-compatibility-validator
@ -37,7 +37,7 @@ yamlkt = "0.13.0"
jsBom = "1.0.0-pre.624" jsBom = "1.0.0-pre.624"
junit = "5.9.3" junit = "5.9.3"
# https://github.com/JetBrains/compose-multiplatform # https://github.com/JetBrains/compose-multiplatform
compose = "1.5.3" compose = "1.5.10"
# https://mvnrepository.com/artifact/org.slf4j/slf4j-api # https://mvnrepository.com/artifact/org.slf4j/slf4j-api
slf4j = "2.0.9" slf4j = "2.0.9"
# https://mvnrepository.com/artifact/ch.qos.logback/logback-classic # https://mvnrepository.com/artifact/ch.qos.logback/logback-classic

4
src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt
View File

@ -4,17 +4,15 @@ import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.hasPlugin
import org.gradle.kotlin.dsl.invoke import org.gradle.kotlin.dsl.invoke
import org.jetbrains.dokka.gradle.DokkaPlugin import org.jetbrains.dokka.gradle.DokkaPlugin
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMultiplatformPlugin
import space.kscience.gradle.internal.applySettings import space.kscience.gradle.internal.applySettings
import space.kscience.gradle.internal.defaultKotlinCommonArgs import space.kscience.gradle.internal.defaultKotlinCommonArgs
public open class KScienceMPPlugin : Plugin<Project> { public open class KScienceMPPlugin : Plugin<Project> {
override fun apply(project: Project): Unit = project.run { override fun apply(project: Project): Unit = project.run {
if (!plugins.hasPlugin(KotlinMultiplatformPlugin::class)) { if (!plugins.hasPlugin("org.jetbrains.kotlin.multiplatform")) {
//apply<KotlinMultiplatformPlugin>() for some reason it does not work //apply<KotlinMultiplatformPlugin>() for some reason it does not work
plugins.apply("org.jetbrains.kotlin.multiplatform") plugins.apply("org.jetbrains.kotlin.multiplatform")
} else { } else {