From 63a91735671efa40f5743e0d2649368af1a73f95 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sat, 13 Feb 2021 01:52:59 +0100
Subject: [PATCH] Cleanup structure
---
.editorconfig | 25 +--
app/build.gradle.kts | 39 ++++-
.../app/ExampleInstrumentedTest.kt | 4 +-
app/src/main/AndroidManifest.xml | 6 +-
.../justjanne/quasseldroid/app}/Color.kt | 2 +-
.../quasseldroid/app/MainActivity.kt | 5 +-
.../app/QuasseldroidApplication.kt | 2 +-
.../justjanne/quasseldroid/app}/Shape.kt | 2 +-
.../justjanne/quasseldroid/app}/Theme.kt | 21 ++-
.../justjanne/quasseldroid/app}/Type.kt | 2 +-
build.gradle.kts | 5 +-
.../androidsigning/AndroidSigningPlugin.kt | 44 +++++
.../androidsigning/ProjectPropertiesHelper.kt | 32 ++++
.../justjanne/androidsigning/SigningData.kt | 40 +++++
.../CoverageConverterAction.kt | 83 +++++++++
.../CoverageConverterExtension.kt | 14 ++
.../CoverageConverterPlugin.kt | 66 +++++++
.../justjanne/gitversion/GitVersionPlugin.kt | 56 ++++++
.../gitversion}/NullOutputStream.kt | 2 +-
.../gitversion}/ProjectHelper.kt | 16 +-
.../gitversion}/VersionHelper.kt | 2 +-
.../de/kuschku/justcode/JustCodePlugin.kt | 83 ---------
.../kotlin/de/kuschku/justcode/SigningData.kt | 21 ---
.../de.justjanne.android-signing.properties | 1 +
.../de.justjanne.git-version.properties | 1 +
...anne.jacoco-cobertura-converter.properties | 1 +
.../de.kuschku.justcode.properties | 1 -
.../main/resources/coverageconverter/LICENSE | 21 +++
.../coverageconverter/cover2cover.py | 163 ++++++++++++++++++
.../coverageconverter/source2filename.py | 44 +++++
.../codecoverage/Generated.kt | 2 +-
gradle.properties | 1 -
libquassel/build.gradle.kts | 2 +-
.../libquassel/client}/io/CoroutineChannel.kt | 6 +-
.../client}/io/FixedDeflaterOutputStream.kt | 2 +-
.../client}/io/ReadableWrappedChannel.kt | 2 +-
.../libquassel/client}/io/StreamChannel.kt | 4 +-
.../client}/io/WritableWrappedChannel.kt | 2 +-
.../libquassel/client}/util/TlsInfo.kt | 2 +-
.../libquassel/client}/util/X509Helper.kt | 2 +-
.../libquassel/client}/EndToEndTest.kt | 30 ++--
.../client}/testutil/QuasselCoreContainer.kt | 2 +-
.../client}/testutil/TestX509TrustManager.kt | 2 +-
protocol/build.gradle.kts | 4 +-
.../protocol/connection/ConnectionHeader.kt | 2 +-
.../connection/ConnectionHeaderSerializer.kt | 14 +-
.../protocol/connection/ProtocolFeature.kt | 2 +-
.../protocol/connection/ProtocolInfo.kt | 2 +-
.../connection/ProtocolInfoSerializer.kt | 10 +-
.../protocol/connection/ProtocolMeta.kt | 2 +-
.../connection/ProtocolMetaSerializer.kt | 12 +-
.../protocol/connection/ProtocolVersion.kt | 2 +-
.../protocol/features/FeatureSet.kt | 2 +-
.../protocol/features/LegacyFeature.kt | 2 +-
.../protocol/features/QuasselFeature.kt | 4 +-
.../libquassel}/protocol/io/ByteBufferUtil.kt | 2 +-
.../protocol/io/ChainedByteBuffer.kt | 2 +-
.../libquassel}/protocol/io/StringEncoder.kt | 2 +-
.../protocol/messages/handshake/ClientInit.kt | 6 +-
.../messages/handshake/ClientInitAck.kt | 8 +-
.../messages/handshake/ClientInitReject.kt | 2 +-
.../messages/handshake/ClientLogin.kt | 2 +-
.../messages/handshake/ClientLoginAck.kt | 2 +-
.../messages/handshake/ClientLoginReject.kt | 2 +-
.../messages/handshake/CoreSetupAck.kt | 2 +-
.../messages/handshake/CoreSetupData.kt | 4 +-
.../messages/handshake/CoreSetupReject.kt | 2 +-
.../messages/handshake/SessionInit.kt | 4 +-
.../serializers/HandshakeSerializers.kt | 6 +-
.../NoSerializerForTypeException.kt | 6 +-
.../protocol/serializers/QtSerializers.kt | 6 +-
.../serializers/QuasselSerializers.kt | 6 +-
.../handshake/ClientInitAckSerializer.kt | 10 +-
.../handshake/ClientInitRejectSerializer.kt | 12 +-
.../handshake/ClientInitSerializer.kt | 16 +-
.../handshake/ClientLoginAckSerializer.kt | 13 +-
.../handshake/ClientLoginRejectSerializer.kt | 12 +-
.../handshake/ClientLoginSerializer.kt | 12 +-
.../handshake/CoreSetupAckSerializer.kt | 10 +-
.../handshake/CoreSetupDataSerializer.kt | 12 +-
.../handshake/CoreSetupRejectSerializer.kt | 13 +-
.../handshake/HandshakeSerializer.kt | 4 +-
.../handshake/SessionInitSerializer.kt | 12 +-
.../serializers/primitive/BoolSerializer.kt | 8 +-
.../primitive/BufferIdSerializer.kt | 10 +-
.../primitive/BufferInfoSerializer.kt | 12 +-
.../primitive/ByteBufferSerializer.kt | 10 +-
.../serializers/primitive/ByteSerializer.kt | 8 +-
.../serializers/primitive/DateSerializer.kt | 8 +-
.../primitive/DateTimeSerializer.kt | 10 +-
.../primitive/DccIpDetectionModeSerializer.kt | 10 +-
.../DccPortSelectionModeSerializer.kt | 10 +-
.../serializers/primitive/DoubleSerializer.kt | 8 +-
.../serializers/primitive/FloatSerializer.kt | 8 +-
.../primitive/HandshakeMapSerializer.kt | 8 +-
.../primitive/IdentityIdSerializer.kt | 10 +-
.../serializers/primitive/IntSerializer.kt | 8 +-
.../serializers/primitive/LongSerializer.kt | 8 +-
.../primitive/MessageSerializer.kt | 16 +-
.../serializers/primitive/MsgIdSerializer.kt | 12 +-
.../primitive/NetworkIdSerializer.kt | 10 +-
.../primitive/PeerPtrSerializer.kt | 8 +-
.../serializers/primitive/QCharSerializer.kt | 10 +-
.../primitive/QHostAddressSerializer.kt | 14 +-
.../primitive/QStringListSerializer.kt | 10 +-
.../primitive/QVariantListSerializer.kt | 12 +-
.../primitive/QVariantMapSerializer.kt | 12 +-
.../primitive/QVariantSerializer.kt | 20 +--
.../serializers/primitive/QtSerializer.kt | 4 +-
.../primitive/QuasselSerializer.kt | 6 +-
.../serializers/primitive/Serializer.kt | 6 +-
.../serializers/primitive/ShortSerializer.kt | 8 +-
.../serializers/primitive/StringSerializer.kt | 10 +-
.../primitive/StringSerializerAscii.kt | 2 +-
.../primitive/StringSerializerUtf16.kt | 2 +-
.../primitive/StringSerializerUtf8.kt | 2 +-
.../serializers/primitive/TimeSerializer.kt | 8 +-
.../serializers/primitive/UByteSerializer.kt | 8 +-
.../serializers/primitive/UIntSerializer.kt | 8 +-
.../serializers/primitive/ULongSerializer.kt | 8 +-
.../serializers/primitive/UShortSerializer.kt | 8 +-
.../serializers/primitive/VoidSerializer.kt | 8 +-
.../protocol/types/BufferActivity.kt | 2 +-
.../libquassel}/protocol/types/BufferId.kt | 2 +-
.../libquassel}/protocol/types/BufferInfo.kt | 2 +-
.../libquassel}/protocol/types/BufferType.kt | 2 +-
.../protocol/types/DccIpDetectionMode.kt | 3 +-
.../protocol/types/DccPortSelectionMode.kt | 3 +-
.../libquassel}/protocol/types/IdentityId.kt | 2 +-
.../libquassel}/protocol/types/Message.kt | 2 +-
.../libquassel}/protocol/types/MessageFlag.kt | 2 +-
.../libquassel}/protocol/types/MessageType.kt | 2 +-
.../libquassel}/protocol/types/MsgId.kt | 2 +-
.../libquassel}/protocol/types/NetworkId.kt | 2 +-
.../protocol/types/NetworkLayerProtocol.kt | 2 +-
.../libquassel}/protocol/types/SignedId.kt | 4 +-
.../libquassel}/protocol/types/TimeSpec.kt | 2 +-
.../libquassel}/protocol/variant/QVariant.kt | 18 +-
.../libquassel}/protocol/variant/QtType.kt | 2 +-
.../protocol/variant/QuasselType.kt | 2 +-
.../ConnectionHeaderSerializerTest.kt | 8 +-
.../protocol/features/FeatureSetTest.kt | 2 +-
.../protocol/io/ChainedByteBufferTest.kt | 4 +-
.../protocol/io/StringEncoderTest.kt | 6 +-
.../handshake/ClientInitSerializerTest.kt | 16 +-
.../primitive/BoolSerializerTest.kt | 10 +-
.../primitive/BufferIdSerializerTest.kt | 12 +-
.../primitive/BufferInfoSerializerTest.kt | 18 +-
.../primitive/ByteBufferSerializerTest.kt | 12 +-
.../primitive/ByteSerializerTest.kt | 10 +-
.../primitive/DateTimeSerializerTest.kt | 12 +-
.../DccIpDetectionModeSerializerTest.kt | 12 +-
.../DccPortSelectionModeSerializerTest.kt | 12 +-
.../primitive/DoubleSerializerTest.kt | 10 +-
.../primitive/FloatSerializerTest.kt | 10 +-
.../primitive/IdentityIdSerializerTest.kt | 12 +-
.../primitive/IntSerializerTest.kt | 10 +-
.../primitive/LongSerializerTest.kt | 10 +-
.../primitive/MessageSerializerTest.kt | 14 +-
.../primitive/MsgIdSerializerTest.kt | 14 +-
.../primitive/NetworkIdSerializerTest.kt | 12 +-
.../primitive/PeerPtrSerializerTest.kt | 12 +-
.../primitive/QCharSerializerTest.kt | 12 +-
.../primitive/QHostAddressSerializerTest.kt | 10 +-
.../primitive/QVariantListSerializerTest.kt | 16 +-
.../primitive/QVariantMapSerializerTest.kt | 16 +-
.../primitive/QVariantSerializerTest.kt | 14 +-
.../primitive/ShortSerializerTest.kt | 10 +-
.../primitive/StringSerializerTest.kt | 20 +--
.../primitive/UByteSerializerTest.kt | 10 +-
.../primitive/UIntSerializerTest.kt | 10 +-
.../primitive/ULongSerializerTest.kt | 10 +-
.../primitive/UShortSerializerTest.kt | 10 +-
.../primitive/VoidSerializerTest.kt | 10 +-
.../protocol/testutil/byteBufferOf.kt | 2 +-
.../protocol/testutil/deserialize.kt | 10 +-
.../testutil/handshakeSerializerTest.kt | 6 +-
.../testutil/matchers/BomMatcherChar.kt | 2 +-
.../testutil/matchers/BomMatcherString.kt | 2 +-
.../testutil/matchers/ByteBufferMatcher.kt | 6 +-
.../protocol/testutil/matchers/MapMatcher.kt | 2 +-
.../testutil/matchers/TemporalMatcher.kt | 2 +-
.../protocol/testutil/qtSerializerTest.kt | 6 +-
.../testutil/quasselSerializerTest.kt | 6 +-
.../protocol/testutil/serialize.kt | 14 +-
.../protocol/testutil/serializerTest.kt | 6 +-
.../testutil/testHandshakeSerializerDirect.kt | 4 +-
.../testHandshakeSerializerEncoded.kt | 10 +-
.../testutil/testQtSerializerDirect.kt | 10 +-
.../testutil/testQtSerializerVariant.kt | 12 +-
.../testutil/testQuasselSerializerDirect.kt | 8 +-
.../testutil/testQuasselSerializerVariant.kt | 12 +-
.../protocol/types/SignedIdTest.kt | 2 +-
.../protocol/variant/QVariantTest.kt | 8 +-
settings.gradle.kts | 1 -
195 files changed, 1254 insertions(+), 778 deletions(-)
rename app/src/androidTest/java/{info => de/justjanne}/quasseldroid/app/ExampleInstrumentedTest.kt (92%)
rename app/src/main/java/{info/quasseldroid/app/theme => de/justjanne/quasseldroid/app}/Color.kt (82%)
rename app/src/main/java/{info => de/justjanne}/quasseldroid/app/MainActivity.kt (97%)
rename app/src/main/java/{info => de/justjanne}/quasseldroid/app/QuasseldroidApplication.kt (95%)
rename app/src/main/java/{info/quasseldroid/app/theme => de/justjanne/quasseldroid/app}/Shape.kt (87%)
rename app/src/main/java/{info/quasseldroid/app/theme => de/justjanne/quasseldroid/app}/Theme.kt (56%)
rename app/src/main/java/{info/quasseldroid/app/theme => de/justjanne/quasseldroid/app}/Type.kt (94%)
create mode 100644 buildSrc/src/main/kotlin/de/justjanne/androidsigning/AndroidSigningPlugin.kt
create mode 100644 buildSrc/src/main/kotlin/de/justjanne/androidsigning/ProjectPropertiesHelper.kt
create mode 100644 buildSrc/src/main/kotlin/de/justjanne/androidsigning/SigningData.kt
create mode 100644 buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterAction.kt
create mode 100644 buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterExtension.kt
create mode 100644 buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterPlugin.kt
create mode 100644 buildSrc/src/main/kotlin/de/justjanne/gitversion/GitVersionPlugin.kt
rename buildSrc/src/main/kotlin/de/{kuschku/justcode => justjanne/gitversion}/NullOutputStream.kt (97%)
rename buildSrc/src/main/kotlin/de/{kuschku/justcode => justjanne/gitversion}/ProjectHelper.kt (79%)
rename buildSrc/src/main/kotlin/de/{kuschku/justcode => justjanne/gitversion}/VersionHelper.kt (97%)
delete mode 100644 buildSrc/src/main/kotlin/de/kuschku/justcode/JustCodePlugin.kt
delete mode 100644 buildSrc/src/main/kotlin/de/kuschku/justcode/SigningData.kt
create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.android-signing.properties
create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.git-version.properties
create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.jacoco-cobertura-converter.properties
delete mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/de.kuschku.justcode.properties
create mode 100644 buildSrc/src/main/resources/coverageconverter/LICENSE
create mode 100644 buildSrc/src/main/resources/coverageconverter/cover2cover.py
create mode 100644 buildSrc/src/main/resources/coverageconverter/source2filename.py
rename coverage-annotations/src/main/kotlin/de/{kuschku => justjanne}/codecoverage/Generated.kt (96%)
rename libquassel/src/main/kotlin/{info/quasseldroid/libquassel => de/justjanne/libquassel/client}/io/CoroutineChannel.kt (94%)
rename libquassel/src/main/kotlin/{info/quasseldroid/libquassel => de/justjanne/libquassel/client}/io/FixedDeflaterOutputStream.kt (95%)
rename libquassel/src/main/kotlin/{info/quasseldroid/libquassel => de/justjanne/libquassel/client}/io/ReadableWrappedChannel.kt (98%)
rename libquassel/src/main/kotlin/{info/quasseldroid/libquassel => de/justjanne/libquassel/client}/io/StreamChannel.kt (96%)
rename libquassel/src/main/kotlin/{info/quasseldroid/libquassel => de/justjanne/libquassel/client}/io/WritableWrappedChannel.kt (98%)
rename libquassel/src/main/kotlin/{info/quasseldroid/libquassel => de/justjanne/libquassel/client}/util/TlsInfo.kt (98%)
rename libquassel/src/main/kotlin/{info/quasseldroid/libquassel => de/justjanne/libquassel/client}/util/X509Helper.kt (96%)
rename libquassel/src/test/kotlin/{info/quasseldroid/libquassel => de/justjanne/libquassel/client}/EndToEndTest.kt (88%)
rename libquassel/src/test/kotlin/{info/quasseldroid/libquassel => de/justjanne/libquassel/client}/testutil/QuasselCoreContainer.kt (97%)
rename libquassel/src/test/kotlin/{info/quasseldroid/libquassel => de/justjanne/libquassel/client}/testutil/TestX509TrustManager.kt (96%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/connection/ConnectionHeader.kt (94%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/connection/ConnectionHeaderSerializer.kt (85%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/connection/ProtocolFeature.kt (95%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/connection/ProtocolInfo.kt (93%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/connection/ProtocolInfoSerializer.kt (80%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/connection/ProtocolMeta.kt (93%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/connection/ProtocolMetaSerializer.kt (76%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/connection/ProtocolVersion.kt (95%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/features/FeatureSet.kt (97%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/features/LegacyFeature.kt (98%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/features/QuasselFeature.kt (96%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/io/ByteBufferUtil.kt (97%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/io/ChainedByteBuffer.kt (98%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/io/StringEncoder.kt (98%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/messages/handshake/ClientInit.kt (82%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/messages/handshake/ClientInitAck.kt (78%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/messages/handshake/ClientInitReject.kt (92%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/messages/handshake/ClientLogin.kt (93%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/messages/handshake/ClientLoginAck.kt (93%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/messages/handshake/ClientLoginReject.kt (92%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/messages/handshake/CoreSetupAck.kt (93%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/messages/handshake/CoreSetupData.kt (88%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/messages/handshake/CoreSetupReject.kt (92%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/messages/handshake/SessionInit.kt (87%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/HandshakeSerializers.kt (90%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/NoSerializerForTypeException.kt (92%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/QtSerializers.kt (91%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/QuasselSerializers.kt (90%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/handshake/ClientInitAckSerializer.kt (85%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/handshake/ClientInitRejectSerializer.kt (77%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/handshake/ClientInitSerializer.kt (77%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/handshake/ClientLoginAckSerializer.kt (72%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/handshake/ClientLoginRejectSerializer.kt (77%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/handshake/ClientLoginSerializer.kt (77%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/handshake/CoreSetupAckSerializer.kt (78%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/handshake/CoreSetupDataSerializer.kt (84%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/handshake/CoreSetupRejectSerializer.kt (75%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/handshake/HandshakeSerializer.kt (87%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/handshake/SessionInitSerializer.kt (81%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/BoolSerializer.kt (83%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/BufferIdSerializer.kt (80%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/BufferInfoSerializer.kt (85%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/ByteBufferSerializer.kt (83%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/ByteSerializer.kt (82%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/DateSerializer.kt (85%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/DateTimeSerializer.kt (90%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt (82%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt (82%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/DoubleSerializer.kt (82%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/FloatSerializer.kt (82%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/HandshakeMapSerializer.kt (88%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/IdentityIdSerializer.kt (80%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/IntSerializer.kt (82%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/LongSerializer.kt (82%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/MessageSerializer.kt (87%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/MsgIdSerializer.kt (81%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/NetworkIdSerializer.kt (80%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/PeerPtrSerializer.kt (82%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/QCharSerializer.kt (82%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/QHostAddressSerializer.kt (87%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/QStringListSerializer.kt (83%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/QVariantListSerializer.kt (81%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/QVariantMapSerializer.kt (83%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/QVariantSerializer.kt (81%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/QtSerializer.kt (87%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/QuasselSerializer.kt (83%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/Serializer.kt (83%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/ShortSerializer.kt (82%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/StringSerializer.kt (89%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/StringSerializerAscii.kt (92%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/StringSerializerUtf16.kt (92%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/StringSerializerUtf8.kt (92%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/TimeSerializer.kt (85%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/UByteSerializer.kt (82%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/UIntSerializer.kt (82%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/ULongSerializer.kt (82%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/UShortSerializer.kt (83%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/VoidSerializer.kt (81%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/types/BufferActivity.kt (96%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/types/BufferId.kt (95%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/types/BufferInfo.kt (95%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/types/BufferType.kt (96%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/types/DccIpDetectionMode.kt (95%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/types/DccPortSelectionMode.kt (95%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/types/IdentityId.kt (95%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/types/Message.kt (96%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/types/MessageFlag.kt (96%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/types/MessageType.kt (96%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/types/MsgId.kt (95%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/types/NetworkId.kt (95%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/types/NetworkLayerProtocol.kt (95%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/types/SignedId.kt (93%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/types/TimeSpec.kt (95%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/variant/QVariant.kt (83%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/variant/QtType.kt (97%)
rename protocol/src/main/java/{info/quasseldroid => de/justjanne/libquassel}/protocol/variant/QuasselType.kt (96%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/connection/ConnectionHeaderSerializerTest.kt (91%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/features/FeatureSetTest.kt (97%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/io/ChainedByteBufferTest.kt (96%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/io/StringEncoderTest.kt (92%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/handshake/ClientInitSerializerTest.kt (85%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/BoolSerializerTest.kt (79%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/BufferIdSerializerTest.kt (80%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/BufferInfoSerializerTest.kt (76%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/ByteBufferSerializerTest.kt (82%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/ByteSerializerTest.kt (82%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/DateTimeSerializerTest.kt (89%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt (77%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt (77%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/DoubleSerializerTest.kt (86%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/FloatSerializerTest.kt (85%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/IdentityIdSerializerTest.kt (80%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/IntSerializerTest.kt (82%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/LongSerializerTest.kt (82%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/MessageSerializerTest.kt (92%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/MsgIdSerializerTest.kt (79%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/NetworkIdSerializerTest.kt (80%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/PeerPtrSerializerTest.kt (81%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/QCharSerializerTest.kt (84%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/QHostAddressSerializerTest.kt (84%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/QVariantListSerializerTest.kt (60%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/QVariantMapSerializerTest.kt (83%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/QVariantSerializerTest.kt (83%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/ShortSerializerTest.kt (82%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/StringSerializerTest.kt (94%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/UByteSerializerTest.kt (82%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/UIntSerializerTest.kt (82%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/ULongSerializerTest.kt (83%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/UShortSerializerTest.kt (82%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/serializers/primitive/VoidSerializerTest.kt (77%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/byteBufferOf.kt (95%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/deserialize.kt (86%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/handshakeSerializerTest.kt (89%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/matchers/BomMatcherChar.kt (95%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/matchers/BomMatcherString.kt (95%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/matchers/ByteBufferMatcher.kt (90%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/matchers/MapMatcher.kt (96%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/matchers/TemporalMatcher.kt (96%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/qtSerializerTest.kt (90%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/quasselSerializerTest.kt (90%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/serialize.kt (76%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/serializerTest.kt (88%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/testHandshakeSerializerDirect.kt (89%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/testHandshakeSerializerEncoded.kt (80%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/testQtSerializerDirect.kt (81%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/testQtSerializerVariant.kt (79%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/testQuasselSerializerDirect.kt (84%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/testutil/testQuasselSerializerVariant.kt (78%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/types/SignedIdTest.kt (98%)
rename protocol/src/test/kotlin/{info/quasseldroid => de/justjanne/libquassel}/protocol/variant/QVariantTest.kt (85%)
diff --git a/.editorconfig b/.editorconfig
index d9f5985b3..82d032b90 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,28 +3,5 @@ charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
-indent_size = 4
-
-[{*.mod, *.dtd, *.ent, *.elt}]
-indent_style = space
-indent_size = 2
-
-[{*.jhm, *.rng, *.wsdl, *.fxml, *.xslt, *.jrxml, *.ant, *.xul, *.xsl, *.xsd, *.tld, *.jnlp, *.xml}]
-indent_style = space
-indent_size = 2
-
-[*.json]
-indent_style = space
-indent_size = 2
-
-[*.java]
-indent_style = space
-indent_size = 2
-
-[{*.kts, *.kt}]
-indent_style = space
-indent_size = 2
-
-[{*.yml, *.yaml}]
-indent_style = space
indent_size = 2
+max_line_length = 120
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9f9cae2f6..d33a91812 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,16 +1,49 @@
plugins {
id("com.android.application")
- id("kotlin-android")
- id("kotlin-kapt")
- id("de.kuschku.justcode")
+ kotlin("android")
+ kotlin("kapt")
+ id("de.justjanne.git-version")
+ id("de.justjanne.android-signing")
}
android {
+ setCompileSdkVersion(30)
+ buildToolsVersion = "30.0.3"
+
defaultConfig {
applicationId = "com.iskrembilen.quasseldroid"
setMinSdkVersion(21)
setTargetSdkVersion(30)
+
+ testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+ // Disable test runner analytics
+ testInstrumentationRunnerArguments(mapOf(
+ "disableAnalytics" to "true"
+ ))
+ }
+
+ buildTypes {
+ getByName("release") {
+ isMinifyEnabled = true
+ isShrinkResources = true
+ multiDexEnabled = true
+
+ proguardFiles(
+ getDefaultProguardFile("proguard-android.txt"),
+ "proguard-rules.pro"
+ )
+ }
+
+ getByName("debug") {
+ applicationIdSuffix = ".debug"
+ multiDexEnabled = true
+ }
+ }
+
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
}
buildFeatures {
diff --git a/app/src/androidTest/java/info/quasseldroid/app/ExampleInstrumentedTest.kt b/app/src/androidTest/java/de/justjanne/quasseldroid/app/ExampleInstrumentedTest.kt
similarity index 92%
rename from app/src/androidTest/java/info/quasseldroid/app/ExampleInstrumentedTest.kt
rename to app/src/androidTest/java/de/justjanne/quasseldroid/app/ExampleInstrumentedTest.kt
index d1c52c3fe..f92b1a88d 100644
--- a/app/src/androidTest/java/info/quasseldroid/app/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/de/justjanne/quasseldroid/app/ExampleInstrumentedTest.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.app
+package de.justjanne.quasseldroid.app
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
@@ -36,6 +36,6 @@ class ExampleInstrumentedTest {
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
- assertEquals("info.quasseldroid.app", appContext.packageName)
+ assertEquals("de.justjanne.app", appContext.packageName)
}
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b710a6b4f..dd9ee3b5b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="info.quasseldroid.app">
+ package="de.justjanne.quasseldroid.app">
<uses-feature
android:name="android.hardware.type.pc"
@@ -13,7 +13,7 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application
- android:name="info.quasseldroid.app.QuasseldroidApplication"
+ android:name=".QuasseldroidApplication"
android:allowBackup="true"
android:fullBackupContent="@xml/backup_descriptor"
android:icon="@mipmap/ic_launcher"
@@ -22,7 +22,7 @@
android:supportsRtl="true"
android:theme="@style/Theme.Quasseldroid">
<activity
- android:name="info.quasseldroid.app.MainActivity"
+ android:name=".MainActivity"
android:label="@string/app_name"
android:theme="@style/Theme.Quasseldroid.NoActionBar">
<intent-filter>
diff --git a/app/src/main/java/info/quasseldroid/app/theme/Color.kt b/app/src/main/java/de/justjanne/quasseldroid/app/Color.kt
similarity index 82%
rename from app/src/main/java/info/quasseldroid/app/theme/Color.kt
rename to app/src/main/java/de/justjanne/quasseldroid/app/Color.kt
index 3e09405ed..8283c6399 100644
--- a/app/src/main/java/info/quasseldroid/app/theme/Color.kt
+++ b/app/src/main/java/de/justjanne/quasseldroid/app/Color.kt
@@ -1,4 +1,4 @@
-package info.quasseldroid.app.theme
+package de.justjanne.quasseldroid.app
import androidx.compose.ui.graphics.Color
diff --git a/app/src/main/java/info/quasseldroid/app/MainActivity.kt b/app/src/main/java/de/justjanne/quasseldroid/app/MainActivity.kt
similarity index 97%
rename from app/src/main/java/info/quasseldroid/app/MainActivity.kt
rename to app/src/main/java/de/justjanne/quasseldroid/app/MainActivity.kt
index 7a5cf9351..9f00473ac 100644
--- a/app/src/main/java/info/quasseldroid/app/MainActivity.kt
+++ b/app/src/main/java/de/justjanne/quasseldroid/app/MainActivity.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.app
+package de.justjanne.quasseldroid.app
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
@@ -39,9 +39,6 @@ import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.lifecycle.lifecycleScope
-import info.quasseldroid.app.theme.QuasseldroidTheme
-import info.quasseldroid.app.theme.shapes
-import info.quasseldroid.app.theme.typography
import dev.chrisbanes.accompanist.coil.CoilImage
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/app/src/main/java/info/quasseldroid/app/QuasseldroidApplication.kt b/app/src/main/java/de/justjanne/quasseldroid/app/QuasseldroidApplication.kt
similarity index 95%
rename from app/src/main/java/info/quasseldroid/app/QuasseldroidApplication.kt
rename to app/src/main/java/de/justjanne/quasseldroid/app/QuasseldroidApplication.kt
index 43e54102c..e7b89188f 100644
--- a/app/src/main/java/info/quasseldroid/app/QuasseldroidApplication.kt
+++ b/app/src/main/java/de/justjanne/quasseldroid/app/QuasseldroidApplication.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.app
+package de.justjanne.quasseldroid.app
import androidx.multidex.MultiDexApplication
import dagger.hilt.android.HiltAndroidApp
diff --git a/app/src/main/java/info/quasseldroid/app/theme/Shape.kt b/app/src/main/java/de/justjanne/quasseldroid/app/Shape.kt
similarity index 87%
rename from app/src/main/java/info/quasseldroid/app/theme/Shape.kt
rename to app/src/main/java/de/justjanne/quasseldroid/app/Shape.kt
index c42049e2f..e9ac8d7aa 100644
--- a/app/src/main/java/info/quasseldroid/app/theme/Shape.kt
+++ b/app/src/main/java/de/justjanne/quasseldroid/app/Shape.kt
@@ -1,4 +1,4 @@
-package info.quasseldroid.app.theme
+package de.justjanne.quasseldroid.app
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Shapes
diff --git a/app/src/main/java/info/quasseldroid/app/theme/Theme.kt b/app/src/main/java/de/justjanne/quasseldroid/app/Theme.kt
similarity index 56%
rename from app/src/main/java/info/quasseldroid/app/theme/Theme.kt
rename to app/src/main/java/de/justjanne/quasseldroid/app/Theme.kt
index c1eba54cc..b40a6b0ec 100644
--- a/app/src/main/java/info/quasseldroid/app/theme/Theme.kt
+++ b/app/src/main/java/de/justjanne/quasseldroid/app/Theme.kt
@@ -1,4 +1,23 @@
-package info.quasseldroid.app.theme
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ * Copyright (c) 2021 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.justjanne.quasseldroid.app
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material.MaterialTheme
diff --git a/app/src/main/java/info/quasseldroid/app/theme/Type.kt b/app/src/main/java/de/justjanne/quasseldroid/app/Type.kt
similarity index 94%
rename from app/src/main/java/info/quasseldroid/app/theme/Type.kt
rename to app/src/main/java/de/justjanne/quasseldroid/app/Type.kt
index 92be9b63b..dae71d3aa 100644
--- a/app/src/main/java/info/quasseldroid/app/theme/Type.kt
+++ b/app/src/main/java/de/justjanne/quasseldroid/app/Type.kt
@@ -1,4 +1,4 @@
-package info.quasseldroid.app.theme
+package de.justjanne.quasseldroid.app
import androidx.compose.material.Typography
import androidx.compose.ui.text.TextStyle
diff --git a/build.gradle.kts b/build.gradle.kts
index 78a62860e..9e35158d5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,6 +19,10 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+plugins {
+ id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
+}
+
buildscript {
repositories {
google()
@@ -37,7 +41,6 @@ allprojects {
google()
mavenCentral()
jcenter()
- mavenLocal()
}
tasks.withType<KotlinCompile>().configureEach {
diff --git a/buildSrc/src/main/kotlin/de/justjanne/androidsigning/AndroidSigningPlugin.kt b/buildSrc/src/main/kotlin/de/justjanne/androidsigning/AndroidSigningPlugin.kt
new file mode 100644
index 000000000..ff6ee47bc
--- /dev/null
+++ b/buildSrc/src/main/kotlin/de/justjanne/androidsigning/AndroidSigningPlugin.kt
@@ -0,0 +1,44 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ * Copyright (c) 2021 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.justjanne.androidsigning
+
+import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.getByType
+
+class AndroidSigningPlugin : Plugin<Project> {
+ override fun apply(project: Project) {
+ project.run {
+ this.extensions.getByType<BaseAppModuleExtension>().run {
+ signingConfigs {
+ signingData(project.rootProject.properties("signing.properties"))?.let {
+ create("default") {
+ storeFile = file(it.storeFile)
+ storePassword = it.storePassword
+ keyAlias = it.keyAlias
+ keyPassword = it.keyPassword
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/buildSrc/src/main/kotlin/de/justjanne/androidsigning/ProjectPropertiesHelper.kt b/buildSrc/src/main/kotlin/de/justjanne/androidsigning/ProjectPropertiesHelper.kt
new file mode 100644
index 000000000..a16f5404c
--- /dev/null
+++ b/buildSrc/src/main/kotlin/de/justjanne/androidsigning/ProjectPropertiesHelper.kt
@@ -0,0 +1,32 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ * Copyright (c) 2021 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.justjanne.androidsigning
+
+import org.gradle.api.Project
+import java.util.*
+
+fun Project.properties(fileName: String): Properties? {
+ val file = file(fileName)
+ if (!file.exists())
+ return null
+ val props = Properties()
+ props.load(file.inputStream())
+ return props
+}
diff --git a/buildSrc/src/main/kotlin/de/justjanne/androidsigning/SigningData.kt b/buildSrc/src/main/kotlin/de/justjanne/androidsigning/SigningData.kt
new file mode 100644
index 000000000..2604d6aab
--- /dev/null
+++ b/buildSrc/src/main/kotlin/de/justjanne/androidsigning/SigningData.kt
@@ -0,0 +1,40 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ * Copyright (c) 2021 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.justjanne.androidsigning
+
+import java.util.*
+
+data class SigningData(
+ val storeFile: String,
+ val storePassword: String,
+ val keyAlias: String,
+ val keyPassword: String
+)
+
+fun signingData(properties: Properties?): SigningData? {
+ if (properties == null) return null
+
+ val storeFile = properties.getProperty("storeFile") ?: return null
+ val storePassword = properties.getProperty("storePassword") ?: return null
+ val keyAlias = properties.getProperty("keyAlias") ?: return null
+ val keyPassword = properties.getProperty("keyPassword") ?: return null
+
+ return SigningData(storeFile, storePassword, keyAlias, keyPassword)
+}
diff --git a/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterAction.kt b/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterAction.kt
new file mode 100644
index 000000000..f4522971f
--- /dev/null
+++ b/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterAction.kt
@@ -0,0 +1,83 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ * Copyright (c) 2021 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.justjanne.coverageconverter
+
+import org.gradle.api.Action
+import org.gradle.api.Task
+import org.gradle.testing.jacoco.tasks.JacocoReport
+import java.io.File
+
+internal class CoverageConverterAction(
+ private val jacocoReportTask: JacocoReport
+) : Action<Task> {
+ private fun findOutputFile(jacocoFile: File): File? {
+ val actualFile = jacocoFile.absoluteFile
+ if (actualFile.exists() && actualFile.parentFile.name == "jacoco") {
+ val folder = File(actualFile.parentFile.parentFile, "cobertura")
+ folder.mkdirs()
+ return File(folder, actualFile.name)
+ }
+
+ return null
+ }
+
+ private fun createPythonScript(name: String, temporaryDir: File): File {
+ val file = File(temporaryDir, name)
+ if (file.exists()) {
+ file.delete()
+ }
+ val source = CoverageConverterPlugin::class.java.getResourceAsStream("/coverageconverter/$name")
+ file.writeBytes(source.readAllBytes())
+ return file
+ }
+
+ override fun execute(task: Task) {
+ val cover2coverScript = createPythonScript("cover2cover.py", task.temporaryDir)
+ val source2filenameScript = createPythonScript("source2filename.py", task.temporaryDir)
+
+ fun cover2cover(reportFile: File, outputFile: File, sourceDirectories: Iterable<File>) {
+ task.project.exec {
+ commandLine("python3")
+ args(cover2coverScript.absolutePath)
+ args(reportFile.absolutePath)
+ args(sourceDirectories.map(File::getAbsolutePath))
+ standardOutput = outputFile.outputStream()
+ }
+ }
+
+ fun source2filename(reportFile: File) {
+ task.project.exec {
+ commandLine("python3")
+ args(source2filenameScript.absolutePath)
+ args(reportFile.absolutePath)
+ }
+ }
+
+ jacocoReportTask.reports.forEach {
+ if (it.isEnabled && it.destination.extension == "xml") {
+ val outputFile = findOutputFile(it.destination)
+ if (outputFile != null) {
+ cover2cover(it.destination, outputFile, jacocoReportTask.sourceDirectories)
+ source2filename(outputFile)
+ }
+ }
+ }
+ }
+}
diff --git a/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterExtension.kt b/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterExtension.kt
new file mode 100644
index 000000000..59c961f47
--- /dev/null
+++ b/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterExtension.kt
@@ -0,0 +1,14 @@
+/*
+ * Kotlin Bitflags
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package de.justjanne.coverageconverter
+
+open class CoverageConverterExtension {
+ var autoConfigureCoverage: Boolean = false
+}
diff --git a/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterPlugin.kt b/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterPlugin.kt
new file mode 100644
index 000000000..0e73694d8
--- /dev/null
+++ b/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterPlugin.kt
@@ -0,0 +1,66 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ * Copyright (c) 2021 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.justjanne.coverageconverter
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
+import org.gradle.testing.jacoco.tasks.JacocoReport
+import java.io.File
+
+class CoverageConverterPlugin : Plugin<Project> {
+ override fun apply(project: Project) {
+ val extension = project.extensions.create("coverage", CoverageConverterExtension::class.java)
+
+ if (extension.autoConfigureCoverage) {
+ val jacocoPluginExtension = project.extensions.findByType(JacocoPluginExtension::class.java)
+ if (jacocoPluginExtension != null) {
+ jacocoPluginExtension.toolVersion = "0.8.3"
+ }
+ }
+
+ project.afterEvaluate {
+ val testTask = tasks.getByName("test")
+
+ val jacocoReportTask = tasks.getByName("jacocoTestReport") as? JacocoReport
+ if (jacocoReportTask != null) {
+ jacocoReportTask.dependsOn(testTask)
+ if (extension.autoConfigureCoverage) {
+ jacocoReportTask.sourceDirectories.from(fileTree("src/main/kotlin"))
+ jacocoReportTask.classDirectories.from(fileTree("build/classes"))
+ jacocoReportTask.reports {
+ xml.destination = File("${buildDir}/reports/jacoco/report.xml")
+ html.isEnabled = true
+ xml.isEnabled = true
+ csv.isEnabled = false
+ }
+ }
+
+ tasks.register("coberturaTestReport") {
+ dependsOn(jacocoReportTask)
+ mustRunAfter(jacocoReportTask)
+ group = "verification"
+
+ doLast(CoverageConverterAction(jacocoReportTask))
+ }
+ }
+ }
+ }
+}
diff --git a/buildSrc/src/main/kotlin/de/justjanne/gitversion/GitVersionPlugin.kt b/buildSrc/src/main/kotlin/de/justjanne/gitversion/GitVersionPlugin.kt
new file mode 100644
index 000000000..d1323d9dc
--- /dev/null
+++ b/buildSrc/src/main/kotlin/de/justjanne/gitversion/GitVersionPlugin.kt
@@ -0,0 +1,56 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ * Copyright (c) 2021 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.justjanne.gitversion
+
+import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.getByType
+
+class GitVersionPlugin : Plugin<Project> {
+ override fun apply(project: Project) {
+ project.run {
+ this.extensions.getByType<BaseAppModuleExtension>().run {
+ defaultConfig {
+ versionCode = gitVersionCode() ?: 1
+ versionName = gitVersionName() ?: "1.0.0"
+
+ setBuildConfigField(
+ ::buildConfigField,
+ "GIT_HEAD",
+ gitHead() ?: ""
+ )
+ setBuildConfigField(
+ ::buildConfigField,
+ "FANCY_VERSION_NAME",
+ fancyVersionName() ?: "1.0.0"
+ )
+ setBuildConfigField(
+ ::buildConfigField,
+ "GIT_COMMIT_DATE",
+ gitCommitDate()
+ )
+
+ setProperty("archivesBaseName", "${rootProject.name}-$versionName")
+ }
+ }
+ }
+ }
+}
diff --git a/buildSrc/src/main/kotlin/de/kuschku/justcode/NullOutputStream.kt b/buildSrc/src/main/kotlin/de/justjanne/gitversion/NullOutputStream.kt
similarity index 97%
rename from buildSrc/src/main/kotlin/de/kuschku/justcode/NullOutputStream.kt
rename to buildSrc/src/main/kotlin/de/justjanne/gitversion/NullOutputStream.kt
index e67610f5f..8fc8e8b33 100644
--- a/buildSrc/src/main/kotlin/de/kuschku/justcode/NullOutputStream.kt
+++ b/buildSrc/src/main/kotlin/de/justjanne/gitversion/NullOutputStream.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.justcode
+package de.justjanne.gitversion
import java.io.IOException
import java.io.OutputStream
diff --git a/buildSrc/src/main/kotlin/de/kuschku/justcode/ProjectHelper.kt b/buildSrc/src/main/kotlin/de/justjanne/gitversion/ProjectHelper.kt
similarity index 79%
rename from buildSrc/src/main/kotlin/de/kuschku/justcode/ProjectHelper.kt
rename to buildSrc/src/main/kotlin/de/justjanne/gitversion/ProjectHelper.kt
index bcde26ff3..66c649e7f 100644
--- a/buildSrc/src/main/kotlin/de/kuschku/justcode/ProjectHelper.kt
+++ b/buildSrc/src/main/kotlin/de/justjanne/gitversion/ProjectHelper.kt
@@ -1,8 +1,8 @@
/*
* Quasseldroid - Quassel client for Android
*
- * Copyright (c) 2020 Janne Mareike Koschinski
- * Copyright (c) 2020 The Quassel Project
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ * Copyright (c) 2021 The Quassel Project
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published
@@ -17,11 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.justcode
+package de.justjanne.gitversion
import org.gradle.api.Project
import java.io.ByteArrayOutputStream
-import java.util.*
fun Project.cmd(vararg command: String) = try {
val stdOut = ByteArrayOutputStream()
@@ -35,15 +34,6 @@ fun Project.cmd(vararg command: String) = try {
null
}
-fun Project.properties(fileName: String): Properties? {
- val file = file(fileName)
- if (!file.exists())
- return null
- val props = Properties()
- props.load(file.inputStream())
- return props
-}
-
inline fun <reified T> setBuildConfigField(
setter: (String, String, String) -> Unit,
name: String,
diff --git a/buildSrc/src/main/kotlin/de/kuschku/justcode/VersionHelper.kt b/buildSrc/src/main/kotlin/de/justjanne/gitversion/VersionHelper.kt
similarity index 97%
rename from buildSrc/src/main/kotlin/de/kuschku/justcode/VersionHelper.kt
rename to buildSrc/src/main/kotlin/de/justjanne/gitversion/VersionHelper.kt
index 09eba0327..af2655bc0 100644
--- a/buildSrc/src/main/kotlin/de/kuschku/justcode/VersionHelper.kt
+++ b/buildSrc/src/main/kotlin/de/justjanne/gitversion/VersionHelper.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.justcode
+package de.justjanne.gitversion
import org.gradle.api.Project
diff --git a/buildSrc/src/main/kotlin/de/kuschku/justcode/JustCodePlugin.kt b/buildSrc/src/main/kotlin/de/kuschku/justcode/JustCodePlugin.kt
deleted file mode 100644
index 697ef1ead..000000000
--- a/buildSrc/src/main/kotlin/de/kuschku/justcode/JustCodePlugin.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package de.kuschku.justcode
-
-import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
-import org.gradle.api.JavaVersion
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.getByType
-
-class JustCodePlugin : Plugin<Project> {
- override fun apply(project: Project) {
- project.run {
- this.extensions.getByType<BaseAppModuleExtension>().run {
- setCompileSdkVersion(30)
- buildToolsVersion = "30.0.3"
-
- signingConfigs {
- signingData(project.rootProject.properties("signing.properties"))?.let {
- create("default") {
- storeFile = file(it.storeFile)
- storePassword = it.storePassword
- keyAlias = it.keyAlias
- keyPassword = it.keyPassword
- }
- }
- }
-
- defaultConfig {
- versionCode = gitVersionCode() ?: 1
- versionName = gitVersionName() ?: "1.0.0"
-
- setBuildConfigField(
- ::buildConfigField,
- "GIT_HEAD",
- gitHead() ?: ""
- )
- setBuildConfigField(
- ::buildConfigField,
- "FANCY_VERSION_NAME",
- fancyVersionName() ?: "1.0.0"
- )
- setBuildConfigField(
- ::buildConfigField,
- "GIT_COMMIT_DATE",
- gitCommitDate()
- )
-
- setProperty("archivesBaseName", "${rootProject.name}-$versionName")
-
- signingConfig = signingConfigs.findByName("default")
-
- testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
- // Disable test runner analytics
- testInstrumentationRunnerArguments(mapOf(
- "disableAnalytics" to "true"
- ))
- }
-
- buildTypes {
- getByName("release") {
- isMinifyEnabled = true
- isShrinkResources = true
- multiDexEnabled = true
-
- proguardFiles(
- getDefaultProguardFile("proguard-android.txt"),
- "proguard-rules.pro"
- )
- }
-
- getByName("debug") {
- applicationIdSuffix = ".debug"
- multiDexEnabled = true
- }
- }
-
- compileOptions {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
- }
- }
- }
- }
-}
diff --git a/buildSrc/src/main/kotlin/de/kuschku/justcode/SigningData.kt b/buildSrc/src/main/kotlin/de/kuschku/justcode/SigningData.kt
deleted file mode 100644
index 5490d165c..000000000
--- a/buildSrc/src/main/kotlin/de/kuschku/justcode/SigningData.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package de.kuschku.justcode
-
-import java.util.*
-
-data class SigningData(
- val storeFile: String,
- val storePassword: String,
- val keyAlias: String,
- val keyPassword: String
-)
-
-fun signingData(properties: Properties?): SigningData? {
- if (properties == null) return null
-
- val storeFile = properties.getProperty("storeFile") ?: return null
- val storePassword = properties.getProperty("storePassword") ?: return null
- val keyAlias = properties.getProperty("keyAlias") ?: return null
- val keyPassword = properties.getProperty("keyPassword") ?: return null
-
- return SigningData(storeFile, storePassword, keyAlias, keyPassword)
-}
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.android-signing.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.android-signing.properties
new file mode 100644
index 000000000..f168d86ee
--- /dev/null
+++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.android-signing.properties
@@ -0,0 +1 @@
+implementation-class=de.justjanne.androidsigning.AndroidSigningPlugin
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.git-version.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.git-version.properties
new file mode 100644
index 000000000..d76e40206
--- /dev/null
+++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.git-version.properties
@@ -0,0 +1 @@
+implementation-class=de.justjanne.gitversion.GitVersionPlugin
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.jacoco-cobertura-converter.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.jacoco-cobertura-converter.properties
new file mode 100644
index 000000000..a6c68c5e1
--- /dev/null
+++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.jacoco-cobertura-converter.properties
@@ -0,0 +1 @@
+implementation-class=de.justjanne.coverageconverter.CoverageConverterPlugin
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/de.kuschku.justcode.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/de.kuschku.justcode.properties
deleted file mode 100644
index d2e7b0006..000000000
--- a/buildSrc/src/main/resources/META-INF/gradle-plugins/de.kuschku.justcode.properties
+++ /dev/null
@@ -1 +0,0 @@
-implementation-class=de.kuschku.justcode.JustCodePlugin
diff --git a/buildSrc/src/main/resources/coverageconverter/LICENSE b/buildSrc/src/main/resources/coverageconverter/LICENSE
new file mode 100644
index 000000000..bfa3f657e
--- /dev/null
+++ b/buildSrc/src/main/resources/coverageconverter/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Hannes Rosenögger
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/buildSrc/src/main/resources/coverageconverter/cover2cover.py b/buildSrc/src/main/resources/coverageconverter/cover2cover.py
new file mode 100644
index 000000000..7561ad560
--- /dev/null
+++ b/buildSrc/src/main/resources/coverageconverter/cover2cover.py
@@ -0,0 +1,163 @@
+#!/usr/bin/env python
+import sys
+import xml.etree.ElementTree as ET
+import re
+import os.path
+import time
+
+# branch-rate="0.0" complexity="0.0" line-rate="1.0"
+# branch="true" hits="1" number="86"
+
+def find_lines(j_package, filename):
+ """Return all <line> elements for a given source file in a package."""
+ lines = list()
+ sourcefiles = j_package.findall("sourcefile")
+ for sourcefile in sourcefiles:
+ if sourcefile.attrib.get("name") == os.path.basename(filename):
+ lines = lines + sourcefile.findall("line")
+ return lines
+
+def line_is_after(jm, start_line):
+ return int(jm.attrib.get('line', 0)) > start_line
+
+def method_lines(jmethod, jmethods, jlines):
+ """Filter the lines from the given set of jlines that apply to the given jmethod."""
+ start_line = int(jmethod.attrib.get('line', 0))
+ larger = list(int(jm.attrib.get('line', 0)) for jm in jmethods if line_is_after(jm, start_line))
+ end_line = min(larger) if len(larger) else 99999999
+
+ for jline in jlines:
+ if start_line <= int(jline.attrib['nr']) < end_line:
+ yield jline
+
+def convert_lines(j_lines, into):
+ """Convert the JaCoCo <line> elements into Cobertura <line> elements, add them under the given element."""
+ c_lines = ET.SubElement(into, 'lines')
+ for jline in j_lines:
+ mb = int(jline.attrib['mb'])
+ cb = int(jline.attrib['cb'])
+ ci = int(jline.attrib['ci'])
+
+ cline = ET.SubElement(c_lines, 'line')
+ cline.set('number', jline.attrib['nr'])
+ cline.set('hits', '1' if ci > 0 else '0') # Probably not true but no way to know from JaCoCo XML file
+
+ if mb + cb > 0:
+ percentage = str(int(100 * (float(cb) / (float(cb) + float(mb))))) + '%'
+ cline.set('branch', 'true')
+ cline.set('condition-coverage', percentage + ' (' + str(cb) + '/' + str(cb + mb) + ')')
+
+ cond = ET.SubElement(ET.SubElement(cline, 'conditions'), 'condition')
+ cond.set('number', '0')
+ cond.set('type', 'jump')
+ cond.set('coverage', percentage)
+ else:
+ cline.set('branch', 'false')
+
+def path_to_filepath(path_to_class, sourcefilename):
+ return path_to_class[0: path_to_class.rfind("/") + 1] + sourcefilename
+
+def add_counters(source, target):
+ target.set('line-rate', counter(source, 'LINE'))
+ target.set('branch-rate', counter(source, 'BRANCH'))
+ target.set('complexity', counter(source, 'COMPLEXITY', sum))
+
+def fraction(covered, missed):
+ return covered / (covered + missed)
+
+def sum(covered, missed):
+ return covered + missed
+
+def counter(source, type, operation=fraction):
+ cs = source.findall('counter')
+ c = next((ct for ct in cs if ct.attrib.get('type') == type), None)
+
+ if c is not None:
+ covered = float(c.attrib['covered'])
+ missed = float(c.attrib['missed'])
+
+ return str(operation(covered, missed))
+ else:
+ return '0.0'
+
+def convert_method(j_method, j_lines):
+ c_method = ET.Element('method')
+ c_method.set('name', j_method.attrib['name'])
+ c_method.set('signature', j_method.attrib['desc'])
+
+ add_counters(j_method, c_method)
+ convert_lines(j_lines, c_method)
+
+ return c_method
+
+def convert_class(j_class, j_package):
+ c_class = ET.Element('class')
+ c_class.set('name', j_class.attrib['name'].replace('/', '.'))
+ c_class.set('filename', path_to_filepath(j_class.attrib['name'], j_class.attrib['sourcefilename']))
+
+ all_j_lines = list(find_lines(j_package, c_class.attrib['filename']))
+
+ c_methods = ET.SubElement(c_class, 'methods')
+ all_j_methods = list(j_class.findall('method'))
+ for j_method in all_j_methods:
+ j_method_lines = method_lines(j_method, all_j_methods, all_j_lines)
+ c_methods.append(convert_method(j_method, j_method_lines))
+
+ add_counters(j_class, c_class)
+ convert_lines(all_j_lines, c_class)
+
+ return c_class
+
+def convert_package(j_package):
+ c_package = ET.Element('package')
+ c_package.attrib['name'] = j_package.attrib['name'].replace('/', '.')
+
+ c_classes = ET.SubElement(c_package, 'classes')
+ for j_class in j_package.findall('class'):
+ c_classes.append(convert_class(j_class, j_package))
+
+ add_counters(j_package, c_package)
+
+ return c_package
+
+def convert_root(source, target, source_roots):
+ try:
+ target.set('timestamp', str(int(source.find('sessioninfo').attrib['start']) / 1000))
+ except AttributeError as e:
+ target.set('timestamp', str(int(time.time() / 1000)))
+ sources = ET.SubElement(target, 'sources')
+ for s in source_roots:
+ ET.SubElement(sources, 'source').text = s
+
+ packages = ET.SubElement(target, 'packages')
+
+ for group in source.findall('group'):
+ for package in group.findall('package'):
+ packages.append(convert_package(package))
+
+ for package in source.findall('package'):
+ packages.append(convert_package(package))
+
+ add_counters(source, target)
+
+def jacoco2cobertura(filename, source_roots):
+ if filename == '-':
+ root = ET.fromstring(sys.stdin.read())
+ else:
+ tree = ET.parse(filename)
+ root = tree.getroot()
+
+ into = ET.Element('coverage')
+ convert_root(root, into, source_roots)
+ print('<?xml version="1.0" ?>')
+ print(ET.tostring(into, encoding='unicode'))
+
+if __name__ == '__main__':
+ if len(sys.argv) < 2:
+ print("Usage: cover2cover.py FILENAME [SOURCE_ROOTS]")
+ sys.exit(1)
+
+ filename = sys.argv[1]
+ source_roots = sys.argv[2:] if 2 < len(sys.argv) else '.'
+
+ jacoco2cobertura(filename, source_roots)
diff --git a/buildSrc/src/main/resources/coverageconverter/source2filename.py b/buildSrc/src/main/resources/coverageconverter/source2filename.py
new file mode 100644
index 000000000..2b60a9b37
--- /dev/null
+++ b/buildSrc/src/main/resources/coverageconverter/source2filename.py
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+import sys
+import xml.etree.ElementTree as ET
+import lxml.etree
+import re
+import os.path
+
+
+
+
+def convert_source(filename):
+ #read input file
+ root = lxml.etree.parse(filename)
+ sources = root.find('sources')
+ packages = root.find('packages')
+ for package in packages:
+ classes = package.find('classes')
+ for clazz in classes:
+ file_not_found = True
+ for source in sources:
+ full_filename = source.text + '/' + clazz.attrib['filename']
+ if os.path.isfile(full_filename):
+ clazz.attrib['filename'] = full_filename
+ file_not_found = False
+ if file_not_found:
+ print("Warning: File {} not found in all sources; removing from sources.".format(clazz.attrib['filename']))
+ clazz.getparent().remove(clazz)
+
+ data = lxml.etree.tostring(root, pretty_print=True)
+ #open the input file in write mode
+ fin = open(filename, "wb")
+ #overrite the input file with the resulting data
+ fin.write(data)
+ #close the file
+ fin.close()
+
+if __name__ == '__main__':
+ if len(sys.argv) < 2:
+ print("Usage: source2filename.py FILENAME")
+ sys.exit(1)
+
+ filename = sys.argv[1]
+
+ convert_source(filename)
diff --git a/coverage-annotations/src/main/kotlin/de/kuschku/codecoverage/Generated.kt b/coverage-annotations/src/main/kotlin/de/justjanne/codecoverage/Generated.kt
similarity index 96%
rename from coverage-annotations/src/main/kotlin/de/kuschku/codecoverage/Generated.kt
rename to coverage-annotations/src/main/kotlin/de/justjanne/codecoverage/Generated.kt
index a0492bb5b..2bd88cc25 100644
--- a/coverage-annotations/src/main/kotlin/de/kuschku/codecoverage/Generated.kt
+++ b/coverage-annotations/src/main/kotlin/de/justjanne/codecoverage/Generated.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.codecoverage
+package de.justjanne.codecoverage
/**
* Used to mark inline functions as generated for jacoco
diff --git a/gradle.properties b/gradle.properties
index 92a927257..f64dfa397 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,7 +32,6 @@ org.gradle.caching=true
# Enable AndroidX
android.useAndroidX=true
android.enableJetifier=true
-
# Dependency versions
androidxAppcompatVersion=1.2.0
androidxCoreVersion=1.2.0
diff --git a/libquassel/build.gradle.kts b/libquassel/build.gradle.kts
index 7216904bb..f26fafa29 100644
--- a/libquassel/build.gradle.kts
+++ b/libquassel/build.gradle.kts
@@ -1,7 +1,7 @@
plugins {
kotlin("jvm")
id("jacoco")
- id("de.justjanne.jacoco-cobertura-converter") version "1.0"
+ id("de.justjanne.jacoco-cobertura-converter")
}
tasks.withType<Test> {
diff --git a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/CoroutineChannel.kt b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/CoroutineChannel.kt
similarity index 94%
rename from libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/CoroutineChannel.kt
rename to libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/CoroutineChannel.kt
index b629ef242..3b221bb8f 100644
--- a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/CoroutineChannel.kt
+++ b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/CoroutineChannel.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.libquassel.io
+package de.justjanne.libquassel.client.io
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.libquassel.util.TlsInfo
+import de.justjanne.libquassel.client.util.TlsInfo
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.asCoroutineDispatcher
import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/FixedDeflaterOutputStream.kt b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/FixedDeflaterOutputStream.kt
similarity index 95%
rename from libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/FixedDeflaterOutputStream.kt
rename to libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/FixedDeflaterOutputStream.kt
index d626e96eb..56eafab68 100644
--- a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/FixedDeflaterOutputStream.kt
+++ b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/FixedDeflaterOutputStream.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.libquassel.io
+package de.justjanne.libquassel.client.io
import java.io.OutputStream
import java.util.zip.DeflaterOutputStream
diff --git a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/ReadableWrappedChannel.kt b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/ReadableWrappedChannel.kt
similarity index 98%
rename from libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/ReadableWrappedChannel.kt
rename to libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/ReadableWrappedChannel.kt
index fa2918d4e..ce82b7b37 100644
--- a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/ReadableWrappedChannel.kt
+++ b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/ReadableWrappedChannel.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.libquassel.io
+package de.justjanne.libquassel.client.io
import java.io.InputStream
import java.nio.ByteBuffer
diff --git a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/StreamChannel.kt b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/StreamChannel.kt
similarity index 96%
rename from libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/StreamChannel.kt
rename to libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/StreamChannel.kt
index 80c407952..59c91f96c 100644
--- a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/StreamChannel.kt
+++ b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/StreamChannel.kt
@@ -17,9 +17,9 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.libquassel.io
+package de.justjanne.libquassel.client.io
-import info.quasseldroid.libquassel.util.TlsInfo
+import de.justjanne.libquassel.client.util.TlsInfo
import java.io.Flushable
import java.io.InputStream
import java.io.OutputStream
diff --git a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/WritableWrappedChannel.kt b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/WritableWrappedChannel.kt
similarity index 98%
rename from libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/WritableWrappedChannel.kt
rename to libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/WritableWrappedChannel.kt
index b1ea8aae4..a5582508e 100644
--- a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/WritableWrappedChannel.kt
+++ b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/WritableWrappedChannel.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.libquassel.io
+package de.justjanne.libquassel.client.io
import java.io.OutputStream
import java.nio.ByteBuffer
diff --git a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/TlsInfo.kt b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/util/TlsInfo.kt
similarity index 98%
rename from libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/TlsInfo.kt
rename to libquassel/src/main/kotlin/de/justjanne/libquassel/client/util/TlsInfo.kt
index f1e3f085c..db0f048ea 100644
--- a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/TlsInfo.kt
+++ b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/util/TlsInfo.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.libquassel.util
+package de.justjanne.libquassel.client.util
import java.security.cert.Certificate
import java.security.cert.X509Certificate
diff --git a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/X509Helper.kt b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/util/X509Helper.kt
similarity index 96%
rename from libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/X509Helper.kt
rename to libquassel/src/main/kotlin/de/justjanne/libquassel/client/util/X509Helper.kt
index cdc72065e..17f61e638 100644
--- a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/X509Helper.kt
+++ b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/util/X509Helper.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.libquassel.util
+package de.justjanne.libquassel.client.util
import java.io.ByteArrayInputStream
import java.security.cert.Certificate
diff --git a/libquassel/src/test/kotlin/info/quasseldroid/libquassel/EndToEndTest.kt b/libquassel/src/test/kotlin/de/justjanne/libquassel/client/EndToEndTest.kt
similarity index 88%
rename from libquassel/src/test/kotlin/info/quasseldroid/libquassel/EndToEndTest.kt
rename to libquassel/src/test/kotlin/de/justjanne/libquassel/client/EndToEndTest.kt
index e3f8988dc..d4831f1ed 100644
--- a/libquassel/src/test/kotlin/info/quasseldroid/libquassel/EndToEndTest.kt
+++ b/libquassel/src/test/kotlin/de/justjanne/libquassel/client/EndToEndTest.kt
@@ -17,25 +17,25 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.libquassel
+package de.justjanne.libquassel.client
import de.justjanne.bitflags.of
+import de.justjanne.libquassel.client.io.CoroutineChannel
+import de.justjanne.libquassel.client.testutil.QuasselCoreContainer
+import de.justjanne.libquassel.client.testutil.TestX509TrustManager
+import de.justjanne.libquassel.protocol.connection.*
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.messages.handshake.*
+import de.justjanne.libquassel.protocol.serializers.HandshakeSerializers
+import de.justjanne.libquassel.protocol.serializers.handshake.ClientInitSerializer
+import de.justjanne.libquassel.protocol.serializers.handshake.ClientLoginSerializer
+import de.justjanne.libquassel.protocol.serializers.handshake.CoreSetupDataSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.HandshakeMapSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.IntSerializer
+import de.justjanne.libquassel.protocol.variant.into
import de.justjanne.testcontainersci.api.providedContainer
import de.justjanne.testcontainersci.extension.CiContainers
-import info.quasseldroid.libquassel.io.CoroutineChannel
-import info.quasseldroid.libquassel.testutil.QuasselCoreContainer
-import info.quasseldroid.libquassel.testutil.TestX509TrustManager
-import info.quasseldroid.protocol.connection.*
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.messages.handshake.*
-import info.quasseldroid.protocol.serializers.HandshakeSerializers
-import info.quasseldroid.protocol.serializers.handshake.ClientInitSerializer
-import info.quasseldroid.protocol.serializers.handshake.ClientLoginSerializer
-import info.quasseldroid.protocol.serializers.handshake.CoreSetupDataSerializer
-import info.quasseldroid.protocol.serializers.primitive.HandshakeMapSerializer
-import info.quasseldroid.protocol.serializers.primitive.IntSerializer
-import info.quasseldroid.protocol.variant.into
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.runBlocking
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/QuasselCoreContainer.kt b/libquassel/src/test/kotlin/de/justjanne/libquassel/client/testutil/QuasselCoreContainer.kt
similarity index 97%
rename from libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/QuasselCoreContainer.kt
rename to libquassel/src/test/kotlin/de/justjanne/libquassel/client/testutil/QuasselCoreContainer.kt
index 2e879a871..7bd90de5f 100644
--- a/libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/QuasselCoreContainer.kt
+++ b/libquassel/src/test/kotlin/de/justjanne/libquassel/client/testutil/QuasselCoreContainer.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.libquassel.testutil
+package de.justjanne.libquassel.client.testutil
import org.slf4j.LoggerFactory
import org.testcontainers.containers.BindMode
diff --git a/libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/TestX509TrustManager.kt b/libquassel/src/test/kotlin/de/justjanne/libquassel/client/testutil/TestX509TrustManager.kt
similarity index 96%
rename from libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/TestX509TrustManager.kt
rename to libquassel/src/test/kotlin/de/justjanne/libquassel/client/testutil/TestX509TrustManager.kt
index ceb9ce2ad..23e754fef 100644
--- a/libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/TestX509TrustManager.kt
+++ b/libquassel/src/test/kotlin/de/justjanne/libquassel/client/testutil/TestX509TrustManager.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.libquassel.testutil
+package de.justjanne.libquassel.client.testutil
import java.security.cert.X509Certificate
import javax.net.ssl.X509TrustManager
diff --git a/protocol/build.gradle.kts b/protocol/build.gradle.kts
index 2be90656a..a0d204fdd 100644
--- a/protocol/build.gradle.kts
+++ b/protocol/build.gradle.kts
@@ -1,7 +1,7 @@
plugins {
kotlin("jvm")
- jacoco
- id("de.justjanne.jacoco-cobertura-converter") version "1.0"
+ id("jacoco")
+ id("de.justjanne.jacoco-cobertura-converter")
}
tasks.withType<Test> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeader.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ConnectionHeader.kt
similarity index 94%
rename from protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeader.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ConnectionHeader.kt
index 8673c6637..bf056f591 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeader.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ConnectionHeader.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
data class ConnectionHeader(
val features: ProtocolFeatures,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeaderSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ConnectionHeaderSerializer.kt
similarity index 85%
rename from protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeaderSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ConnectionHeaderSerializer.kt
index 4d34ca72d..f3d5055e2 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeaderSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ConnectionHeaderSerializer.kt
@@ -17,15 +17,15 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
import de.justjanne.bitflags.of
import de.justjanne.bitflags.toBits
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.primitive.Serializer
-import info.quasseldroid.protocol.serializers.primitive.UByteSerializer
-import info.quasseldroid.protocol.serializers.primitive.UIntSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.primitive.Serializer
+import de.justjanne.libquassel.protocol.serializers.primitive.UByteSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.UIntSerializer
import java.nio.ByteBuffer
object ConnectionHeaderSerializer : Serializer<ConnectionHeader> {
@@ -57,7 +57,7 @@ object ConnectionHeaderSerializer : Serializer<ConnectionHeader> {
buffer: ByteBuffer,
featureSet: FeatureSet,
f: () -> T
- ) : List<T> {
+ ): List<T> {
val list = mutableListOf<T>()
while (true) {
val isLast = UByteSerializer.deserialize(buffer, featureSet) != 0x00u.toUByte()
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolFeature.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolFeature.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolFeature.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolFeature.kt
index 493cd137b..c0ada8fc7 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolFeature.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolFeature.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
import de.justjanne.bitflags.Flag
import de.justjanne.bitflags.Flags
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfo.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolInfo.kt
similarity index 93%
rename from protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfo.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolInfo.kt
index ea7f2e971..920541d13 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfo.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolInfo.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
data class ProtocolInfo(
val flags: ProtocolFeatures,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfoSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolInfoSerializer.kt
similarity index 80%
rename from protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfoSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolInfoSerializer.kt
index 9285a7046..dfd701f8d 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfoSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolInfoSerializer.kt
@@ -17,14 +17,14 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
import de.justjanne.bitflags.of
import de.justjanne.bitflags.toBits
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.primitive.Serializer
-import info.quasseldroid.protocol.serializers.primitive.UByteSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.primitive.Serializer
+import de.justjanne.libquassel.protocol.serializers.primitive.UByteSerializer
import java.nio.ByteBuffer
object ProtocolInfoSerializer : Serializer<ProtocolInfo> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMeta.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolMeta.kt
similarity index 93%
rename from protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMeta.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolMeta.kt
index 261356305..c9165f3ea 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMeta.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolMeta.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
data class ProtocolMeta(
val data: UShort,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMetaSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolMetaSerializer.kt
similarity index 76%
rename from protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMetaSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolMetaSerializer.kt
index 920f9f5cb..736468d95 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMetaSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolMetaSerializer.kt
@@ -17,13 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.primitive.Serializer
-import info.quasseldroid.protocol.serializers.primitive.UByteSerializer
-import info.quasseldroid.protocol.serializers.primitive.UShortSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.primitive.Serializer
+import de.justjanne.libquassel.protocol.serializers.primitive.UByteSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.UShortSerializer
import java.nio.ByteBuffer
object ProtocolMetaSerializer : Serializer<ProtocolMeta> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolVersion.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolVersion.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolVersion.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolVersion.kt
index 3052c14a9..8ffcabfc5 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolVersion.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolVersion.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
enum class ProtocolVersion(
val value: UByte,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/features/FeatureSet.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/features/FeatureSet.kt
similarity index 97%
rename from protocol/src/main/java/info/quasseldroid/protocol/features/FeatureSet.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/features/FeatureSet.kt
index 24cce95f8..9c34c5a20 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/features/FeatureSet.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/features/FeatureSet.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.features
+package de.justjanne.libquassel.protocol.features
import de.justjanne.bitflags.of
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/features/LegacyFeature.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/features/LegacyFeature.kt
similarity index 98%
rename from protocol/src/main/java/info/quasseldroid/protocol/features/LegacyFeature.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/features/LegacyFeature.kt
index 25733d33e..70ab07de1 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/features/LegacyFeature.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/features/LegacyFeature.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.features
+package de.justjanne.libquassel.protocol.features
import de.justjanne.bitflags.Flag
import de.justjanne.bitflags.Flags
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/features/QuasselFeature.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/features/QuasselFeature.kt
similarity index 96%
rename from protocol/src/main/java/info/quasseldroid/protocol/features/QuasselFeature.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/features/QuasselFeature.kt
index 09dd7f4ae..8cbf15ef1 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/features/QuasselFeature.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/features/QuasselFeature.kt
@@ -17,9 +17,9 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.features
+package de.justjanne.libquassel.protocol.features
-import de.kuschku.codecoverage.Generated
+import de.justjanne.codecoverage.Generated
@Generated
inline class QuasselFeatureName(
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/io/ByteBufferUtil.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/io/ByteBufferUtil.kt
similarity index 97%
rename from protocol/src/main/java/info/quasseldroid/protocol/io/ByteBufferUtil.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/io/ByteBufferUtil.kt
index 72ed1e26b..0beb4d258 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/io/ByteBufferUtil.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/io/ByteBufferUtil.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.io
+package de.justjanne.libquassel.protocol.io
import java.nio.ByteBuffer
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/io/ChainedByteBuffer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/io/ChainedByteBuffer.kt
similarity index 98%
rename from protocol/src/main/java/info/quasseldroid/protocol/io/ChainedByteBuffer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/io/ChainedByteBuffer.kt
index a67f0e69f..e10b6ea90 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/io/ChainedByteBuffer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/io/ChainedByteBuffer.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.io
+package de.justjanne.libquassel.protocol.io
import java.nio.ByteBuffer
import java.util.*
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/io/StringEncoder.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/io/StringEncoder.kt
similarity index 98%
rename from protocol/src/main/java/info/quasseldroid/protocol/io/StringEncoder.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/io/StringEncoder.kt
index f1c9e9ffc..957e36a3e 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/io/StringEncoder.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/io/StringEncoder.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.io
+package de.justjanne.libquassel.protocol.io
import java.nio.ByteBuffer
import java.nio.CharBuffer
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInit.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInit.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInit.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInit.kt
index 51ff8fce0..91f2bd725 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInit.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInit.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
-import info.quasseldroid.protocol.features.LegacyFeatures
-import info.quasseldroid.protocol.features.QuasselFeatureName
+import de.justjanne.libquassel.protocol.features.LegacyFeatures
+import de.justjanne.libquassel.protocol.features.QuasselFeatureName
data class ClientInit(
val clientVersion: String?,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitAck.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInitAck.kt
similarity index 78%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitAck.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInitAck.kt
index 104d43da7..17fa28c00 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitAck.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInitAck.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
-import info.quasseldroid.protocol.features.LegacyFeatures
-import info.quasseldroid.protocol.features.QuasselFeatureName
-import info.quasseldroid.protocol.variant.QVariantList
+import de.justjanne.libquassel.protocol.features.LegacyFeatures
+import de.justjanne.libquassel.protocol.features.QuasselFeatureName
+import de.justjanne.libquassel.protocol.variant.QVariantList
data class ClientInitAck(
val coreFeatures: LegacyFeatures,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitReject.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInitReject.kt
similarity index 92%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitReject.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInitReject.kt
index 3414d988c..ad5170021 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitReject.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInitReject.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
data class ClientInitReject(
val errorString: String?
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLogin.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLogin.kt
similarity index 93%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLogin.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLogin.kt
index 8a4232ab4..8576d66d8 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLogin.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLogin.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
data class ClientLogin(
val user: String?,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginAck.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLoginAck.kt
similarity index 93%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginAck.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLoginAck.kt
index 7ed854606..2b3ba4f1c 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginAck.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLoginAck.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
object ClientLoginAck {
override fun toString(): String {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginReject.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLoginReject.kt
similarity index 92%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginReject.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLoginReject.kt
index baecc0b19..deeab822b 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginReject.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLoginReject.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
data class ClientLoginReject(
val errorString: String?
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupAck.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupAck.kt
similarity index 93%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupAck.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupAck.kt
index ed4360b35..a0fd7bd89 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupAck.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupAck.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
object CoreSetupAck {
override fun toString(): String {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupData.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupData.kt
similarity index 88%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupData.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupData.kt
index abf8d27b9..31f899a20 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupData.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupData.kt
@@ -17,9 +17,9 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
-import info.quasseldroid.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QVariantMap
data class CoreSetupData(
val adminUser: String?,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupReject.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupReject.kt
similarity index 92%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupReject.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupReject.kt
index 69278c4ed..6abd57e41 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupReject.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupReject.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
data class CoreSetupReject(
val errorString: String?
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/SessionInit.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/SessionInit.kt
similarity index 87%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/SessionInit.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/SessionInit.kt
index 47b9aad27..8ea95be97 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/SessionInit.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/SessionInit.kt
@@ -17,9 +17,9 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
-import info.quasseldroid.protocol.variant.QVariantList
+import de.justjanne.libquassel.protocol.variant.QVariantList
data class SessionInit(
val identities: QVariantList?,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/HandshakeSerializers.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/HandshakeSerializers.kt
similarity index 90%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/HandshakeSerializers.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/HandshakeSerializers.kt
index 1c3188866..d1beda27b 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/HandshakeSerializers.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/HandshakeSerializers.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers
+package de.justjanne.libquassel.protocol.serializers
-import info.quasseldroid.protocol.serializers.handshake.*
-import info.quasseldroid.protocol.serializers.primitive.*
+import de.justjanne.libquassel.protocol.serializers.handshake.*
+import de.justjanne.libquassel.protocol.serializers.primitive.*
import java.util.*
object HandshakeSerializers {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/NoSerializerForTypeException.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/NoSerializerForTypeException.kt
similarity index 92%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/NoSerializerForTypeException.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/NoSerializerForTypeException.kt
index a776552ed..1b88c7396 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/NoSerializerForTypeException.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/NoSerializerForTypeException.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers
+package de.justjanne.libquassel.protocol.serializers
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.QuasselType
sealed class NoSerializerForTypeException : Exception() {
data class Qt(
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/QtSerializers.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/QtSerializers.kt
similarity index 91%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/QtSerializers.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/QtSerializers.kt
index 22449c4a8..473deea1a 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/QtSerializers.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/QtSerializers.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers
+package de.justjanne.libquassel.protocol.serializers
-import info.quasseldroid.protocol.serializers.primitive.*
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.primitive.*
+import de.justjanne.libquassel.protocol.variant.QtType
import java.util.*
object QtSerializers {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/QuasselSerializers.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/QuasselSerializers.kt
similarity index 90%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/QuasselSerializers.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/QuasselSerializers.kt
index d923d7d64..2116e3797 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/QuasselSerializers.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/QuasselSerializers.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers
+package de.justjanne.libquassel.protocol.serializers
-import info.quasseldroid.protocol.serializers.primitive.*
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.serializers.primitive.*
+import de.justjanne.libquassel.protocol.variant.QuasselType
import java.util.*
object QuasselSerializers {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitAckSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt
similarity index 85%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitAckSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt
index 63ed22bf9..eaf57b7d4 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitAckSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt
@@ -17,14 +17,14 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
import de.justjanne.bitflags.of
import de.justjanne.bitflags.toBits
-import info.quasseldroid.protocol.features.LegacyFeature
-import info.quasseldroid.protocol.features.QuasselFeatureName
-import info.quasseldroid.protocol.messages.handshake.ClientInitAck
-import info.quasseldroid.protocol.variant.*
+import de.justjanne.libquassel.protocol.features.LegacyFeature
+import de.justjanne.libquassel.protocol.features.QuasselFeatureName
+import de.justjanne.libquassel.protocol.messages.handshake.ClientInitAck
+import de.justjanne.libquassel.protocol.variant.*
object ClientInitAckSerializer : HandshakeSerializer<ClientInitAck> {
override val type: String = "ClientInitAck"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitRejectSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitRejectSerializer.kt
similarity index 77%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitRejectSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitRejectSerializer.kt
index 6ec646272..dc33ed98e 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitRejectSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitRejectSerializer.kt
@@ -17,13 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
-import info.quasseldroid.protocol.messages.handshake.ClientInitReject
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.into
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.messages.handshake.ClientInitReject
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
object ClientInitRejectSerializer : HandshakeSerializer<ClientInitReject> {
override val type: String = "ClientInitReject"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitSerializer.kt
similarity index 77%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitSerializer.kt
index 887c0c796..f334afe74 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitSerializer.kt
@@ -17,17 +17,17 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
import de.justjanne.bitflags.of
import de.justjanne.bitflags.toBits
-import info.quasseldroid.protocol.features.LegacyFeature
-import info.quasseldroid.protocol.features.QuasselFeatureName
-import info.quasseldroid.protocol.messages.handshake.ClientInit
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.into
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.features.LegacyFeature
+import de.justjanne.libquassel.protocol.features.QuasselFeatureName
+import de.justjanne.libquassel.protocol.messages.handshake.ClientInit
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
object ClientInitSerializer : HandshakeSerializer<ClientInit> {
override val type: String = "ClientInit"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginAckSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginAckSerializer.kt
similarity index 72%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginAckSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginAckSerializer.kt
index bce204c76..3aa2db17a 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginAckSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginAckSerializer.kt
@@ -17,15 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
-import de.justjanne.bitflags.of
-import de.justjanne.bitflags.toBits
-import info.quasseldroid.protocol.features.LegacyFeature
-import info.quasseldroid.protocol.features.QuasselFeatureName
-import info.quasseldroid.protocol.messages.handshake.ClientInitAck
-import info.quasseldroid.protocol.messages.handshake.ClientLoginAck
-import info.quasseldroid.protocol.variant.*
+import de.justjanne.libquassel.protocol.messages.handshake.ClientLoginAck
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.qVariant
object ClientLoginAckSerializer : HandshakeSerializer<ClientLoginAck> {
override val type: String = "ClientLoginAck"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginRejectSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginRejectSerializer.kt
similarity index 77%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginRejectSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginRejectSerializer.kt
index 1be13b9fc..73488deb0 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginRejectSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginRejectSerializer.kt
@@ -17,13 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
-import info.quasseldroid.protocol.messages.handshake.ClientLoginReject
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.into
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.messages.handshake.ClientLoginReject
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
object ClientLoginRejectSerializer : HandshakeSerializer<ClientLoginReject> {
override val type: String = "ClientLoginReject"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginSerializer.kt
similarity index 77%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginSerializer.kt
index 0756629ac..971d5e507 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginSerializer.kt
@@ -17,13 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
-import info.quasseldroid.protocol.messages.handshake.ClientLogin
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.into
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.messages.handshake.ClientLogin
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
object ClientLoginSerializer : HandshakeSerializer<ClientLogin> {
override val type: String = "ClientLogin"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupAckSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupAckSerializer.kt
similarity index 78%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupAckSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupAckSerializer.kt
index 0cad1097d..c5005b057 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupAckSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupAckSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
-import info.quasseldroid.protocol.messages.handshake.CoreSetupAck
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.messages.handshake.CoreSetupAck
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.qVariant
object CoreSetupAckSerializer : HandshakeSerializer<CoreSetupAck> {
override val type: String = "CoreSetupAck"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupDataSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupDataSerializer.kt
similarity index 84%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupDataSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupDataSerializer.kt
index e9dd0a8fd..0ff90a2f6 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupDataSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupDataSerializer.kt
@@ -17,13 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
-import info.quasseldroid.protocol.messages.handshake.CoreSetupData
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.into
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.messages.handshake.CoreSetupData
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
object CoreSetupDataSerializer : HandshakeSerializer<CoreSetupData> {
override val type: String = "CoreSetupData"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupRejectSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupRejectSerializer.kt
similarity index 75%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupRejectSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupRejectSerializer.kt
index a350a6c77..76ffb5b53 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupRejectSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupRejectSerializer.kt
@@ -17,14 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
-import info.quasseldroid.protocol.messages.handshake.ClientInitReject
-import info.quasseldroid.protocol.messages.handshake.CoreSetupReject
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.into
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.messages.handshake.CoreSetupReject
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
object CoreSetupRejectSerializer : HandshakeSerializer<CoreSetupReject> {
override val type: String = "CoreSetupReject"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/HandshakeSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/HandshakeSerializer.kt
similarity index 87%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/HandshakeSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/HandshakeSerializer.kt
index c9f560937..480edb97d 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/HandshakeSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/HandshakeSerializer.kt
@@ -17,9 +17,9 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
-import info.quasseldroid.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QVariantMap
interface HandshakeSerializer<T> {
val type: String
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/SessionInitSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/SessionInitSerializer.kt
similarity index 81%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/SessionInitSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/SessionInitSerializer.kt
index dbc49f1e5..bbbf90f20 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/SessionInitSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/SessionInitSerializer.kt
@@ -17,13 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
-import info.quasseldroid.protocol.messages.handshake.SessionInit
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.into
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.messages.handshake.SessionInit
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
object SessionInitSerializer : HandshakeSerializer<SessionInit> {
override val type: String = "SessionInit"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BoolSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BoolSerializer.kt
similarity index 83%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BoolSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BoolSerializer.kt
index ae36f4b6a..5bc9ce148 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BoolSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BoolSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
object BoolSerializer : QtSerializer<Boolean> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BufferIdSerializer.kt
similarity index 80%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BufferIdSerializer.kt
index 6f527b7d5..16a00ff6e 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BufferIdSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.BufferId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.BufferId
+import de.justjanne.libquassel.protocol.variant.QuasselType
import java.nio.ByteBuffer
object BufferIdSerializer : QuasselSerializer<BufferId> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BufferInfoSerializer.kt
similarity index 85%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BufferInfoSerializer.kt
index b400cd6dc..b894ed946 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BufferInfoSerializer.kt
@@ -17,15 +17,15 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
import de.justjanne.bitflags.of
import de.justjanne.bitflags.toBits
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.BufferInfo
-import info.quasseldroid.protocol.types.BufferType
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.BufferInfo
+import de.justjanne.libquassel.protocol.types.BufferType
+import de.justjanne.libquassel.protocol.variant.QuasselType
import java.nio.ByteBuffer
object BufferInfoSerializer : QuasselSerializer<BufferInfo> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ByteBufferSerializer.kt
similarity index 83%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ByteBufferSerializer.kt
index 07fc69340..b7462097b 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ByteBufferSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.io.copyData
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.io.copyData
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
object ByteBufferSerializer : QtSerializer<ByteBuffer?> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ByteSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ByteSerializer.kt
index b3dd069a9..a91ebc53a 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ByteSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
object ByteSerializer : QtSerializer<Byte> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateSerializer.kt
similarity index 85%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateSerializer.kt
index 0a02256bd..dbc116e19 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
import org.threeten.bp.LocalDate
import org.threeten.bp.temporal.JulianFields
import java.nio.ByteBuffer
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt
similarity index 90%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt
index a532f9672..139ae6f47 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.TimeSpec
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.TimeSpec
+import de.justjanne.libquassel.protocol.variant.QtType
import org.threeten.bp.*
import org.threeten.bp.temporal.Temporal
import java.nio.ByteBuffer
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt
index fcc9ad1ff..61b1eff79 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.DccIpDetectionMode
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.DccIpDetectionMode
+import de.justjanne.libquassel.protocol.variant.QuasselType
import java.nio.ByteBuffer
object DccIpDetectionModeSerializer : QuasselSerializer<DccIpDetectionMode?> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt
index 27b78d5f5..36ddb3f19 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.DccPortSelectionMode
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.DccPortSelectionMode
+import de.justjanne.libquassel.protocol.variant.QuasselType
import java.nio.ByteBuffer
object DccPortSelectionModeSerializer : QuasselSerializer<DccPortSelectionMode?> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DoubleSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DoubleSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DoubleSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DoubleSerializer.kt
index f708071b5..aa3fc5963 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DoubleSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DoubleSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
object DoubleSerializer : QtSerializer<Double> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/FloatSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/FloatSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/FloatSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/FloatSerializer.kt
index c759d6077..3c1f4c935 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/FloatSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/FloatSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
object FloatSerializer : QtSerializer<Float> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/HandshakeMapSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt
similarity index 88%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/HandshakeMapSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt
index b281e570d..b427b8368 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/HandshakeMapSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.*
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.*
import java.nio.ByteBuffer
object HandshakeMapSerializer : QtSerializer<QVariantMap> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/IdentityIdSerializer.kt
similarity index 80%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/IdentityIdSerializer.kt
index 872520600..8d60c368d 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/IdentityIdSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.IdentityId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.IdentityId
+import de.justjanne.libquassel.protocol.variant.QuasselType
import java.nio.ByteBuffer
object IdentityIdSerializer : QuasselSerializer<IdentityId> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IntSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/IntSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IntSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/IntSerializer.kt
index 4276b63ef..3528049a8 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IntSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/IntSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
object IntSerializer : QtSerializer<Int> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/LongSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/LongSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/LongSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/LongSerializer.kt
index 4d47fcc47..9b11feadd 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/LongSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/LongSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
object LongSerializer : QtSerializer<Long> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MessageSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializer.kt
similarity index 87%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MessageSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializer.kt
index cd426cf26..b68d57824 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MessageSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializer.kt
@@ -17,17 +17,17 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
import de.justjanne.bitflags.of
import de.justjanne.bitflags.toBits
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.features.QuasselFeature
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.Message
-import info.quasseldroid.protocol.types.MessageFlag
-import info.quasseldroid.protocol.types.MessageType
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.features.QuasselFeature
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.Message
+import de.justjanne.libquassel.protocol.types.MessageFlag
+import de.justjanne.libquassel.protocol.types.MessageType
+import de.justjanne.libquassel.protocol.variant.QuasselType
import org.threeten.bp.Instant
import java.nio.ByteBuffer
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/MsgIdSerializer.kt
similarity index 81%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/MsgIdSerializer.kt
index b3885e1bd..cf9141c91 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/MsgIdSerializer.kt
@@ -17,13 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.features.QuasselFeature
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.MsgId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.features.QuasselFeature
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.MsgId
+import de.justjanne.libquassel.protocol.variant.QuasselType
import java.nio.ByteBuffer
object MsgIdSerializer : QuasselSerializer<MsgId> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/NetworkIdSerializer.kt
similarity index 80%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/NetworkIdSerializer.kt
index 2afa5409b..7ad4c9177 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/NetworkIdSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.NetworkId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.NetworkId
+import de.justjanne.libquassel.protocol.variant.QuasselType
import java.nio.ByteBuffer
object NetworkIdSerializer : QuasselSerializer<NetworkId> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/PeerPtrSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/PeerPtrSerializer.kt
index 713f91b94..d9f7aaf3a 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/PeerPtrSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QuasselType
import java.nio.ByteBuffer
object PeerPtrSerializer : QuasselSerializer<ULong> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QCharSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QCharSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QCharSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QCharSerializer.kt
index 3355e7eaf..af199efa7 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QCharSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QCharSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.io.StringEncoder
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.io.StringEncoder
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
import kotlin.concurrent.getOrSet
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QHostAddressSerializer.kt
similarity index 87%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QHostAddressSerializer.kt
index 9c377f94a..fb674dc3c 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QHostAddressSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.NetworkLayerProtocol
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.NetworkLayerProtocol
+import de.justjanne.libquassel.protocol.variant.QuasselType
import java.net.Inet4Address
import java.net.Inet6Address
import java.net.InetAddress
@@ -54,7 +54,7 @@ object QHostAddressSerializer : QuasselSerializer<InetAddress> {
)
buffer.put(data.address)
}
- else -> {
+ else -> {
UByteSerializer.serialize(
buffer,
NetworkLayerProtocol.UnknownNetworkLayerProtocol.value,
@@ -78,7 +78,7 @@ object QHostAddressSerializer : QuasselSerializer<InetAddress> {
buffer.get(buf)
Inet6Address.getByAddress(buf)
}
- else -> {
+ else -> {
throw IllegalArgumentException("Invalid network protocol $type")
}
}
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QStringListSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QStringListSerializer.kt
similarity index 83%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QStringListSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QStringListSerializer.kt
index 518c6c589..81e8f2cf4 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QStringListSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QStringListSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QStringList
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QStringList
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
object QStringListSerializer : QtSerializer<QStringList> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantListSerializer.kt
similarity index 81%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantListSerializer.kt
index 208615e86..2f0ef8a64 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantListSerializer.kt
@@ -17,13 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QVariantList
-import info.quasseldroid.protocol.variant.QVariant_
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QVariantList
+import de.justjanne.libquassel.protocol.variant.QVariant_
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
object QVariantListSerializer : QtSerializer<QVariantList> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantMapSerializer.kt
similarity index 83%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantMapSerializer.kt
index f64b6f612..a96fcd6a1 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantMapSerializer.kt
@@ -17,13 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QVariant_
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QVariant_
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
object QVariantMapSerializer : QtSerializer<QVariantMap> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantSerializer.kt
similarity index 81%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantSerializer.kt
index 2d28fdbef..3cbf153c5 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantSerializer.kt
@@ -17,17 +17,17 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.NoSerializerForTypeException
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.variant.QVariant
-import info.quasseldroid.protocol.variant.QVariant_
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.NoSerializerForTypeException
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.variant.QVariant
+import de.justjanne.libquassel.protocol.variant.QVariant_
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.QuasselType
import java.nio.ByteBuffer
object QVariantSerializer : QtSerializer<QVariant_> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QtSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QtSerializer.kt
similarity index 87%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QtSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QtSerializer.kt
index e981e8108..7a6ff24e0 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QtSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QtSerializer.kt
@@ -17,9 +17,9 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.QtType
interface QtSerializer<T> : Serializer<T> {
val qtType: QtType
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QuasselSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QuasselSerializer.kt
similarity index 83%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QuasselSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QuasselSerializer.kt
index cb83b4aa3..bc5f6f555 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QuasselSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QuasselSerializer.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.QuasselType
interface QuasselSerializer<T> : QtSerializer<T> {
override val qtType: QtType get() = quasselType.qtType
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/Serializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/Serializer.kt
similarity index 83%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/Serializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/Serializer.kt
index 49eb6c66a..da634674e 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/Serializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/Serializer.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
import java.nio.ByteBuffer
interface Serializer<T> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ShortSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ShortSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ShortSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ShortSerializer.kt
index 094c649f5..9f776c89a 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ShortSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ShortSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
object ShortSerializer : QtSerializer<Short> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializer.kt
similarity index 89%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializer.kt
index 649178a50..59928cb56 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.io.StringEncoder
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.io.StringEncoder
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
import java.nio.charset.Charset
import kotlin.concurrent.getOrSet
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerAscii.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerAscii.kt
similarity index 92%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerAscii.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerAscii.kt
index 9eec4bb68..03474fb1c 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerAscii.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerAscii.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
object StringSerializerAscii : StringSerializer(Charsets.ISO_8859_1, true)
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf16.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerUtf16.kt
similarity index 92%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf16.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerUtf16.kt
index 2d40edba1..c49d80b34 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf16.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerUtf16.kt
@@ -17,6 +17,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
object StringSerializerUtf16 : StringSerializer(Charsets.UTF_16BE, false)
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf8.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerUtf8.kt
similarity index 92%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf8.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerUtf8.kt
index 9c9d4ce21..e944a65e0 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf8.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerUtf8.kt
@@ -17,6 +17,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
object StringSerializerUtf8 : StringSerializer(Charsets.UTF_8, false)
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/TimeSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/TimeSerializer.kt
similarity index 85%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/TimeSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/TimeSerializer.kt
index 323d83a11..42adaa1b7 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/TimeSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/TimeSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
import org.threeten.bp.LocalTime
import java.nio.ByteBuffer
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UByteSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UByteSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UByteSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UByteSerializer.kt
index d9da69a55..ac607172f 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UByteSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UByteSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
object UByteSerializer : QtSerializer<UByte> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UIntSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UIntSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UIntSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UIntSerializer.kt
index 8f19b4595..963d6f48a 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UIntSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UIntSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
object UIntSerializer : QtSerializer<UInt> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ULongSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ULongSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ULongSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ULongSerializer.kt
index 7173df173..6771f33e5 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ULongSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ULongSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
object ULongSerializer : QtSerializer<ULong> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UShortSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UShortSerializer.kt
similarity index 83%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UShortSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UShortSerializer.kt
index 21cf31879..f9b056dcf 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UShortSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UShortSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
object UShortSerializer : QtSerializer<UShort> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/VoidSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/VoidSerializer.kt
similarity index 81%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/VoidSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/VoidSerializer.kt
index f97a587b4..c4c90f9b4 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/VoidSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/VoidSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
import java.nio.ByteBuffer
object VoidSerializer : QtSerializer<Unit> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/BufferActivity.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferActivity.kt
similarity index 96%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/BufferActivity.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferActivity.kt
index e5ba3f4e1..76228ed8f 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/BufferActivity.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferActivity.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
import de.justjanne.bitflags.Flag
import de.justjanne.bitflags.Flags
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/BufferId.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferId.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/BufferId.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferId.kt
index 38c04f463..2bebd404e 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/BufferId.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferId.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
private typealias BufferIdType = SignedIdType
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/BufferInfo.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferInfo.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/BufferInfo.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferInfo.kt
index d94211e47..cb49ccf3c 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/BufferInfo.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferInfo.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
import de.justjanne.bitflags.none
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/BufferType.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferType.kt
similarity index 96%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/BufferType.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferType.kt
index 0207df841..8ee3b1add 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/BufferType.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferType.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
import de.justjanne.bitflags.Flag
import de.justjanne.bitflags.Flags
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/DccIpDetectionMode.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/DccIpDetectionMode.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/DccIpDetectionMode.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/DccIpDetectionMode.kt
index 7f8d17043..153e5a5b9 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/DccIpDetectionMode.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/DccIpDetectionMode.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
/**
* Mode for detecting the outgoing IP
@@ -27,6 +27,7 @@ enum class DccIpDetectionMode(
) {
/** Automatic detection (network socket or USERHOST) */
Automatic(0x00u),
+
/** Manually specified IP */
Manual(0x01u);
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/DccPortSelectionMode.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/DccPortSelectionMode.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/DccPortSelectionMode.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/DccPortSelectionMode.kt
index 42ee157be..b26a5fb71 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/DccPortSelectionMode.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/DccPortSelectionMode.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
/**
* Mode for selecting the port range for DCC
@@ -27,6 +27,7 @@ enum class DccPortSelectionMode(
) {
/** Automatic port selection */
Automatic(0x00u),
+
/** Manually specified port range */
Manual(0x01u);
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/IdentityId.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/IdentityId.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/IdentityId.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/IdentityId.kt
index d24d0367e..a6061e8d7 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/IdentityId.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/IdentityId.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
private typealias IdentityIdType = SignedIdType
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/Message.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/Message.kt
similarity index 96%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/Message.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/Message.kt
index 16739cd81..b14135695 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/Message.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/Message.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
import org.threeten.bp.Instant
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/MessageFlag.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/MessageFlag.kt
similarity index 96%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/MessageFlag.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/MessageFlag.kt
index 5f43db435..f95313927 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/MessageFlag.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/MessageFlag.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
import de.justjanne.bitflags.Flag
import de.justjanne.bitflags.Flags
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/MessageType.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/MessageType.kt
similarity index 96%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/MessageType.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/MessageType.kt
index fe418098f..8f8d3458d 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/MessageType.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/MessageType.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
import de.justjanne.bitflags.Flag
import de.justjanne.bitflags.Flags
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/MsgId.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/MsgId.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/MsgId.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/MsgId.kt
index b5b3a24ae..06c9df9ff 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/MsgId.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/MsgId.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
private typealias MsgIdType = SignedId64Type
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/NetworkId.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/NetworkId.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/NetworkId.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/NetworkId.kt
index 5d60b4fb9..7ee94256f 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/NetworkId.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/NetworkId.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
private typealias NetworkIdType = SignedIdType
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/NetworkLayerProtocol.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/NetworkLayerProtocol.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/NetworkLayerProtocol.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/NetworkLayerProtocol.kt
index d0b26730c..db85d25ea 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/NetworkLayerProtocol.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/NetworkLayerProtocol.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
enum class NetworkLayerProtocol(
val value: UByte,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/SignedId.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/SignedId.kt
similarity index 93%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/SignedId.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/SignedId.kt
index e30ce878d..44c6a648c 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/SignedId.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/SignedId.kt
@@ -17,9 +17,9 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
-import de.kuschku.codecoverage.Generated
+import de.justjanne.codecoverage.Generated
import java.io.Serializable
typealias SignedIdType = Int
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/TimeSpec.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/TimeSpec.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/TimeSpec.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/TimeSpec.kt
index 42d25c0f8..6d9bcf37e 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/TimeSpec.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/TimeSpec.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
enum class TimeSpec(val value: Byte) {
LocalUnknown(-1),
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/variant/QVariant.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QVariant.kt
similarity index 83%
rename from protocol/src/main/java/info/quasseldroid/protocol/variant/QVariant.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QVariant.kt
index 50678718a..1485f50ec 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/variant/QVariant.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QVariant.kt
@@ -17,15 +17,15 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.variant
-
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.io.contentToString
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.serializers.primitive.QtSerializer
-import info.quasseldroid.protocol.serializers.primitive.QuasselSerializer
+package de.justjanne.libquassel.protocol.variant
+
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.io.contentToString
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.serializers.primitive.QtSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.QuasselSerializer
import java.nio.ByteBuffer
typealias QVariant_ = QVariant<*>
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/variant/QtType.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QtType.kt
similarity index 97%
rename from protocol/src/main/java/info/quasseldroid/protocol/variant/QtType.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QtType.kt
index 70f9eedba..607a0d2db 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/variant/QtType.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QtType.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http:
*/
-package info.quasseldroid.protocol.variant
+package de.justjanne.libquassel.protocol.variant
enum class QtType(val id: kotlin.Int) {
Void(0),
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/variant/QuasselType.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QuasselType.kt
similarity index 96%
rename from protocol/src/main/java/info/quasseldroid/protocol/variant/QuasselType.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QuasselType.kt
index d7ba1e364..3cd82d015 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/variant/QuasselType.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QuasselType.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.variant
+package de.justjanne.libquassel.protocol.variant
enum class QuasselType(
val typeName: String,
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/connection/ConnectionHeaderSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/connection/ConnectionHeaderSerializerTest.kt
similarity index 91%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/connection/ConnectionHeaderSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/connection/ConnectionHeaderSerializerTest.kt
index 2249f9ef9..7a2db6d1e 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/connection/ConnectionHeaderSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/connection/ConnectionHeaderSerializerTest.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
import de.justjanne.bitflags.of
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.serializerTest
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.serializerTest
import org.junit.jupiter.api.Test
class ConnectionHeaderSerializerTest {
@@ -76,7 +76,7 @@ class ConnectionHeaderSerializerTest {
fun testDebugClient() = serializerTest(
ConnectionHeaderSerializer,
ConnectionHeader(
- features = ProtocolFeature.of( ),
+ features = ProtocolFeature.of(),
versions = listOf(
ProtocolMeta(
data = 0x0000u,
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/features/FeatureSetTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/features/FeatureSetTest.kt
similarity index 97%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/features/FeatureSetTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/features/FeatureSetTest.kt
index df0c80342..23bbf531e 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/features/FeatureSetTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/features/FeatureSetTest.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.features
+package de.justjanne.libquassel.protocol.features
import de.justjanne.bitflags.none
import de.justjanne.bitflags.of
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/io/ChainedByteBufferTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/io/ChainedByteBufferTest.kt
similarity index 96%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/io/ChainedByteBufferTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/io/ChainedByteBufferTest.kt
index 5e96454de..aaa2020f9 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/io/ChainedByteBufferTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/io/ChainedByteBufferTest.kt
@@ -17,9 +17,9 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.io
+package de.justjanne.libquassel.protocol.io
-import info.quasseldroid.protocol.testutil.matchers.ByteBufferMatcher
+import de.justjanne.libquassel.protocol.testutil.matchers.ByteBufferMatcher
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertDoesNotThrow
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/io/StringEncoderTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/io/StringEncoderTest.kt
similarity index 92%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/io/StringEncoderTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/io/StringEncoderTest.kt
index 2e03e0d7e..6fde64ea6 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/io/StringEncoderTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/io/StringEncoderTest.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.io
+package de.justjanne.libquassel.protocol.io
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.matchers.ByteBufferMatcher
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.matchers.ByteBufferMatcher
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitSerializerTest.kt
similarity index 85%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitSerializerTest.kt
index 20c2f967f..aff2a703a 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitSerializerTest.kt
@@ -16,17 +16,17 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
import de.justjanne.bitflags.none
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.features.LegacyFeature
-import info.quasseldroid.protocol.messages.handshake.ClientInit
-import info.quasseldroid.protocol.serializers.HandshakeSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.handshakeSerializerTest
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.features.LegacyFeature
+import de.justjanne.libquassel.protocol.messages.handshake.ClientInit
+import de.justjanne.libquassel.protocol.serializers.HandshakeSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.handshakeSerializerTest
+import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.Assertions.assertEquals as assertEquals
class ClientInitSerializerTest {
@Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BoolSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BoolSerializerTest.kt
similarity index 79%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BoolSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BoolSerializerTest.kt
index aae04c194..8708dfd36 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BoolSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BoolSerializerTest.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BufferIdSerializerTest.kt
similarity index 80%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BufferIdSerializerTest.kt
index a6f291e7f..0223237cd 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BufferIdSerializerTest.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.types.BufferId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.types.BufferId
+import de.justjanne.libquassel.protocol.variant.QuasselType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BufferInfoSerializerTest.kt
similarity index 76%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BufferInfoSerializerTest.kt
index 7a9c6a3d7..5b80f95e5 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BufferInfoSerializerTest.kt
@@ -16,18 +16,18 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
import de.justjanne.bitflags.none
import de.justjanne.bitflags.validValues
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.types.BufferId
-import info.quasseldroid.protocol.types.BufferInfo
-import info.quasseldroid.protocol.types.BufferType
-import info.quasseldroid.protocol.types.NetworkId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.types.BufferId
+import de.justjanne.libquassel.protocol.types.BufferInfo
+import de.justjanne.libquassel.protocol.types.BufferType
+import de.justjanne.libquassel.protocol.types.NetworkId
+import de.justjanne.libquassel.protocol.variant.QuasselType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ByteBufferSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ByteBufferSerializerTest.kt
index 67bd99c52..888646cee 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ByteBufferSerializerTest.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.matchers.ByteBufferMatcher
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.matchers.ByteBufferMatcher
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ByteSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ByteSerializerTest.kt
index 6ef6bc714..140978a30 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ByteSerializerTest.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import kotlin.experimental.inv
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt
similarity index 89%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt
index 3821eb635..f69dbb502 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.matchers.TemporalMatcher
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.matchers.TemporalMatcher
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertThrows
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
similarity index 77%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
index 8b069b08a..639511ce7 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.types.DccIpDetectionMode
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.types.DccIpDetectionMode
+import de.justjanne.libquassel.protocol.variant.QuasselType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt
similarity index 77%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt
index f6ffb7dd5..ec9b2c6ca 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.types.DccPortSelectionMode
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.types.DccPortSelectionMode
+import de.justjanne.libquassel.protocol.variant.QuasselType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DoubleSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DoubleSerializerTest.kt
similarity index 86%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DoubleSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DoubleSerializerTest.kt
index c67d69c9d..6c1f6726f 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DoubleSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DoubleSerializerTest.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/FloatSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/FloatSerializerTest.kt
similarity index 85%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/FloatSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/FloatSerializerTest.kt
index b4978f533..0161d0811 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/FloatSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/FloatSerializerTest.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/IdentityIdSerializerTest.kt
similarity index 80%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/IdentityIdSerializerTest.kt
index 225cb273e..c77f7e598 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/IdentityIdSerializerTest.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.types.IdentityId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.types.IdentityId
+import de.justjanne.libquassel.protocol.variant.QuasselType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IntSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/IntSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IntSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/IntSerializerTest.kt
index 53aa3c9a9..cb15a66da 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IntSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/IntSerializerTest.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/LongSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/LongSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/LongSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/LongSerializerTest.kt
index a1f20b413..b4d3065ae 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/LongSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/LongSerializerTest.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not,see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MessageSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt
similarity index 92%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MessageSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt
index 75f0342a4..ab3aa1cb0 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MessageSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt
@@ -17,16 +17,16 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
import de.justjanne.bitflags.none
import de.justjanne.bitflags.validValues
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.types.*
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.types.*
+import de.justjanne.libquassel.protocol.variant.QuasselType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import org.threeten.bp.Instant
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MsgIdSerializerTest.kt
similarity index 79%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MsgIdSerializerTest.kt
index 957f9c5ad..0ca4268ec 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MsgIdSerializerTest.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.types.MsgId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.types.MsgId
+import de.justjanne.libquassel.protocol.variant.QuasselType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/NetworkIdSerializerTest.kt
similarity index 80%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/NetworkIdSerializerTest.kt
index 58ba01e13..60755175d 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/NetworkIdSerializerTest.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.types.NetworkId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.types.NetworkId
+import de.justjanne.libquassel.protocol.variant.QuasselType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/PeerPtrSerializerTest.kt
similarity index 81%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/PeerPtrSerializerTest.kt
index bd6f61e0a..ef2dc8753 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/PeerPtrSerializerTest.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.variant.QuasselType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QCharSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QCharSerializerTest.kt
similarity index 84%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QCharSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QCharSerializerTest.kt
index eaa1685e6..ec7bbf141 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QCharSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QCharSerializerTest.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.matchers.BomMatcherChar
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.matchers.BomMatcherChar
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QHostAddressSerializerTest.kt
similarity index 84%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QHostAddressSerializerTest.kt
index 9e7ce4642..96e7de270 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QHostAddressSerializerTest.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.variant.QuasselType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import java.net.Inet4Address
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantListSerializerTest.kt
similarity index 60%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantListSerializerTest.kt
index fddad7d84..ad6dfe65f 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantListSerializerTest.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QVariantList
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QVariantList
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.qVariant
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
@@ -50,7 +50,7 @@ class QVariantListSerializerTest {
qVariant("AzureDiamond", QtType.QString),
qVariant("hunter2", QtType.QString)
),
- byteBufferOf( 0x00u, 0x00u, 0x00u, 0x02u, 0x00u, 0x00u, 0x00u, 0x0Au, 0x00u, 0x00u, 0x00u, 0x00u, 0x18u, 0x00u, 0x41u, 0x00u, 0x7Au, 0x00u, 0x75u, 0x00u, 0x72u, 0x00u, 0x65u, 0x00u, 0x44u, 0x00u, 0x69u, 0x00u, 0x61u, 0x00u, 0x6Du, 0x00u, 0x6Fu, 0x00u, 0x6Eu, 0x00u, 0x64u, 0x00u, 0x00u, 0x00u, 0x0Au, 0x00u, 0x00u, 0x00u, 0x00u, 0x0Eu, 0x00u, 0x68u, 0x00u, 0x75u, 0x00u, 0x6Eu, 0x00u, 0x74u, 0x00u, 0x65u, 0x00u, 0x72u, 0x00u, 0x32u)
+ byteBufferOf(0x00u, 0x00u, 0x00u, 0x02u, 0x00u, 0x00u, 0x00u, 0x0Au, 0x00u, 0x00u, 0x00u, 0x00u, 0x18u, 0x00u, 0x41u, 0x00u, 0x7Au, 0x00u, 0x75u, 0x00u, 0x72u, 0x00u, 0x65u, 0x00u, 0x44u, 0x00u, 0x69u, 0x00u, 0x61u, 0x00u, 0x6Du, 0x00u, 0x6Fu, 0x00u, 0x6Eu, 0x00u, 0x64u, 0x00u, 0x00u, 0x00u, 0x0Au, 0x00u, 0x00u, 0x00u, 0x00u, 0x0Eu, 0x00u, 0x68u, 0x00u, 0x75u, 0x00u, 0x6Eu, 0x00u, 0x74u, 0x00u, 0x65u, 0x00u, 0x72u, 0x00u, 0x32u)
)
}
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantMapSerializerTest.kt
similarity index 83%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantMapSerializerTest.kt
index 8c5699260..a7b16dd63 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantMapSerializerTest.kt
@@ -16,15 +16,15 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.matchers.MapMatcher
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.matchers.MapMatcher
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.qVariant
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantSerializerTest.kt
similarity index 83%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantSerializerTest.kt
index 52403ebc1..fbcb635c0 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantSerializerTest.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.NoSerializerForTypeException
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.deserialize
-import info.quasseldroid.protocol.variant.QVariant_
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.NoSerializerForTypeException
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.deserialize
+import de.justjanne.libquassel.protocol.variant.QVariant_
+import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertThrows
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ShortSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ShortSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ShortSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ShortSerializerTest.kt
index 025d207c7..1af119185 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ShortSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ShortSerializerTest.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import kotlin.experimental.inv
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/StringSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerTest.kt
similarity index 94%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/StringSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerTest.kt
index 282e8245b..e903391a9 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/StringSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerTest.kt
@@ -16,16 +16,16 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
-
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.deserialize
-import info.quasseldroid.protocol.testutil.matchers.BomMatcherString
-import info.quasseldroid.protocol.testutil.matchers.ByteBufferMatcher
-import info.quasseldroid.protocol.testutil.testQtSerializerDirect
-import info.quasseldroid.protocol.testutil.testQtSerializerVariant
-import info.quasseldroid.protocol.variant.QtType
+package de.justjanne.libquassel.protocol.serializers.primitive
+
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.deserialize
+import de.justjanne.libquassel.protocol.testutil.matchers.BomMatcherString
+import de.justjanne.libquassel.protocol.testutil.matchers.ByteBufferMatcher
+import de.justjanne.libquassel.protocol.testutil.testQtSerializerDirect
+import de.justjanne.libquassel.protocol.testutil.testQtSerializerVariant
+import de.justjanne.libquassel.protocol.variant.QtType
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UByteSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UByteSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UByteSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UByteSerializerTest.kt
index 0d1b29f4e..e119bd738 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UByteSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UByteSerializerTest.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UIntSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UIntSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UIntSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UIntSerializerTest.kt
index a1ff80599..4115fd0d5 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UIntSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UIntSerializerTest.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ULongSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ULongSerializerTest.kt
similarity index 83%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ULongSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ULongSerializerTest.kt
index 3eead2bfd..10e5265e4 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ULongSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ULongSerializerTest.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UShortSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UShortSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UShortSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UShortSerializerTest.kt
index 448483309..d7d62aef2 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UShortSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UShortSerializerTest.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/VoidSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/VoidSerializerTest.kt
similarity index 77%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/VoidSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/VoidSerializerTest.kt
index b5763b2fe..311086fd2 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/VoidSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/VoidSerializerTest.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/byteBufferOf.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/byteBufferOf.kt
similarity index 95%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/byteBufferOf.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/byteBufferOf.kt
index 62f5d7028..0cc6a8cf4 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/byteBufferOf.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/byteBufferOf.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/deserialize.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/deserialize.kt
similarity index 86%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/deserialize.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/deserialize.kt
index 0191234d3..117aae1fa 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/deserialize.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/deserialize.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.serializers.handshake.HandshakeSerializer
-import info.quasseldroid.protocol.serializers.primitive.HandshakeMapSerializer
-import info.quasseldroid.protocol.serializers.primitive.Serializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.serializers.handshake.HandshakeSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.HandshakeMapSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.Serializer
import org.hamcrest.Matcher
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/handshakeSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/handshakeSerializerTest.kt
similarity index 89%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/handshakeSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/handshakeSerializerTest.kt
index 5cbf4d92e..6ccc94440 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/handshakeSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/handshakeSerializerTest.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.serializers.handshake.HandshakeSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.serializers.handshake.HandshakeSerializer
import org.hamcrest.Matcher
import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/BomMatcherChar.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/BomMatcherChar.kt
similarity index 95%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/BomMatcherChar.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/BomMatcherChar.kt
index 172700bc2..4c83d1ed3 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/BomMatcherChar.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/BomMatcherChar.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil.matchers
+package de.justjanne.libquassel.protocol.testutil.matchers
import org.hamcrest.BaseMatcher
import org.hamcrest.Description
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/BomMatcherString.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/BomMatcherString.kt
similarity index 95%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/BomMatcherString.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/BomMatcherString.kt
index 898c3c049..417386698 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/BomMatcherString.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/BomMatcherString.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil.matchers
+package de.justjanne.libquassel.protocol.testutil.matchers
import org.hamcrest.BaseMatcher
import org.hamcrest.Description
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/ByteBufferMatcher.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/ByteBufferMatcher.kt
similarity index 90%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/ByteBufferMatcher.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/ByteBufferMatcher.kt
index 1ac3a6ad7..e8a6e9cf4 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/ByteBufferMatcher.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/ByteBufferMatcher.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil.matchers
+package de.justjanne.libquassel.protocol.testutil.matchers
-import info.quasseldroid.protocol.io.contentToString
-import info.quasseldroid.protocol.io.isEmpty
+import de.justjanne.libquassel.protocol.io.contentToString
+import de.justjanne.libquassel.protocol.io.isEmpty
import org.hamcrest.BaseMatcher
import org.hamcrest.Description
import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/MapMatcher.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/MapMatcher.kt
similarity index 96%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/MapMatcher.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/MapMatcher.kt
index 749e268b3..cded0d1d5 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/MapMatcher.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/MapMatcher.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil.matchers
+package de.justjanne.libquassel.protocol.testutil.matchers
import org.hamcrest.BaseMatcher
import org.hamcrest.Description
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/TemporalMatcher.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/TemporalMatcher.kt
similarity index 96%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/TemporalMatcher.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/TemporalMatcher.kt
index e2f1cc879..884daba32 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/TemporalMatcher.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/TemporalMatcher.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil.matchers
+package de.justjanne.libquassel.protocol.testutil.matchers
import org.hamcrest.BaseMatcher
import org.hamcrest.Description
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/qtSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/qtSerializerTest.kt
similarity index 90%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/qtSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/qtSerializerTest.kt
index 7a5244d81..20865fc7f 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/qtSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/qtSerializerTest.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.serializers.primitive.QtSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.serializers.primitive.QtSerializer
import org.hamcrest.Matcher
import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/quasselSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/quasselSerializerTest.kt
similarity index 90%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/quasselSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/quasselSerializerTest.kt
index dc203a9aa..88d3633d7 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/quasselSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/quasselSerializerTest.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.serializers.primitive.QuasselSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.serializers.primitive.QuasselSerializer
import org.hamcrest.Matcher
import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serialize.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/serialize.kt
similarity index 76%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serialize.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/serialize.kt
index 4b44e36f0..519bb467a 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serialize.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/serialize.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.handshake.HandshakeSerializer
-import info.quasseldroid.protocol.serializers.primitive.HandshakeMapSerializer
-import info.quasseldroid.protocol.serializers.primitive.Serializer
-import info.quasseldroid.protocol.testutil.matchers.ByteBufferMatcher
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.handshake.HandshakeSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.HandshakeMapSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.Serializer
+import de.justjanne.libquassel.protocol.testutil.matchers.ByteBufferMatcher
import org.hamcrest.MatcherAssert.assertThat
import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/serializerTest.kt
similarity index 88%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/serializerTest.kt
index 15e2c4e68..5394a08d4 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/serializerTest.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.serializers.primitive.Serializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.serializers.primitive.Serializer
import org.hamcrest.Matcher
import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testHandshakeSerializerDirect.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testHandshakeSerializerDirect.kt
similarity index 89%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testHandshakeSerializerDirect.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testHandshakeSerializerDirect.kt
index 82beecf2c..3f81bab0e 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testHandshakeSerializerDirect.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testHandshakeSerializerDirect.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
-import info.quasseldroid.protocol.serializers.handshake.HandshakeSerializer
+import de.justjanne.libquassel.protocol.serializers.handshake.HandshakeSerializer
import org.hamcrest.Matcher
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testHandshakeSerializerEncoded.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testHandshakeSerializerEncoded.kt
similarity index 80%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testHandshakeSerializerEncoded.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testHandshakeSerializerEncoded.kt
index d16dc072c..feb0e99ba 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testHandshakeSerializerEncoded.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testHandshakeSerializerEncoded.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.handshake.HandshakeSerializer
-import info.quasseldroid.protocol.serializers.primitive.HandshakeMapSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.handshake.HandshakeSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.HandshakeMapSerializer
import org.hamcrest.Matcher
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQtSerializerDirect.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQtSerializerDirect.kt
similarity index 81%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQtSerializerDirect.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQtSerializerDirect.kt
index 6280db52c..fbbddf671 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQtSerializerDirect.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQtSerializerDirect.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.io.contentToString
-import info.quasseldroid.protocol.serializers.primitive.QtSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.io.contentToString
+import de.justjanne.libquassel.protocol.serializers.primitive.QtSerializer
import org.hamcrest.Matcher
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQtSerializerVariant.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQtSerializerVariant.kt
similarity index 79%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQtSerializerVariant.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQtSerializerVariant.kt
index 70726cb56..bf8fd14e0 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQtSerializerVariant.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQtSerializerVariant.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.primitive.QVariantSerializer
-import info.quasseldroid.protocol.serializers.primitive.QtSerializer
-import info.quasseldroid.protocol.variant.QVariant
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.primitive.QVariantSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.QtSerializer
+import de.justjanne.libquassel.protocol.variant.QVariant
import org.hamcrest.Matcher
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQuasselSerializerDirect.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQuasselSerializerDirect.kt
similarity index 84%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQuasselSerializerDirect.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQuasselSerializerDirect.kt
index 239081a94..0b7da5527 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQuasselSerializerDirect.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQuasselSerializerDirect.kt
@@ -16,11 +16,11 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.primitive.QuasselSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.primitive.QuasselSerializer
import org.hamcrest.Matcher
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQuasselSerializerVariant.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQuasselSerializerVariant.kt
similarity index 78%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQuasselSerializerVariant.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQuasselSerializerVariant.kt
index adcfcf017..818802ac5 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQuasselSerializerVariant.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQuasselSerializerVariant.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.primitive.QVariantSerializer
-import info.quasseldroid.protocol.serializers.primitive.QuasselSerializer
-import info.quasseldroid.protocol.variant.QVariant
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.primitive.QVariantSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.QuasselSerializer
+import de.justjanne.libquassel.protocol.variant.QVariant
import org.hamcrest.Matcher
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/types/SignedIdTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/types/SignedIdTest.kt
similarity index 98%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/types/SignedIdTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/types/SignedIdTest.kt
index 94779e693..7c7cea2b4 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/types/SignedIdTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/types/SignedIdTest.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
import org.junit.jupiter.api.Assertions.*
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/variant/QVariantTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/variant/QVariantTest.kt
similarity index 85%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/variant/QVariantTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/variant/QVariantTest.kt
index 7a94751ed..772dd2aad 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/variant/QVariantTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/variant/QVariantTest.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package info.quasseldroid.protocol.variant
+package de.justjanne.libquassel.protocol.variant
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.types.BufferId
-import org.junit.jupiter.api.Assertions.*
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.types.BufferId
+import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
class QVariantTest {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a881985c1..9af61d669 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -30,7 +30,6 @@ include(
pluginManagement {
repositories {
- mavenLocal()
gradlePluginPortal()
}
}
--
GitLab