Florian Schmaus
35e32e0ad2
Smack 4.1.0-rc3
2015-03-07 21:12:42 +01:00
Florian Schmaus
701aa7d9c4
Merge branch '4.1'
...
Conflicts:
smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java
smack-core/src/main/java/org/jivesoftware/smack/PacketListener.java
smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java
smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java
smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java
smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java
smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
version.gradle
2015-03-04 22:42:36 +01:00
Florian Schmaus
0279677883
Add support for clirr to the build system
2015-03-03 15:07:33 +01:00
Florian Schmaus
0fae7a26c2
Samck 4.1.0-rc3-SNAPSHOT
2015-02-21 17:20:52 +01:00
Florian Schmaus
407f555cbf
Smack 4.1.0-rc2
2015-02-21 16:57:52 +01:00
Florian Schmaus
5bb4727c57
Use Jid (and subclasses) from jxmpp-jid
...
Fixes SMACK-634
2015-02-17 16:07:16 +01:00
Florian Schmaus
a0d3314b26
Smack 4.1.0-rc2-SNAPSHOT
2015-02-15 21:13:48 +01:00
Florian Schmaus
43b99a2a85
Smack 4.2.0-alpha1-SNAPSHOT
2015-02-14 09:36:52 +01:00
Florian Schmaus
8a32d22739
Smack 4.1.0-rc1
2015-02-14 09:36:31 +01:00
Florian Schmaus
34ce7929a8
Smack 4.1.0-beta3-SNAPSHOT
2015-02-02 13:14:45 +01:00
Florian Schmaus
4b215814db
Smack 4.1.0-beta2
2015-02-02 13:04:47 +01:00
Florian Schmaus
9cc58ec8a0
Smack 4.1.0-beta2-SNAPSHOT
2015-01-14 09:32:13 +01:00
Florian Schmaus
fd69a4c97f
Smack 4.1.0-beta1
2015-01-14 09:21:35 +01:00
Florian Schmaus
b5c9bb2611
Change jxmpp version to 0.4.1-alpha2-SNAPSHOT
...
Mostly because of 738276e1aca093da16ea160462bdda7523a26a14 in jxmpp,
which fixes fractional seconds parsing.
Which made also the slight change in DelayInformationTest necessary.
2014-12-12 11:50:33 +01:00
Florian Schmaus
7bf3c3ea5d
Move jxmppVersion and smackMinAndroidSdk to version.gradle
2014-12-09 13:54:12 +01:00
Florian Schmaus
15d60ea876
Smack 4.1.0-alpha7-SNAPSHOT
2014-11-30 11:28:45 +01:00
Florian Schmaus
ad0921e18c
Smack 4.1.0-alpha6
2014-11-29 18:06:27 +01:00
Florian Schmaus
b9167c5fe2
Add version.gradle
2014-11-04 14:43:41 +01:00
