Skip to content

[build] Use fixed versions for jxmpp and minidns #708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stokito wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[build] Use fixed versions for jxmpp and minidns #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build-logic/src/main/groovy/org.igniterealtime.smack.java-common-conventions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ ext {
builtDate = (new java.text.SimpleDateFormat("yyyy-MM-dd")).format(new Date())
oneLineDesc = 'An Open Source XMPP (Jabber) client library'

jxmppVersion = '[1.1.0, 1.1.999]'
miniDnsVersion = '[1.1.0-alpha3, 1.1.999]'
jxmppVersion = '1.1.0'
miniDnsVersion = '1.1.1'
junitVersion = '5.12.2'
commonsIoVersion = '2.17.0'
bouncyCastleVersion = '1.73'
Expand Down
28 changes: 3 additions & 25 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ plugins {
// have a ideaProject task, so let's add one.
id 'idea'

id 'org.igniterealtime.smack.java-common-conventions'
id 'org.igniterealtime.smack.javadoc-conventions'
}

Expand Down Expand Up @@ -32,12 +33,10 @@ tasks.register('javadocAll', Javadoc) {
}

doFirst {
def staticJxmppVersion = getResolvedVersion('org.jxmpp:jxmpp-core')
def staticMiniDnsVersion = getResolvedVersion('org.minidns:minidns-core')
options.links = [
"https://docs.oracle.com/en/java/javase/${javaMajor}/docs/api/",
"https://jxmpp.org/releases/${staticJxmppVersion}/javadoc/",
"https://minidns.org/releases/${staticMiniDnsVersion}/javadoc/",
"https://jxmpp.org/releases/${jxmppVersion}/javadoc/",
"https://minidns.org/releases/${miniDnsVersion}/javadoc/",
] as String[]
}

Expand Down Expand Up @@ -94,24 +93,3 @@ task inttestFull {
omemoSignalIntTest,
]}
}

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*Artifact*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()
}
6 changes: 3 additions & 3 deletions smack-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ smack-extensions and smack-experimental."""
// sourceSet.test of the core subproject
dependencies {
implementation project(':smack-xmlparser-xpp3')
// Depend on minidns-android21 as optional dependency, even if may
// Depend on minidns-android23 as optional dependency, even if may
// not need it. Can't hurt to have it in the programm path with
// the correct MiniDNS version as it won't hurt even if the
// Android version is smaller then 21. Note that we deliberatly do
// Android version is smaller then 23. Note that we deliberately do
// not add this to smack-minidns, as this dependency may also be
// used in non-Android projects.
implementation "org.minidns:minidns-android21:$miniDnsVersion"
implementation "org.minidns:minidns-android23:$miniDnsVersion"

api project(':smack-core')
api project(':smack-im')
Expand Down
Loading