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

0.7.6 #6

Merged
altavir merged 11 commits from dev into master 2021-02-06 16:25:34 +03:00
Conversation 0 Commits 11 Files Changed 12 +158 -119
12 changed files with 158 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -7,18 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Added
- Ktor version to versions
### Changed
- Kotlin to 1.4.30 stable
- Added intermediate jsCommon main/test sourcesSet for node plugin
### Deprecated
### Removed
- kaml
### Fixed
### Security
## [0.7.0]
## [0.7.4]
### Added
- Changelog plugin automatically applied to `project`.
@ -26,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add `binary-compatibility-validator` to the `project` plugin.
- Separate `yamlKt` serialization target
- Moved all logic to a common plugin, leaving only proxies for platform plugins
- Suppress API validation for modules with maturity below DEVELOPMENT
### Changed
- Remove node plugin. Node binaries should be turned on manually.
@ -35,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Platform plugins are now simple references to common plugin
- FX configuration moved to extension
- Moved internals to internals
- Kotlin 1.4.30-RC
### Deprecated
- Support of `kaml` and `snake-yaml` in favor of `yamlKt`

12
build.gradle.kts
View File

@ -2,11 +2,11 @@ plugins {
`java-gradle-plugin`
`kotlin-dsl`
`maven-publish`
id("org.jetbrains.changelog") version "0.6.2"
id("org.jetbrains.changelog") version "1.0.0"
}
group = "ru.mipt.npm"
version = "0.7.1"
version = "0.7.6"
repositories {
gradlePluginPortal()
@ -16,7 +16,7 @@ repositories {
maven("https://dl.bintray.com/kotlin/kotlin-dev")
}
val kotlinVersion = "1.4.21"
val kotlinVersion = "1.4.30"
java {
targetCompatibility = JavaVersion.VERSION_1_8
@ -26,11 +26,11 @@ java {
dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
implementation("org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion")
implementation("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.15.0")
implementation("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.15.1")
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.4.20")
implementation("org.jetbrains.dokka:dokka-base:1.4.20")
implementation("org.jetbrains.intellij.plugins:gradle-changelog-plugin:0.6.2")
implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.2.4")
implementation("org.jetbrains.intellij.plugins:gradle-changelog-plugin:1.0.0")
implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.4.0")
}
gradlePlugin {

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

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

10
src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt
View File

@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import ru.mipt.npm.gradle.internal.applyRepos
import ru.mipt.npm.gradle.internal.applySettings
import ru.mipt.npm.gradle.internal.fromDependencies
import ru.mipt.npm.gradle.internal.fromJsDependencies
open class KScienceCommonPlugin : Plugin<Project> {
override fun apply(project: Project): Unit = project.run {
@ -67,7 +67,7 @@ open class KScienceCommonPlugin : Plugin<Project> {
}
(tasks.findByName("processResources") as? Copy)?.apply {
fromDependencies("runtimeClasspath")
fromJsDependencies("runtimeClasspath")
}
}
@ -79,7 +79,7 @@ open class KScienceCommonPlugin : Plugin<Project> {
jvm {
compilations.all {
kotlinOptions {
// useIR = true
useIR = true
jvmTarget = KScienceVersions.JVM_TARGET.toString()
}
}
@ -121,7 +121,7 @@ open class KScienceCommonPlugin : Plugin<Project> {
}
(tasks.findByName("jsProcessResources") as? Copy)?.apply {
fromDependencies("jsRuntimeClasspath")
fromJsDependencies("jsRuntimeClasspath")
}
}
}
@ -134,7 +134,7 @@ open class KScienceCommonPlugin : Plugin<Project> {
tasks.apply {
withType<KotlinJvmCompile> {
kotlinOptions {
// useIR = true
useIR = true
jvmTarget = KScienceVersions.JVM_TARGET.toString()
}
}

5
src/main/kotlin/ru/mipt/npm/gradle/KScienceNativePlugin.kt
View File

@ -39,14 +39,13 @@ class KScienceNativePlugin : Plugin<Project> {
sourceSets{
val commonMain by getting
val commonTest by getting
val nativeMain by creating{
dependsOn(commonMain)
}
val commonTest by getting
val nativeTest by creating{
dependsOn(nativeMain)
dependsOn(commonTest)
}

25
src/main/kotlin/ru/mipt/npm/gradle/KScienceNodePlugin.kt
View File

@ -26,18 +26,33 @@ class KScienceNodePlugin : Plugin<Project> {
}
sourceSets {
val commonMain by getting
val nodeMain by creating {
val commonTest by getting
val jsCommonMain by creating{
dependsOn(commonMain)
}
val jsCommonTest by creating{
dependsOn(commonTest)
}
val jsMain by getting{
dependsOn(jsCommonMain)
}
val jsTest by getting{
dependsOn(jsCommonTest)
}
val nodeMain by creating {
dependsOn(jsCommonMain)
dependencies{
api("org.jetbrains.kotlinx:kotlinx-nodejs:${KScienceVersions.kotlinxNodeVersion}")
}
}
val commonTest by getting
val nodeTest by creating {
dependsOn(nodeMain)
dependsOn(commonTest)
dependsOn(jsCommonTest)
}
}
}

72
src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt
View File

@ -8,11 +8,11 @@ import org.gradle.kotlin.dsl.*
import org.jetbrains.changelog.ChangelogPlugin
import org.jetbrains.dokka.gradle.DokkaPlugin
import org.jetbrains.dokka.gradle.DokkaTask
import java.io.File
import kotlin.collections.component1
import kotlin.collections.component2
class KSciencePublishingExtension(val project: Project) {
var vcs: String? by project.extra
var githubOrg: String? by project.extra
var githubProject: String? by project.extra
var spaceRepo: String? by project.extra
@ -24,76 +24,6 @@ class KSciencePublishingExtension(val project: Project) {
var bintrayRepo: String? by project.extra
}
enum class Maturity {
PROTOTYPE,
EXPERIMENTAL,
DEVELOPMENT,
PRODUCTION
}
class KScienceReadmeExtension(val project: Project) {
var description: String = ""
var maturity: Maturity = Maturity.EXPERIMENTAL
var readmeTemplate: File = project.file("docs/README-TEMPLATE.md")
data class Feature(val id: String, val ref: String, val description: String, val name: String = id)
val features = ArrayList<Feature>()
fun feature(id: String, ref: String, description: String, name: String = id) {
features.add(Feature(id, ref, description, name))
}
val properties: MutableMap<String, () -> Any?> = mutableMapOf(
"name" to { project.name },
"group" to { project.group },
"version" to { project.version },
"features" to { featuresString() }
)
private fun getActualizedProperties() = properties.mapValues { (_, value) ->
value.invoke()
}
fun property(key: String, value: Any?) {
properties[key] = {value}
}
fun propertyByTemplate(key: String, template: String) {
val actual = getActualizedProperties()
properties[key] = {SimpleTemplateEngine().createTemplate(template).make(actual).toString()}
}
internal val additionalFiles = ArrayList<File>()
fun propertyByTemplate(key: String, template: File) {
val actual = getActualizedProperties()
properties[key] = {SimpleTemplateEngine().createTemplate(template).make(actual).toString()}
additionalFiles.add(template)
}
/**
* Generate a markdown string listing features
*/
fun featuresString(itemPrefix: String = " - ", pathPrefix: String = "") = buildString {
features.forEach {
appendln("$itemPrefix[${it.id}]($pathPrefix${it.ref}) : ${it.description}")
}
}
/**
* Generate a readme string from the stub
*/
fun readmeString(): String? {
return if (readmeTemplate.exists()) {
val actual = getActualizedProperties()
SimpleTemplateEngine().createTemplate(readmeTemplate).make(actual).toString()
} else {
null
}
}
}
/**
* Apply extension and repositories

97
src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt Normal file
View File

@ -0,0 +1,97 @@
package ru.mipt.npm.gradle
import groovy.text.SimpleTemplateEngine
import kotlinx.validation.ApiValidationExtension
import org.gradle.api.Project
import org.gradle.kotlin.dsl.getByType
import java.io.File
enum class Maturity {
PROTOTYPE,
EXPERIMENTAL,
DEVELOPMENT,
STABLE
}
class KScienceReadmeExtension(val project: Project) {
var description: String = project.description ?: ""
var maturity: Maturity = Maturity.EXPERIMENTAL
set(value) {
field = value
val projectName = project.name
if (value == Maturity.EXPERIMENTAL || value == Maturity.PROTOTYPE) {
project.rootProject.run {
plugins.withId("org.jetbrains.kotlinx.binary-compatibility-validator") {
extensions.getByType<ApiValidationExtension>().apply {
project.logger.warn("$value project $projectName is excluded from API validation")
ignoredProjects.add(projectName)
}
}
}
}
}
var readmeTemplate: File = project.file("docs/README-TEMPLATE.md")
data class Feature(val id: String, val description: String, val ref: String?, val name: String = id)
val features = ArrayList<Feature>()
fun feature(id: String, description: String, ref: String? = null, name: String = id) {
features.add(Feature(id, description, ref, name))
}
fun feature(id: String, ref: String? = null, name: String = id, description: () -> String) {
features.add(Feature(id, description(), ref, name))
}
val properties: MutableMap<String, () -> Any?> = mutableMapOf(
"name" to { project.name },
"group" to { project.group },
"version" to { project.version },
"features" to { featuresString() }
)
private fun getActualizedProperties() = properties.mapValues { (_, value) ->
value.invoke()
}
fun property(key: String, value: Any?) {
properties[key] = { value }
}
fun propertyByTemplate(key: String, template: String) {
val actual = getActualizedProperties()
properties[key] = { SimpleTemplateEngine().createTemplate(template).make(actual).toString() }
}
internal val additionalFiles = ArrayList<File>()
fun propertyByTemplate(key: String, template: File) {
val actual = getActualizedProperties()
properties[key] = { SimpleTemplateEngine().createTemplate(template).make(actual).toString() }
additionalFiles.add(template)
}
/**
* Generate a markdown string listing features
*/
fun featuresString(itemPrefix: String = " - ", pathPrefix: String = "") = buildString {
features.forEach {
appendln("$itemPrefix[${it.name}]($pathPrefix${it.ref ?: "#"}) : ${it.description}")
}
}
/**
* Generate a readme string from the stub
*/
fun readmeString(): String? {
return if (readmeTemplate.exists()) {
val actual = getActualizedProperties()
SimpleTemplateEngine().createTemplate(readmeTemplate).make(actual).toString()
} else {
null
}
}
}

12
src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt
View File

@ -6,19 +6,19 @@ import org.gradle.api.JavaVersion
* Build constants
*/
object KScienceVersions {
const val kotlinVersion = "1.4.21"
const val kotlinVersion = "1.4.30"
const val kotlinxNodeVersion = "0.0.7"
const val coroutinesVersion = "1.4.2"
const val serializationVersion = "1.0.1"
const val atomicVersion = "0.14.4"
const val serializationVersion = "1.1.0-RC"
const val atomicVersion = "0.15.1"
const val ktorVersion = "1.5.1"
const val htmlVersion = "0.7.2"
val JVM_TARGET = JavaVersion.VERSION_11
object Serialization{
const val xmlVersion = "0.80.1"
@Deprecated("Use yamlKt instead")
const val yamlVersion = "0.21.0"
const val bsonVersion = "0.4.4"
const val yamlKtVersion = "0.7.5"
const val yamlKtVersion = "0.9.0"
}
}

11
src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt
View File

@ -54,17 +54,6 @@ class SerializationTargets(
)
}
@Deprecated("Use multiplatform yamlKt instead")
fun Project.yaml(
version: String = KScienceVersions.Serialization.yamlVersion
) {
useDependency(
"jvm" to "com.charleskorn.kaml:kaml:$version",
dependencySourceSet = sourceSet,
dependencyConfiguration = configuration
)
}
fun Project.yamlKt(
version: String = KScienceVersions.Serialization.yamlKtVersion
) {

5
src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt
View File

@ -8,6 +8,7 @@ import org.gradle.kotlin.dsl.maven
import org.jetbrains.kotlin.gradle.plugin.LanguageSettingsBuilder
internal fun LanguageSettingsBuilder.applySettings(): Unit {
languageVersion = "1.4"
progressiveMode = true
enableLanguageFeature("InlineClasses")
useExperimentalAnnotation("kotlin.Experimental")
@ -20,7 +21,6 @@ internal fun LanguageSettingsBuilder.applySettings(): Unit {
internal fun RepositoryHandler.applyRepos(): Unit {
mavenCentral()
jcenter()
maven("https://dl.bintray.com/kotlin/kotlin-eap")
maven("https://dl.bintray.com/kotlin/kotlin-dev")
maven("https://kotlin.bintray.com/kotlinx")
@ -28,9 +28,10 @@ internal fun RepositoryHandler.applyRepos(): Unit {
maven("https://dl.bintray.com/mipt-npm/kscience")
maven("https://dl.bintray.com/mipt-npm/dev")
maven("https://dl.bintray.com/mipt-npm/dataforge")
maven("https://repo.kotlin.link")
}
internal fun Copy.fromDependencies(configurationName: String) = project.afterEvaluate {
internal fun Copy.fromJsDependencies(configurationName: String) = project.afterEvaluate {
val configuration = configurations[configurationName]
?: error("Configuration with name $configurationName could not be resolved.")
val projectDeps = configuration.allDependencies.filterIsInstance<ProjectDependency>().map {

12
src/main/kotlin/ru/mipt/npm/gradle/internal/publish.kt
View File

@ -18,10 +18,10 @@ internal fun Project.configurePublishing() {
val vcs = findProperty("vcs") as? String
?: githubProject?.let { "https://github.com/$githubOrg/$it" }
if (vcs == null) {
project.logger.warn("[${project.name}] Missing deployment configuration. Skipping publish.")
return
}
// if (vcs == null) {
// project.logger.warn("[${project.name}] Missing deployment configuration. Skipping publish.")
// return
// }
project.configure<PublishingExtension> {
plugins.withId("org.jetbrains.kotlin.js") {
@ -62,7 +62,7 @@ internal fun Project.configurePublishing() {
publication.pom {
name.set(project.name)
description.set(project.description)
url.set(vcs)
vcs?.let{url.set(vcs)}
licenses {
license {
@ -80,12 +80,14 @@ internal fun Project.configurePublishing() {
}
}
vcs?.let {
scm {
url.set(vcs)
tag.set(project.version.toString())
}
}
}
}
val githubUser: String? by project
val githubToken: String? by project