Dev #41

Merged
altavir merged 17 commits from dev into master 2022-03-15 13:06:15 +03:00
7 changed files with 24 additions and 14 deletions
Showing only changes of commit 0ba835925e - Show all commits

View File

@ -1,21 +1,21 @@
[versions] [versions]
tools = "0.10.7" tools = "0.10.7"
kotlin = "1.6.0" kotlin = "1.6.0"
atomicfu = "0.16.3" atomicfu = "0.17.0"
binary-compatibility-validator = "0.8.0" binary-compatibility-validator = "0.8.0"
changelog = "1.3.1" changelog = "1.3.1"
dokka = "1.5.30" dokka = "1.6.0"
kotlin-jupyter = "0.10.3-36" kotlin-jupyter = "0.11.0-6"
kotlinx-benchmark = "0.3.1" kotlinx-benchmark = "0.3.1"
kotlinx-cli = "0.3.3" kotlinx-cli = "0.3.3"
kotlinx-collections-immutable = "0.3.4" kotlinx-collections-immutable = "0.3.4"
kotlinx-coroutines = "1.5.2" kotlinx-coroutines = "1.5.2"
kotlinx-datetime = "0.3.1" kotlinx-datetime = "0.3.1"
kotlinx-html = "0.7.3" kotlinx-html = "0.7.3"
kotlinx-knit = "0.2.3" kotlinx-knit = "0.3.0"
kotlinx-nodejs = "0.0.7" kotlinx-nodejs = "0.0.7"
kotlinx-serialization = "1.3.1" kotlinx-serialization = "1.3.1"
ktor = "1.6.3" ktor = "1.6.5"
xmlutil = "0.83.0" xmlutil = "0.83.0"
yamlkt = "0.10.2" yamlkt = "0.10.2"
jsBom = "0.0.1-pre.265-kotlin-1.5.31" jsBom = "0.0.1-pre.265-kotlin-1.5.31"

View File

@ -17,8 +17,8 @@ import ru.mipt.npm.gradle.internal.fromJsDependencies
@Suppress("UNUSED_VARIABLE") @Suppress("UNUSED_VARIABLE")
public open class KScienceCommonPlugin : Plugin<Project> { public open class KScienceCommonPlugin : Plugin<Project> {
public companion object{ public companion object {
public val defaultJvmArgs: List<String> = listOf("-Xjvm-default=all","-Xlambdas=indy") public val defaultJvmArgs: List<String> = listOf("-Xjvm-default=all", "-Xlambdas=indy")
} }

View File

@ -16,5 +16,5 @@ public open class KScienceMPPlugin : Plugin<Project> {
} }
apply<KScienceCommonPlugin>() apply<KScienceCommonPlugin>()
} }
} }

View File

@ -2,7 +2,10 @@ package ru.mipt.npm.gradle
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.* import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.findPlugin
import org.gradle.kotlin.dsl.invoke
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
/** /**

View File

@ -67,7 +67,12 @@ public class KSciencePublishingExtension(public val project: Project) {
* @param githubOrg the GitHub user or organization. * @param githubOrg the GitHub user or organization.
* @param release whether publish packages in the `release` task to the GitHub repository. * @param release whether publish packages in the `release` task to the GitHub repository.
*/ */
public fun github(githubProject: String, githubOrg: String = "mipt-npm", release: Boolean = false, publish: Boolean = true) { public fun github(
githubProject: String,
githubOrg: String = "mipt-npm",
release: Boolean = false,
publish: Boolean = true
) {
// Automatically initialize VCS using GitHub // Automatically initialize VCS using GitHub
if (!isVcsInitialized) { if (!isVcsInitialized) {
git("https://github.com/$githubOrg/${githubProject}", "https://github.com/$githubOrg/${githubProject}.git") git("https://github.com/$githubOrg/${githubProject}", "https://github.com/$githubOrg/${githubProject}.git")
@ -87,7 +92,10 @@ public class KSciencePublishingExtension(public val project: Project) {
* @param spaceRepo the repository URL. * @param spaceRepo the repository URL.
* @param release whether publish packages in the `release` task to the Space repository. * @param release whether publish packages in the `release` task to the Space repository.
*/ */
public fun space(spaceRepo: String = "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven", release: Boolean = true) { public fun space(
spaceRepo: String = "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven",
release: Boolean = true
) {
project.addSpacePublishing(spaceRepo) project.addSpacePublishing(spaceRepo)
if (release) linkPublicationsToReleaseTask("space") if (release) linkPublicationsToReleaseTask("space")

View File

@ -48,10 +48,10 @@ internal fun Copy.fromJsDependencies(configurationName: String) = project.run {
from(task) from(task)
} }
} }
} }
} }
internal fun KotlinMultiplatformExtension.bundleJsBinaryAsResource(bundleName: String = "js/bundle.js"){ internal fun KotlinMultiplatformExtension.bundleJsBinaryAsResource(bundleName: String = "js/bundle.js") {
js { js {
binaries.executable() binaries.executable()
browser { browser {

View File

@ -2,7 +2,6 @@ package ru.mipt.npm.gradle.internal
import org.apache.tools.ant.taskdefs.condition.Os import org.apache.tools.ant.taskdefs.condition.Os
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.findByType import org.gradle.kotlin.dsl.findByType
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension