mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-12-22 04:27:58 +01:00
Merge branch '4.4'
This commit is contained in:
commit
8d74873925
1 changed files with 2 additions and 11 deletions
13
build.gradle
13
build.gradle
|
@ -5,7 +5,6 @@ buildscript {
|
|||
maven { url 'https://dl.bintray.com/content/aalmiray/kordamp' }
|
||||
}
|
||||
dependencies {
|
||||
classpath 'org.kordamp:markdown-gradle-plugin:1.0.0'
|
||||
classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.2.2'
|
||||
}
|
||||
}
|
||||
|
@ -18,8 +17,6 @@ plugins {
|
|||
id 'com.github.kt3k.coveralls' version '2.10.2'
|
||||
}
|
||||
|
||||
apply plugin: 'org.kordamp.gradle.markdown'
|
||||
|
||||
ext {
|
||||
java11Projects = [
|
||||
':smack-integration-test',
|
||||
|
@ -57,7 +54,7 @@ allprojects {
|
|||
isSnapshot = version.endsWith('-SNAPSHOT')
|
||||
gitCommit = getGitCommit()
|
||||
javadocAllDir = new File(buildDir, 'javadoc')
|
||||
documentationDir = new File(buildDir, 'documentation')
|
||||
documentationDir = new File(projectDir, 'documentation')
|
||||
releasedocsDir = new File(buildDir, 'releasedocs')
|
||||
rootConfigDir = new File(rootDir, 'config')
|
||||
sonatypeCredentialsAvailable = project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')
|
||||
|
@ -403,13 +400,7 @@ task prepareReleasedocs(type: Copy) {
|
|||
filter(ReplaceTokens, tokens: [version: version, releasedate: builtDate, targetCompatibility: targetCompatibility.toString()])
|
||||
}
|
||||
|
||||
markdownToHtml {
|
||||
sourceDir = new File(projectDir, "/documentation")
|
||||
outputDir documentationDir
|
||||
configuration = [tables: true, fencedCodeBlocks: true]
|
||||
}
|
||||
|
||||
task distributionZip(type: Zip, dependsOn: [javadocAll, prepareReleasedocs, markdownToHtml]) {
|
||||
task distributionZip(type: Zip, dependsOn: [javadocAll, prepareReleasedocs]) {
|
||||
classifier builtDate
|
||||
into ('javadoc') {
|
||||
from(javadocAllDir)
|
||||
|
|
Loading…
Reference in a new issue