update to gradle 7.3.2
This commit is contained in:
parent
ade86aad39
commit
bb8a53148b
6 changed files with 9 additions and 47 deletions
|
@ -3,6 +3,6 @@ name = time
|
||||||
version = 2.2.0
|
version = 2.2.0
|
||||||
|
|
||||||
org.gradle.warning.mode = ALL
|
org.gradle.warning.mode = ALL
|
||||||
gradle.wrapper.version = 7.3
|
gradle.wrapper.version = 7.3.2
|
||||||
quartz.version = 2.3.2
|
quartz.version = 2.3.2
|
||||||
caliper.version = 1.0-beta-2
|
caliper.version = 1.0-beta-2
|
||||||
|
|
|
@ -21,15 +21,18 @@ jar {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
task sourcesJar(type: Jar, dependsOn: classes) {
|
task sourcesJar(type: Jar) {
|
||||||
|
dependsOn classes
|
||||||
classifier 'sources'
|
classifier 'sources'
|
||||||
from sourceSets.main.allSource
|
from sourceSets.main.allSource
|
||||||
}
|
}
|
||||||
|
|
||||||
task javadocJar(type: Jar, dependsOn: javadoc) {
|
task javadocJar(type: Jar) {
|
||||||
|
dependsOn javadoc
|
||||||
classifier 'javadoc'
|
classifier 'javadoc'
|
||||||
|
from javadoc.destinationDir
|
||||||
}
|
}
|
||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
archives sourcesJar, javadocJar
|
archives sourcesJar, javadocJar
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +1,5 @@
|
||||||
apply plugin: 'org.xbib.gradle.plugin.asciidoctor'
|
apply plugin: 'org.xbib.gradle.plugin.asciidoctor'
|
||||||
|
|
||||||
configurations {
|
|
||||||
asciidoclet
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
asciidoclet "org.asciidoctor:asciidoclet:${project.property('asciidoclet.version')}"
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
asciidoctor {
|
asciidoctor {
|
||||||
backends 'html5'
|
backends 'html5'
|
||||||
outputDir = file("${rootProject.projectDir}/docs")
|
outputDir = file("${rootProject.projectDir}/docs")
|
||||||
|
@ -26,30 +17,3 @@ asciidoctor {
|
||||||
imagesdir: 'img',
|
imagesdir: 'img',
|
||||||
stylesheet: "${projectDir}/src/docs/asciidoc/css/foundation.css"
|
stylesheet: "${projectDir}/src/docs/asciidoc/css/foundation.css"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*javadoc {
|
|
||||||
options.docletpath = configurations.asciidoclet.files.asType(List)
|
|
||||||
options.doclet = 'org.asciidoctor.Asciidoclet'
|
|
||||||
//options.overview = "src/docs/asciidoclet/overview.adoc"
|
|
||||||
options.addStringOption "-base-dir", "${projectDir}"
|
|
||||||
options.addStringOption "-attribute",
|
|
||||||
"name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}"
|
|
||||||
configure(options) {
|
|
||||||
noTimestamp = true
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
|
|
||||||
|
|
||||||
/*javadoc {
|
|
||||||
options.docletpath = configurations.asciidoclet.files.asType(List)
|
|
||||||
options.doclet = 'org.asciidoctor.Asciidoclet'
|
|
||||||
options.overview = "${rootProject.projectDir}/src/docs/asciidoclet/overview.adoc"
|
|
||||||
options.addStringOption "-base-dir", "${projectDir}"
|
|
||||||
options.addStringOption "-attribute",
|
|
||||||
"name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}"
|
|
||||||
options.destinationDirectory(file("${projectDir}/docs/javadoc"))
|
|
||||||
configure(options) {
|
|
||||||
noTimestamp = true
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
|
|
|
@ -6,8 +6,3 @@ idea {
|
||||||
testOutputDir file('build/classes/java/test')
|
testOutputDir file('build/classes/java/test')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (project.convention.findPlugin(JavaPluginConvention)) {
|
|
||||||
//sourceSets.main.output.classesDirs = file("build/classes/java/main")
|
|
||||||
//sourceSets.test.output.classesDirs = file("build/classes/java/test")
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.6.2'
|
def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.8.2'
|
||||||
def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2'
|
def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -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-7.3-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
Loading…
Reference in a new issue