Fix plugin loading order for publishing

This commit is contained in:
Alexander Nozik 2021-02-23 13:22:41 +03:00
parent 9c12501a57
commit 133736f00f
3 changed files with 192 additions and 176 deletions

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -20,11 +20,6 @@ open class KScienceCommonPlugin : Plugin<Project> {
registerKScienceExtension() registerKScienceExtension()
repositories.applyRepos() repositories.applyRepos()
// apply dokka for all projects
if (!plugins.hasPlugin("org.jetbrains.dokka")) {
plugins.apply("org.jetbrains.dokka")
}
//Configuration for K-JVM plugin //Configuration for K-JVM plugin
pluginManager.withPlugin("org.jetbrains.kotlin.jvm") { pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
//logger.info("Applying KScience configuration for JVM project") //logger.info("Applying KScience configuration for JVM project")
@ -43,6 +38,22 @@ open class KScienceCommonPlugin : Plugin<Project> {
} }
} }
} }
tasks.withType<KotlinJvmCompile> {
kotlinOptions {
useIR = true
jvmTarget = KScienceVersions.JVM_TARGET.toString()
}
}
extensions.findByType<JavaPluginExtension>()?.apply {
targetCompatibility = KScienceVersions.JVM_TARGET
}
tasks.apply {
withType<Test> {
useJUnitPlatform()
}
}
} }
pluginManager.withPlugin("org.jetbrains.kotlin.js") { pluginManager.withPlugin("org.jetbrains.kotlin.js") {
@ -123,25 +134,23 @@ open class KScienceCommonPlugin : Plugin<Project> {
(tasks.findByName("jsProcessResources") as? Copy)?.apply { (tasks.findByName("jsProcessResources") as? Copy)?.apply {
fromJsDependencies("jsRuntimeClasspath") fromJsDependencies("jsRuntimeClasspath")
} }
}
}
afterEvaluate { extensions.findByType<JavaPluginExtension>()?.apply {
extensions.findByType<JavaPluginExtension>()?.apply { targetCompatibility = KScienceVersions.JVM_TARGET
targetCompatibility = KScienceVersions.JVM_TARGET }
}
tasks.apply { tasks.apply {
withType<KotlinJvmCompile> { withType<Test> {
kotlinOptions { useJUnitPlatform()
useIR = true
jvmTarget = KScienceVersions.JVM_TARGET.toString()
} }
} }
withType<Test> {
useJUnitPlatform()
}
} }
} }
// apply dokka for all projects
if (!plugins.hasPlugin("org.jetbrains.dokka")) {
plugins.apply("org.jetbrains.dokka")
}
} }
} }

View File

@ -15,194 +15,201 @@ private fun Project.isSnapshot() = version.toString().contains("dev") || version
open class KSciencePublishingPlugin : Plugin<Project> { open class KSciencePublishingPlugin : Plugin<Project> {
override fun apply(project: Project): Unit = project.run { override fun apply(project: Project): Unit {
if (plugins.findPlugin("maven-publish") == null) {
plugins.apply("maven-publish")
}
configure<PublishingExtension> { //Add publishing plugin and new publications
plugins.withId("ru.mipt.npm.gradle.js") { project.run {
val kotlin = extensions.findByType<KotlinJsProjectExtension>()!! if (plugins.findPlugin("maven-publish") == null) {
plugins.apply("maven-publish")
val sourcesJar: Jar by project.tasks.creating(Jar::class) {
archiveClassifier.set("sources")
from(kotlin.sourceSets["main"].kotlin)
}
publications {
create("js", MavenPublication::class) {
from(components["kotlin"])
artifact(sourcesJar)
}
}
} }
plugins.withId("ru.mipt.npm.gradle.jvm") {
val kotlin = extensions.findByType<KotlinJvmProjectExtension>()!!
val sourcesJar: Jar by project.tasks.creating(Jar::class) {
archiveClassifier.set("sources")
from(kotlin.sourceSets["main"].kotlin)
}
publications {
create("jvm", MavenPublication::class) {
from(components["kotlin"])
artifact(sourcesJar)
}
}
}
}
project.afterEvaluate {
val githubOrg: String = project.findProperty("githubOrg") as? String ?: "mipt-npm"
val githubProject: String? by project
val vcs = findProperty("vcs") as? String
?: githubProject?.let { "https://github.com/$githubOrg/$it" }
configure<PublishingExtension> { configure<PublishingExtension> {
val dokkaJar: Jar by tasks.creating(Jar::class) { plugins.withId("ru.mipt.npm.gradle.js") {
group = "documentation" val kotlin = extensions.findByType<KotlinJsProjectExtension>()!!
archiveClassifier.set("javadoc")
from(tasks.findByName("dokkaHtml"))
}
// Process each publication we have in this project val sourcesJar: Jar by project.tasks.creating(Jar::class) {
publications.withType<MavenPublication>().forEach { publication -> archiveClassifier.set("sources")
publication.artifact(dokkaJar) from(kotlin.sourceSets["main"].kotlin)
publication.pom { }
name.set(project.name)
description.set(project.description ?: project.name)
vcs?.let { url.set(vcs) }
licenses { publications {
license { create("js", MavenPublication::class) {
name.set("The Apache Software License, Version 2.0") from(components["kotlin"])
url.set("http://www.apache.org/licenses/LICENSE-2.0.txt") artifact(sourcesJar)
distribution.set("repo")
}
}
developers {
developer {
id.set("MIPT-NPM")
name.set("MIPT nuclear physics methods laboratory")
organization.set("MIPT")
organizationUrl.set("http://npm.mipt.ru")
}
}
vcs?.let {
scm {
url.set(vcs)
tag.set(project.version.toString())
//developerConnection = "scm:git:[fetch=]/*ВАША ССЫЛКА НА .git файл*/[push=]/*Повторить предыдущую ссылку*/"
}
} }
} }
} }
val githubUser: String? by project plugins.withId("ru.mipt.npm.gradle.jvm") {
val githubToken: String? by project val kotlin = extensions.findByType<KotlinJvmProjectExtension>()!!
if (githubProject != null && githubUser != null && githubToken != null) { val sourcesJar: Jar by project.tasks.creating(Jar::class) {
project.logger.info("Adding github publishing to project [${project.name}]") archiveClassifier.set("sources")
repositories { from(kotlin.sourceSets["main"].kotlin)
maven { }
name = "github"
url = uri("https://maven.pkg.github.com/mipt-npm/$githubProject/") publications {
credentials { create("jvm", MavenPublication::class) {
username = githubUser from(components["kotlin"])
password = githubToken artifact(sourcesJar)
}
} }
} }
} }
}
}
val spaceRepo: String? by project //configure publications after everything is set in the root project
val spaceUser: String? by project project.rootProject.afterEvaluate {
val spaceToken: String? by project project.run {
val githubOrg: String = project.findProperty("githubOrg") as? String ?: "mipt-npm"
val githubProject: String? by project
val vcs = findProperty("vcs") as? String
?: githubProject?.let { "https://github.com/$githubOrg/$it" }
if (spaceRepo != null && spaceUser != null && spaceToken != null) { configure<PublishingExtension> {
project.logger.info("Adding mipt-npm Space publishing to project [${project.name}]") val dokkaJar: Jar by tasks.creating(Jar::class) {
repositories { group = "documentation"
maven { archiveClassifier.set("javadoc")
name = "space" from(tasks.findByName("dokkaHtml"))
url = uri(spaceRepo!!)
credentials {
username = spaceUser
password = spaceToken
}
}
} }
}
val bintrayOrg = project.findProperty("bintrayOrg") as? String ?: "mipt-npm" // Process each publication we have in this project
val bintrayUser: String? by project publications.withType<MavenPublication>().forEach { publication ->
val bintrayApiKey: String? by project publication.artifact(dokkaJar)
val bintrayPublish: String? by project publication.pom {
name.set(project.name)
description.set(project.description ?: project.name)
vcs?.let { url.set(vcs) }
val bintrayRepo = if (isSnapshot()) { licenses {
"dev" license {
} else { name.set("The Apache Software License, Version 2.0")
findProperty("bintrayRepo") as? String url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
} distribution.set("repo")
}
}
developers {
developer {
id.set("MIPT-NPM")
name.set("MIPT nuclear physics methods laboratory")
organization.set("MIPT")
organizationUrl.set("http://npm.mipt.ru")
}
val projectName = project.name }
vcs?.let {
if (bintrayPublish == "true" && bintrayRepo != null && bintrayUser != null && bintrayApiKey != null) { scm {
project.logger.info("Adding bintray publishing to project [$projectName]") url.set(vcs)
tag.set(project.version.toString())
repositories { //developerConnection = "scm:git:[fetch=]/*ВАША ССЫЛКА НА .git файл*/[push=]/*Повторить предыдущую ссылку*/"
maven { }
name = "bintray"
url = uri(
"https://api.bintray.com/maven/$bintrayOrg/$bintrayRepo/$projectName/;publish=1;override=1"
)
credentials {
username = bintrayUser
password = bintrayApiKey
} }
} }
} }
}
val sonatypePublish: String? by project val githubUser: String? by project
val sonatypeUser: String? by project val githubToken: String? by project
val sonatypePassword: String? by project
val keyId: String? by project if (githubProject != null && githubUser != null && githubToken != null) {
val signingKey: String? = project.logger.info("Adding github publishing to project [${project.name}]")
project.findProperty("signingKey") as? String ?: System.getenv("signingKey") repositories {
val signingKeyPassphrase: String? by project maven {
name = "github"
url = uri("https://maven.pkg.github.com/mipt-npm/$githubProject/")
credentials {
username = githubUser
password = githubToken
}
}
}
}
if (sonatypePublish == "true" && sonatypeUser != null && sonatypePassword != null) { val spaceRepo: String? by project
val sonatypeRepo: String = if (isSnapshot()) { val spaceUser: String? by project
"https://oss.sonatype.org/content/repositories/snapshots" val spaceToken: String? by project
if (spaceRepo != null && spaceUser != null && spaceToken != null) {
project.logger.info("Adding mipt-npm Space publishing to project [${project.name}]")
repositories {
maven {
name = "space"
url = uri(spaceRepo!!)
credentials {
username = spaceUser
password = spaceToken
}
}
}
}
val bintrayOrg = project.findProperty("bintrayOrg") as? String ?: "mipt-npm"
val bintrayUser: String? by project
val bintrayApiKey: String? by project
val bintrayPublish: String? by project
val bintrayRepo = if (isSnapshot()) {
"dev"
} else { } else {
"https://oss.sonatype.org/service/local/staging/deploy/maven2" findProperty("bintrayRepo") as? String
} }
if (plugins.findPlugin("signing") == null) { val projectName = project.name
plugins.apply("signing")
if (bintrayPublish == "true" && bintrayRepo != null && bintrayUser != null && bintrayApiKey != null) {
project.logger.info("Adding bintray publishing to project [$projectName]")
repositories {
maven {
name = "bintray"
url = uri(
"https://api.bintray.com/maven/$bintrayOrg/$bintrayRepo/$projectName/;publish=1;override=1"
)
credentials {
username = bintrayUser
password = bintrayApiKey
}
}
}
} }
extensions.configure<SigningExtension>("signing") { val sonatypePublish: String? by project
if (!signingKey.isNullOrBlank()) { val sonatypeUser: String? by project
//if key is provided, use it val sonatypePassword: String? by project
@Suppress("UnstableApiUsage")
useInMemoryPgpKeys(keyId, signingKey, signingKeyPassphrase)
} // else use file signing
sign(publications)
}
repositories { val keyId: String? by project
maven { val signingKey: String? =
name = "sonatype" project.findProperty("signingKey") as? String ?: System.getenv("signingKey")
url = uri(sonatypeRepo) val signingKeyPassphrase: String? by project
credentials {
username = sonatypeUser if (sonatypePublish == "true" && sonatypeUser != null && sonatypePassword != null) {
password = sonatypePassword val sonatypeRepo: String = if (isSnapshot()) {
"https://oss.sonatype.org/content/repositories/snapshots"
} else {
"https://oss.sonatype.org/service/local/staging/deploy/maven2"
}
if (plugins.findPlugin("signing") == null) {
plugins.apply("signing")
}
extensions.configure<SigningExtension>("signing") {
if (!signingKey.isNullOrBlank()) {
//if key is provided, use it
@Suppress("UnstableApiUsage")
useInMemoryPgpKeys(keyId, signingKey, signingKeyPassphrase)
} // else use file signing
sign(publications)
}
repositories {
maven {
name = "sonatype"
url = uri(sonatypeRepo)
credentials {
username = sonatypeUser
password = sonatypePassword
}
} }
} }
} }