mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-11-22 14:22:05 +01:00
Merge pull request #417 from Flowdalic/gradle-dynamic-versions
[build] Use ranged version [1.0.0, 1.0.999] for jXMPP and MiniDNS
This commit is contained in:
commit
e35175a3d5
1 changed files with 34 additions and 5 deletions
39
build.gradle
39
build.gradle
|
@ -122,8 +122,8 @@ allprojects {
|
||||||
// See also:
|
// See also:
|
||||||
// - https://issues.apache.org/jira/browse/MNG-6232
|
// - https://issues.apache.org/jira/browse/MNG-6232
|
||||||
// - https://issues.igniterealtime.org/browse/SMACK-858
|
// - https://issues.igniterealtime.org/browse/SMACK-858
|
||||||
jxmppVersion = '1.0.0'
|
jxmppVersion = '[1.0.0, 1.0.999]'
|
||||||
miniDnsVersion = '1.0.0'
|
miniDnsVersion = '[1.0.0, 1.0.999]'
|
||||||
smackMinAndroidSdk = 19
|
smackMinAndroidSdk = 19
|
||||||
junitVersion = '5.6.2'
|
junitVersion = '5.6.2'
|
||||||
commonsIoVersion = '2.6'
|
commonsIoVersion = '2.6'
|
||||||
|
@ -305,6 +305,13 @@ configure (junit4Projects) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// We need to evaluate the child projects first because
|
||||||
|
// - javadocAll needs the smack-core child to have already resolved
|
||||||
|
// the jXMPP/MiniDNS dependencies, so that we can the resovled
|
||||||
|
// version to link to those project's javadoc.
|
||||||
|
// - We use the child's project description as description for the
|
||||||
|
// Maven POM.
|
||||||
|
evaluationDependsOnChildren()
|
||||||
task javadocAll(type: Javadoc) {
|
task javadocAll(type: Javadoc) {
|
||||||
source javadocAllProjects.collect {project ->
|
source javadocAllProjects.collect {project ->
|
||||||
project.sourceSets.main.allJava.findAll {
|
project.sourceSets.main.allJava.findAll {
|
||||||
|
@ -319,13 +326,15 @@ task javadocAll(type: Javadoc) {
|
||||||
classpath = files(subprojects.collect {project ->
|
classpath = files(subprojects.collect {project ->
|
||||||
project.sourceSets.main.compileClasspath})
|
project.sourceSets.main.compileClasspath})
|
||||||
classpath += files(androidBootClasspath)
|
classpath += files(androidBootClasspath)
|
||||||
|
def staticJxmppVersion = getResolvedVersion('org.jxmpp:jxmpp-core')
|
||||||
|
def staticMiniDnsVersion = getResolvedVersion('org.minidns:minidns-core')
|
||||||
options {
|
options {
|
||||||
linkSource = true
|
linkSource = true
|
||||||
use = true
|
use = true
|
||||||
links = [
|
links = [
|
||||||
"https://docs.oracle.com/javase/${javaMajor}/docs/api/",
|
"https://docs.oracle.com/javase/${javaMajor}/docs/api/",
|
||||||
"https://jxmpp.org/releases/$jxmppVersion/javadoc/",
|
"https://jxmpp.org/releases/${staticJxmppVersion}/javadoc/",
|
||||||
"https://minidns.org/releases/$miniDnsVersion/javadoc/",
|
"https://minidns.org/releases/${staticMiniDnsVersion}/javadoc/",
|
||||||
] as String[]
|
] as String[]
|
||||||
overview = "$projectDir/resources/javadoc-overview.html"
|
overview = "$projectDir/resources/javadoc-overview.html"
|
||||||
}
|
}
|
||||||
|
@ -408,7 +417,6 @@ description = """\
|
||||||
Smack ${version}
|
Smack ${version}
|
||||||
${oneLineDesc}."""
|
${oneLineDesc}."""
|
||||||
|
|
||||||
evaluationDependsOnChildren()
|
|
||||||
subprojects {
|
subprojects {
|
||||||
apply plugin: 'maven-publish'
|
apply plugin: 'maven-publish'
|
||||||
apply plugin: 'signing'
|
apply plugin: 'signing'
|
||||||
|
@ -740,3 +748,24 @@ def readVersionFile() {
|
||||||
}
|
}
|
||||||
versionFile.text.trim()
|
versionFile.text.trim()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def getResolvedVersion(queriedProject = 'smack-core', component) {
|
||||||
|
def configuration = project(queriedProject)
|
||||||
|
.configurations
|
||||||
|
.compileClasspath
|
||||||
|
|
||||||
|
def artifact = configuration
|
||||||
|
.resolvedConfiguration
|
||||||
|
.resolvedArtifacts
|
||||||
|
.findAll {
|
||||||
|
// 'it' is of type ResolvedArtifact, 'id' of
|
||||||
|
// Component*Artifcat*Identifier, and we check the
|
||||||
|
// ComponentIdentifier.
|
||||||
|
it.id.getComponentIdentifier() instanceof org.gradle.api.artifacts.component.ModuleComponentIdentifier
|
||||||
|
}
|
||||||
|
.find {
|
||||||
|
it.id.getComponentIdentifier().toString().startsWith(component + ':')
|
||||||
|
}
|
||||||
|
|
||||||
|
artifact.getModuleVersion().getId().getVersion()
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue