Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 06:12:05 +01:00
Code Issues Releases Wiki Activity

Merge branch '4.4'

Browse source
This commit is contained in:
Florian Schmaus 2021-05-20 14:39:32 +02:00
commit 8d74873925
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build.gradle
View file

@ -5,7 +5,6 @@ buildscript {
maven { url 'https://dl.bintray.com/content/aalmiray/kordamp' } maven { url 'https://dl.bintray.com/content/aalmiray/kordamp' }
} }
dependencies { dependencies {
classpath 'org.kordamp:markdown-gradle-plugin:1.0.0'
classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.2.2' classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.2.2'
} }
} }
@ -18,8 +17,6 @@ plugins {
id 'com.github.kt3k.coveralls' version '2.10.2' id 'com.github.kt3k.coveralls' version '2.10.2'
} }
apply plugin: 'org.kordamp.gradle.markdown'
ext { ext {
java11Projects = [ java11Projects = [
':smack-integration-test', ':smack-integration-test',
@ -57,7 +54,7 @@ allprojects {
isSnapshot = version.endsWith('-SNAPSHOT') isSnapshot = version.endsWith('-SNAPSHOT')
gitCommit = getGitCommit() gitCommit = getGitCommit()
javadocAllDir = new File(buildDir, 'javadoc') javadocAllDir = new File(buildDir, 'javadoc')
documentationDir = new File(buildDir, 'documentation') documentationDir = new File(projectDir, 'documentation')
releasedocsDir = new File(buildDir, 'releasedocs') releasedocsDir = new File(buildDir, 'releasedocs')
rootConfigDir = new File(rootDir, 'config') rootConfigDir = new File(rootDir, 'config')
sonatypeCredentialsAvailable = project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword') 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()]) filter(ReplaceTokens, tokens: [version: version, releasedate: builtDate, targetCompatibility: targetCompatibility.toString()])
} }
markdownToHtml { task distributionZip(type: Zip, dependsOn: [javadocAll, prepareReleasedocs]) {
sourceDir = new File(projectDir, "/documentation")
outputDir documentationDir
configuration = [tables: true, fencedCodeBlocks: true]
}
task distributionZip(type: Zip, dependsOn: [javadocAll, prepareReleasedocs, markdownToHtml]) {
classifier builtDate classifier builtDate
into ('javadoc') { into ('javadoc') {
from(javadocAllDir) from(javadocAllDir)