diff --git a/.gradle/2.1/taskArtifacts/cache.properties.lock b/.gradle/2.1/taskArtifacts/cache.properties.lock index 0aca503..e1f600e 100644 Binary files a/.gradle/2.1/taskArtifacts/cache.properties.lock and b/.gradle/2.1/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.1/taskArtifacts/fileHashes.bin b/.gradle/2.1/taskArtifacts/fileHashes.bin index ed87e2e..3f264a5 100644 Binary files a/.gradle/2.1/taskArtifacts/fileHashes.bin and b/.gradle/2.1/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.1/taskArtifacts/fileSnapshots.bin b/.gradle/2.1/taskArtifacts/fileSnapshots.bin index 087fa97..af42aaf 100644 Binary files a/.gradle/2.1/taskArtifacts/fileSnapshots.bin and b/.gradle/2.1/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.1/taskArtifacts/outputFileStates.bin b/.gradle/2.1/taskArtifacts/outputFileStates.bin index 90046c9..5d99ec4 100644 Binary files a/.gradle/2.1/taskArtifacts/outputFileStates.bin and b/.gradle/2.1/taskArtifacts/outputFileStates.bin differ diff --git a/.gradle/2.1/taskArtifacts/taskArtifacts.bin b/.gradle/2.1/taskArtifacts/taskArtifacts.bin index a08207a..b0d5fcc 100644 Binary files a/.gradle/2.1/taskArtifacts/taskArtifacts.bin and b/.gradle/2.1/taskArtifacts/taskArtifacts.bin differ diff --git a/.travis.yml b/.travis.yml index dff5f3a..6393a12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,18 @@ language: java +jdk: oraclejdk7 + +env: + global: + - LIB_FILE=/home/travis/build/build/libs/qatja.jar + +deploy: + provider: releases + api_key: + secure: qMXfuiHiTILfMxHtrqkdsjyX74/YXKKzjM5ej+XLv85B0td3qyT9ogu1rD97zw41UIkwsGLcvH0ZqFJ448zddC5nNDOx3M0Spi/GKbmg5xNnCuLxg1k9URnLqdGbnTbxzhO7k/R09sMFH3EmoYNRNLIvHSFG1sUqvzUJbG40d9I= + file: $LIB_FILE + on: + repo: Qatja/Qatja + tags: true + +script: + - ./gradlew clean compileJava jar \ No newline at end of file diff --git a/build.gradle b/build.gradle index 214a6c2..41c2544 100644 --- a/build.gradle +++ b/build.gradle @@ -1,17 +1,16 @@ apply plugin: 'java' +//apply plugin: 'maven' -version = '1.0' +version = 'v0.1.1-alpha' sourceCompatibility = 1.5 -//create a single Jar with all dependencies -task fatJar(type: Jar) { +jar { + archiveName = "qatja.jar" + manifest { - attributes 'Implementation-Title': 'Qatja', 'Implementation-Version': version + attributes("Implementation-Title": "Gradle", "Implementation-Version": version) } - baseName = project.name + '-all' - from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } - with jar } repositories { @@ -22,4 +21,18 @@ dependencies { compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3' testCompile group: 'junit', name: 'junit', version: '4.11' -} \ No newline at end of file +} + +/* +uploadArchives { + repositories.mavenDeployer { + def deployPath = file(getProperty('aar.deployPath')) + repository(url: "file://${deployPath.absolutePath}") + pom.project { + groupId 'se.wetcat' + artifactId 'qatja' + version "1.0.0" + } + } +} +*/ \ No newline at end of file diff --git a/changes.txt b/changes.txt new file mode 100644 index 0000000..7a17552 --- /dev/null +++ b/changes.txt @@ -0,0 +1,2 @@ +v0.1.0-alpha Initial build +v0.1.1-alpha Added Github releases build \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 251146e..6ea1cb6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1 @@ rootProject.name = 'Qatja' - diff --git a/src/main/java/se/goransson/qatja/MQTTConnectionConstants.java b/src/main/java/se/wetcat/qatja/MQTTConnectionConstants.java similarity index 98% rename from src/main/java/se/goransson/qatja/MQTTConnectionConstants.java rename to src/main/java/se/wetcat/qatja/MQTTConnectionConstants.java index 9e0c953..55ac969 100644 --- a/src/main/java/se/goransson/qatja/MQTTConnectionConstants.java +++ b/src/main/java/se/wetcat/qatja/MQTTConnectionConstants.java @@ -1,4 +1,4 @@ -package se.goransson.qatja; +package se.wetcat.qatja; /* diff --git a/src/main/java/se/goransson/qatja/MQTTConstants.java b/src/main/java/se/wetcat/qatja/MQTTConstants.java similarity index 99% rename from src/main/java/se/goransson/qatja/MQTTConstants.java rename to src/main/java/se/wetcat/qatja/MQTTConstants.java index 222a190..614dde6 100644 --- a/src/main/java/se/goransson/qatja/MQTTConstants.java +++ b/src/main/java/se/wetcat/qatja/MQTTConstants.java @@ -1,4 +1,4 @@ -package se.goransson.qatja; +package se.wetcat.qatja; /* * Copyright (C) 2012 Andreas Goransson, David Cuartielles diff --git a/src/main/java/se/goransson/qatja/MQTTException.java b/src/main/java/se/wetcat/qatja/MQTTException.java similarity index 97% rename from src/main/java/se/goransson/qatja/MQTTException.java rename to src/main/java/se/wetcat/qatja/MQTTException.java index 62d4945..25d1a3e 100644 --- a/src/main/java/se/goransson/qatja/MQTTException.java +++ b/src/main/java/se/wetcat/qatja/MQTTException.java @@ -1,4 +1,4 @@ -package se.goransson.qatja; +package se.wetcat.qatja; /* * Copyright (C) 2014 Andreas Goransson diff --git a/src/main/java/se/goransson/qatja/MQTTHelper.java b/src/main/java/se/wetcat/qatja/MQTTHelper.java similarity index 98% rename from src/main/java/se/goransson/qatja/MQTTHelper.java rename to src/main/java/se/wetcat/qatja/MQTTHelper.java index 8c454e4..5980bee 100644 --- a/src/main/java/se/goransson/qatja/MQTTHelper.java +++ b/src/main/java/se/wetcat/qatja/MQTTHelper.java @@ -1,4 +1,4 @@ -package se.goransson.qatja; +package se.wetcat.qatja; /* * Copyright (C) 2014 Andreas Goransson @@ -17,7 +17,7 @@ */ import org.mozilla.universalchardet.UniversalDetector; -import se.goransson.qatja.messages.MQTTMessage; +import se.wetcat.qatja.messages.MQTTMessage; /** * Helper methods for MQTT diff --git a/src/main/java/se/goransson/qatja/MQTTVersion.java b/src/main/java/se/wetcat/qatja/MQTTVersion.java similarity index 97% rename from src/main/java/se/goransson/qatja/MQTTVersion.java rename to src/main/java/se/wetcat/qatja/MQTTVersion.java index 089937a..2bc904a 100644 --- a/src/main/java/se/goransson/qatja/MQTTVersion.java +++ b/src/main/java/se/wetcat/qatja/MQTTVersion.java @@ -1,4 +1,4 @@ -package se.goransson.qatja; +package se.wetcat.qatja; /* * Copyright (C) 2012 Andreas Goransson, David Cuartielles diff --git a/src/main/java/se/goransson/qatja/messages/MQTTConnack.java b/src/main/java/se/wetcat/qatja/messages/MQTTConnack.java similarity index 97% rename from src/main/java/se/goransson/qatja/messages/MQTTConnack.java rename to src/main/java/se/wetcat/qatja/messages/MQTTConnack.java index d762daa..abf99e5 100644 --- a/src/main/java/se/goransson/qatja/messages/MQTTConnack.java +++ b/src/main/java/se/wetcat/qatja/messages/MQTTConnack.java @@ -1,4 +1,4 @@ -package se.goransson.qatja.messages; +package se.wetcat.qatja.messages; /* * Copyright (C) 2014 Andreas Goransson @@ -16,7 +16,7 @@ * limitations under the License. */ -import se.goransson.qatja.MQTTException; +import se.wetcat.qatja.MQTTException; import java.io.IOException; diff --git a/src/main/java/se/goransson/qatja/messages/MQTTConnect.java b/src/main/java/se/wetcat/qatja/messages/MQTTConnect.java similarity index 99% rename from src/main/java/se/goransson/qatja/messages/MQTTConnect.java rename to src/main/java/se/wetcat/qatja/messages/MQTTConnect.java index e139d0d..09f722a 100644 --- a/src/main/java/se/goransson/qatja/messages/MQTTConnect.java +++ b/src/main/java/se/wetcat/qatja/messages/MQTTConnect.java @@ -1,4 +1,4 @@ -package se.goransson.qatja.messages; +package se.wetcat.qatja.messages; /* * Copyright (C) 2014 Andreas Goransson @@ -16,8 +16,8 @@ * limitations under the License. */ -import se.goransson.qatja.MQTTException; -import se.goransson.qatja.MQTTHelper; +import se.wetcat.qatja.MQTTException; +import se.wetcat.qatja.MQTTHelper; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/se/goransson/qatja/messages/MQTTDisconnect.java b/src/main/java/se/wetcat/qatja/messages/MQTTDisconnect.java similarity index 96% rename from src/main/java/se/goransson/qatja/messages/MQTTDisconnect.java rename to src/main/java/se/wetcat/qatja/messages/MQTTDisconnect.java index ccda611..8ab6fc7 100644 --- a/src/main/java/se/goransson/qatja/messages/MQTTDisconnect.java +++ b/src/main/java/se/wetcat/qatja/messages/MQTTDisconnect.java @@ -1,4 +1,4 @@ -package se.goransson.qatja.messages; +package se.wetcat.qatja.messages; /* * Copyright (C) 2014 Andreas Goransson @@ -16,7 +16,7 @@ * limitations under the License. */ -import se.goransson.qatja.MQTTException; +import se.wetcat.qatja.MQTTException; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/se/goransson/qatja/messages/MQTTMessage.java b/src/main/java/se/wetcat/qatja/messages/MQTTMessage.java similarity index 98% rename from src/main/java/se/goransson/qatja/messages/MQTTMessage.java rename to src/main/java/se/wetcat/qatja/messages/MQTTMessage.java index 406e024..73066cc 100644 --- a/src/main/java/se/goransson/qatja/messages/MQTTMessage.java +++ b/src/main/java/se/wetcat/qatja/messages/MQTTMessage.java @@ -1,4 +1,4 @@ -package se.goransson.qatja.messages; +package se.wetcat.qatja.messages; /* * Copyright (C) 2012 Andreas Goransson, David Cuartielles @@ -16,7 +16,7 @@ * limitations under the License. */ -import se.goransson.qatja.*; +import se.wetcat.qatja.*; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/se/goransson/qatja/messages/MQTTPingreq.java b/src/main/java/se/wetcat/qatja/messages/MQTTPingreq.java similarity index 96% rename from src/main/java/se/goransson/qatja/messages/MQTTPingreq.java rename to src/main/java/se/wetcat/qatja/messages/MQTTPingreq.java index faed886..e0ce811 100644 --- a/src/main/java/se/goransson/qatja/messages/MQTTPingreq.java +++ b/src/main/java/se/wetcat/qatja/messages/MQTTPingreq.java @@ -1,4 +1,4 @@ -package se.goransson.qatja.messages; +package se.wetcat.qatja.messages; /* * Copyright (C) 2014 Andreas Goransson @@ -16,7 +16,7 @@ * limitations under the License. */ -import se.goransson.qatja.MQTTException; +import se.wetcat.qatja.MQTTException; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/se/goransson/qatja/messages/MQTTPingresp.java b/src/main/java/se/wetcat/qatja/messages/MQTTPingresp.java similarity index 96% rename from src/main/java/se/goransson/qatja/messages/MQTTPingresp.java rename to src/main/java/se/wetcat/qatja/messages/MQTTPingresp.java index f98f65a..cbd5ce3 100644 --- a/src/main/java/se/goransson/qatja/messages/MQTTPingresp.java +++ b/src/main/java/se/wetcat/qatja/messages/MQTTPingresp.java @@ -1,4 +1,4 @@ -package se.goransson.qatja.messages; +package se.wetcat.qatja.messages; /* * Copyright (C) 2014 Andreas Goransson @@ -16,7 +16,7 @@ * limitations under the License. */ -import se.goransson.qatja.MQTTException; +import se.wetcat.qatja.MQTTException; import java.io.IOException; diff --git a/src/main/java/se/goransson/qatja/messages/MQTTPuback.java b/src/main/java/se/wetcat/qatja/messages/MQTTPuback.java similarity index 96% rename from src/main/java/se/goransson/qatja/messages/MQTTPuback.java rename to src/main/java/se/wetcat/qatja/messages/MQTTPuback.java index 31fc85b..b421d6f 100644 --- a/src/main/java/se/goransson/qatja/messages/MQTTPuback.java +++ b/src/main/java/se/wetcat/qatja/messages/MQTTPuback.java @@ -1,4 +1,4 @@ -package se.goransson.qatja.messages; +package se.wetcat.qatja.messages; /* * Copyright (C) 2014 Andreas Goransson @@ -16,8 +16,8 @@ * limitations under the License. */ -import se.goransson.qatja.MQTTException; -import se.goransson.qatja.MQTTHelper; +import se.wetcat.qatja.MQTTException; +import se.wetcat.qatja.MQTTHelper; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/se/goransson/qatja/messages/MQTTPubcomp.java b/src/main/java/se/wetcat/qatja/messages/MQTTPubcomp.java similarity index 95% rename from src/main/java/se/goransson/qatja/messages/MQTTPubcomp.java rename to src/main/java/se/wetcat/qatja/messages/MQTTPubcomp.java index 388a3cb..692a06f 100644 --- a/src/main/java/se/goransson/qatja/messages/MQTTPubcomp.java +++ b/src/main/java/se/wetcat/qatja/messages/MQTTPubcomp.java @@ -1,4 +1,4 @@ -package se.goransson.qatja.messages; +package se.wetcat.qatja.messages; /* * Copyright (C) 2014 Andreas Goransson @@ -16,8 +16,9 @@ * limitations under the License. */ -import se.goransson.qatja.MQTTException; -import se.goransson.qatja.MQTTHelper; +import se.wetcat.qatja.MQTTException; +import se.wetcat.qatja.MQTTHelper; +import se.wetcat.qatja.MQTTConstants; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -33,7 +34,7 @@ public class MQTTPubcomp extends MQTTMessage { public MQTTPubcomp(int packageIdentifier) { - setType(PUBCOMP); + setType(MQTTConstants.PUBCOMP); setPackageIdentifier(packageIdentifier); } diff --git a/src/main/java/se/goransson/qatja/messages/MQTTPublish.java b/src/main/java/se/wetcat/qatja/messages/MQTTPublish.java similarity index 98% rename from src/main/java/se/goransson/qatja/messages/MQTTPublish.java rename to src/main/java/se/wetcat/qatja/messages/MQTTPublish.java index c39e74c..72bdba0 100644 --- a/src/main/java/se/goransson/qatja/messages/MQTTPublish.java +++ b/src/main/java/se/wetcat/qatja/messages/MQTTPublish.java @@ -1,4 +1,4 @@ -package se.goransson.qatja.messages; +package se.wetcat.qatja.messages; /* * Copyright (C) 2014 Andreas Goransson @@ -16,8 +16,8 @@ * limitations under the License. */ -import se.goransson.qatja.MQTTException; -import se.goransson.qatja.MQTTHelper; +import se.wetcat.qatja.MQTTException; +import se.wetcat.qatja.MQTTHelper; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/se/goransson/qatja/messages/MQTTPubrec.java b/src/main/java/se/wetcat/qatja/messages/MQTTPubrec.java similarity index 95% rename from src/main/java/se/goransson/qatja/messages/MQTTPubrec.java rename to src/main/java/se/wetcat/qatja/messages/MQTTPubrec.java index 243a813..a2cc10a 100644 --- a/src/main/java/se/goransson/qatja/messages/MQTTPubrec.java +++ b/src/main/java/se/wetcat/qatja/messages/MQTTPubrec.java @@ -1,4 +1,4 @@ -package se.goransson.qatja.messages; +package se.wetcat.qatja.messages; /* * Copyright (C) 2014 Andreas Goransson @@ -16,8 +16,9 @@ * limitations under the License. */ -import se.goransson.qatja.MQTTException; -import se.goransson.qatja.MQTTHelper; +import se.wetcat.qatja.MQTTException; +import se.wetcat.qatja.MQTTHelper; +import se.wetcat.qatja.MQTTConstants; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -38,7 +39,7 @@ public class MQTTPubrec extends MQTTMessage { * the package identifier */ public MQTTPubrec(int packageIdentifier) { - setType(PUBREC); + setType(MQTTConstants.PUBREC); setPackageIdentifier(packageIdentifier); } diff --git a/src/main/java/se/goransson/qatja/messages/MQTTPubrel.java b/src/main/java/se/wetcat/qatja/messages/MQTTPubrel.java similarity index 96% rename from src/main/java/se/goransson/qatja/messages/MQTTPubrel.java rename to src/main/java/se/wetcat/qatja/messages/MQTTPubrel.java index 40d75ec..57242c2 100644 --- a/src/main/java/se/goransson/qatja/messages/MQTTPubrel.java +++ b/src/main/java/se/wetcat/qatja/messages/MQTTPubrel.java @@ -1,4 +1,4 @@ -package se.goransson.qatja.messages; +package se.wetcat.qatja.messages; /* * Copyright (C) 2014 Andreas Goransson @@ -16,8 +16,8 @@ * limitations under the License. */ -import se.goransson.qatja.MQTTException; -import se.goransson.qatja.MQTTHelper; +import se.wetcat.qatja.MQTTException; +import se.wetcat.qatja.MQTTHelper; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/se/goransson/qatja/messages/MQTTSuback.java b/src/main/java/se/wetcat/qatja/messages/MQTTSuback.java similarity index 97% rename from src/main/java/se/goransson/qatja/messages/MQTTSuback.java rename to src/main/java/se/wetcat/qatja/messages/MQTTSuback.java index 5b481e1..7842bd0 100644 --- a/src/main/java/se/goransson/qatja/messages/MQTTSuback.java +++ b/src/main/java/se/wetcat/qatja/messages/MQTTSuback.java @@ -1,4 +1,4 @@ -package se.goransson.qatja.messages; +package se.wetcat.qatja.messages; /* * Copyright (C) 2014 Andreas Goransson @@ -16,7 +16,7 @@ * limitations under the License. */ -import se.goransson.qatja.MQTTException; +import se.wetcat.qatja.MQTTException; import java.io.IOException; diff --git a/src/main/java/se/goransson/qatja/messages/MQTTSubscribe.java b/src/main/java/se/wetcat/qatja/messages/MQTTSubscribe.java similarity index 96% rename from src/main/java/se/goransson/qatja/messages/MQTTSubscribe.java rename to src/main/java/se/wetcat/qatja/messages/MQTTSubscribe.java index da02763..323d4c9 100644 --- a/src/main/java/se/goransson/qatja/messages/MQTTSubscribe.java +++ b/src/main/java/se/wetcat/qatja/messages/MQTTSubscribe.java @@ -1,4 +1,4 @@ -package se.goransson.qatja.messages; +package se.wetcat.qatja.messages; /* * Copyright (C) 2014 Andreas Goransson @@ -16,8 +16,8 @@ * limitations under the License. */ -import se.goransson.qatja.MQTTException; -import se.goransson.qatja.MQTTHelper; +import se.wetcat.qatja.MQTTException; +import se.wetcat.qatja.MQTTHelper; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/se/goransson/qatja/messages/MQTTUnsubscribe.java b/src/main/java/se/wetcat/qatja/messages/MQTTUnsubscribe.java similarity index 96% rename from src/main/java/se/goransson/qatja/messages/MQTTUnsubscribe.java rename to src/main/java/se/wetcat/qatja/messages/MQTTUnsubscribe.java index c74d89e..5796db7 100644 --- a/src/main/java/se/goransson/qatja/messages/MQTTUnsubscribe.java +++ b/src/main/java/se/wetcat/qatja/messages/MQTTUnsubscribe.java @@ -1,4 +1,4 @@ -package se.goransson.qatja.messages; +package se.wetcat.qatja.messages; /* * Copyright (C) 2014 Andreas Goransson @@ -16,8 +16,8 @@ * limitations under the License. */ -import se.goransson.qatja.MQTTException; -import se.goransson.qatja.MQTTHelper; +import se.wetcat.qatja.MQTTException; +import se.wetcat.qatja.MQTTHelper; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/test/java/se/goransson/qatja/messages/MQTTConnackTest.java b/src/test/java/se/wetcat/qatja/messages/MQTTConnackTest.java similarity index 96% rename from src/test/java/se/goransson/qatja/messages/MQTTConnackTest.java rename to src/test/java/se/wetcat/qatja/messages/MQTTConnackTest.java index 6736f85..2dd34c6 100644 --- a/src/test/java/se/goransson/qatja/messages/MQTTConnackTest.java +++ b/src/test/java/se/wetcat/qatja/messages/MQTTConnackTest.java @@ -1,4 +1,4 @@ -package se.goransson.qatja.messages; +package se.wetcat.qatja.messages; import junit.framework.TestCase;