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

Merge remote-tracking branch 'space/dev' into dev

Browse Source
This commit is contained in:
Alexander Nozik 2022-11-02 18:34:40 +03:00
commit c9440e7fc9
No known key found for this signature in database
GPG Key ID: F7FCF2DD25C71357
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/kotlin/space/kscience/gradle/KScienceExtension.kt
View File

@ -212,8 +212,10 @@ public enum class KotlinNativePreset {
linuxX64, linuxX64,
mingwX64, mingwX64,
macosX64, macosX64,
macosArm64,
iosX64, iosX64,
iosArm64 iosArm64,
iosSimulatorArm64,
} }
public data class KScienceNativeTarget( public data class KScienceNativeTarget(
@ -225,8 +227,10 @@ public data class KScienceNativeTarget(
public val linuxX64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.linuxX64) public val linuxX64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.linuxX64)
public val mingwX64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.mingwX64) public val mingwX64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.mingwX64)
public val macosX64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.macosX64) public val macosX64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.macosX64)
public val macosArm64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.macosX64)
public val iosX64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.iosX64) public val iosX64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.iosX64)
public val iosArm64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.iosArm64) public val iosArm64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.iosArm64)
public val iosSimulatorArm64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.iosSimulatorArm64)
} }
} }
@ -235,15 +239,17 @@ public class KScienceNativeConfiguration {
KScienceNativeTarget.linuxX64, KScienceNativeTarget.linuxX64,
KScienceNativeTarget.mingwX64, KScienceNativeTarget.mingwX64,
KScienceNativeTarget.macosX64, KScienceNativeTarget.macosX64,
KScienceNativeTarget.macosArm64,
KScienceNativeTarget.iosX64, KScienceNativeTarget.iosX64,
KScienceNativeTarget.iosArm64, KScienceNativeTarget.iosArm64,
).associateBy { it.preset }.toMutableMap() KScienceNativeTarget.iosSimulatorArm64,
).associateByTo(mutableMapOf()) { it.preset }
/** /**
* Replace all targets * Replace all targets
*/ */
public fun setTargets(vararg target: KScienceNativeTarget) { public fun setTargets(vararg target: KScienceNativeTarget) {
targets = target.associateBy { it.preset }.toMutableMap() targets = target.associateByTo(mutableMapOf()) { it.preset }
} }
/** /**
@ -325,6 +331,11 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro
nativeTarget.targetConfiguration nativeTarget.targetConfiguration
) )
KotlinNativePreset.macosArm64 -> macosX64(
nativeTarget.targetName,
nativeTarget.targetConfiguration
)
KotlinNativePreset.iosX64 -> iosX64( KotlinNativePreset.iosX64 -> iosX64(
nativeTarget.targetName, nativeTarget.targetName,
nativeTarget.targetConfiguration nativeTarget.targetConfiguration
@ -335,6 +346,11 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro
nativeTarget.targetConfiguration nativeTarget.targetConfiguration
) )
KotlinNativePreset.iosSimulatorArm64 -> iosArm64(
nativeTarget.targetName,
nativeTarget.targetConfiguration
)
// else -> { // else -> {
// logger.error("Native preset ${nativeTarget.preset} not recognised.") // logger.error("Native preset ${nativeTarget.preset} not recognised.")
// null // null

2
src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt
View File

@ -254,7 +254,7 @@ public open class KScienceProjectPlugin : Plugin<Project> {
val pattern = "publish(?<publication>.*)PublicationTo${repositoryNameCapitalized}Repository" val pattern = "publish(?<publication>.*)PublicationTo${repositoryNameCapitalized}Repository"
.toRegex() .toRegex()
tasks.withType<PublishToMavenRepository>().toList().forEach forEachPublication@{ tasks.withType<PublishToMavenRepository>().forEach forEachPublication@{
val matchResult = pattern.matchEntire(it.name) ?: return@forEachPublication val matchResult = pattern.matchEntire(it.name) ?: return@forEachPublication
val publicationName = matchResult.groups["publication"]!!.value.capitalize() val publicationName = matchResult.groups["publication"]!!.value.capitalize()
val releaseTaskName = "release$publicationName" val releaseTaskName = "release$publicationName"