From 53567b114a5e2a2616c7743e022caa460dfba83c Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 12 Feb 2021 16:18:34 +0100
Subject: [PATCH] Replace dependencies with external ones
---
app/build.gradle.kts | 18 +-
.../quasseldroid/ExampleInstrumentedTest.kt | 22 ---
.../app/ExampleInstrumentedTest.kt | 28 +--
app/src/main/AndroidManifest.xml | 6 +-
.../quasseldroid/app}/MainActivity.kt | 27 ++-
.../app}/QuasseldroidApplication.kt | 2 +-
.../quasseldroid/app}/theme/Color.kt | 4 +-
.../quasseldroid/app}/theme/Shape.kt | 2 +-
.../quasseldroid/app}/theme/Theme.kt | 2 +-
.../quasseldroid/app}/theme/Type.kt | 2 +-
bitflags/build.gradle.kts | 30 ----
.../main/kotlin/de/kuschku/bitflags/Flag.kt | 24 ---
.../main/kotlin/de/kuschku/bitflags/Flags.kt | 24 ---
.../main/kotlin/de/kuschku/bitflags/none.kt | 25 ---
.../src/main/kotlin/de/kuschku/bitflags/of.kt | 28 ---
.../main/kotlin/de/kuschku/bitflags/toBits.kt | 62 -------
.../kotlin/de/kuschku/bitflags/toEnumSet.kt | 32 ----
.../main/kotlin/de/kuschku/bitflags/toFlag.kt | 63 -------
.../kotlin/de/kuschku/bitflags/validValues.kt | 62 -------
build.gradle | 6 -
build.gradle.kts | 13 +-
.../ConvertCoverageReportsAction.kt | 84 ---------
.../CoverageConverterPlugin.kt | 30 ----
.../de.kuschku.coverageconverter.properties | 1 -
.../coverageconverter/cover2cover.py | 163 ------------------
.../coverageconverter/source2filename.py | 44 -----
ci-containers/build.gradle.kts | 11 --
.../de/kuschku/ci_containers/CiContainers.kt | 28 ---
.../ci_containers/CiContainersExtension.kt | 47 -----
.../GitlabCiProvidedContainer.kt | 29 ----
.../ci_containers/ProvidedContainer.kt | 29 ----
.../TestContainersProvidedContainer.kt | 36 ----
gradle.properties | 15 ++
gradle/wrapper/gradle-wrapper.properties | 3 +-
libquassel/build.gradle.kts | 23 +--
.../libquassel/io/CoroutineChannel.kt | 6 +-
.../io/FixedDeflaterOutputStream.kt | 2 +-
.../libquassel/io/ReadableWrappedChannel.kt | 2 +-
.../libquassel/io/StreamChannel.kt | 5 +-
.../libquassel/io/WritableWrappedChannel.kt | 2 +-
.../quasseldroid}/libquassel/util/TlsInfo.kt | 2 +-
.../libquassel/util/X509Helper.kt | 2 +-
.../libquassel/testutil/quasselContainer.kt | 30 ----
.../quasseldroid}/libquassel/EndToEndTest.kt | 46 ++---
.../testutil/QuasselCoreContainer.kt | 2 +-
.../testutil/TestX509TrustManager.kt | 2 +-
protocol/build.gradle.kts | 26 +--
.../protocol/connection/ConnectionHeader.kt | 2 +-
.../connection/ConnectionHeaderSerializer.kt | 16 +-
.../protocol/connection/ProtocolFeature.kt | 8 +-
.../protocol/connection/ProtocolInfo.kt | 2 +-
.../connection/ProtocolInfoSerializer.kt | 14 +-
.../protocol/connection/ProtocolMeta.kt | 2 +-
.../connection/ProtocolMetaSerializer.kt | 12 +-
.../protocol/connection/ProtocolVersion.kt | 2 +-
.../protocol/features/FeatureSet.kt | 4 +-
.../protocol/features/LegacyFeature.kt | 8 +-
.../protocol/features/QuasselFeature.kt | 2 +-
.../protocol/io/ByteBufferUtil.kt | 2 +-
.../protocol/io/ChainedByteBuffer.kt | 2 +-
.../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 | 12 +-
.../NoSerializerForTypeException.kt | 6 +-
.../protocol/serializers/QtSerializers.kt | 6 +-
.../serializers/QuasselSerializers.kt | 6 +-
.../handshake/ClientInitAckSerializer.kt | 14 +-
.../handshake/ClientInitRejectSerializer.kt | 12 +-
.../handshake/ClientInitSerializer.kt | 20 +--
.../handshake/HandshakeSerializer.kt | 4 +-
.../serializers/primitive/BoolSerializer.kt | 8 +-
.../primitive/BufferIdSerializer.kt | 10 +-
.../primitive/BufferInfoSerializer.kt | 16 +-
.../primitive/ByteBufferSerializer.kt | 10 +-
.../serializers/primitive/ByteSerializer.kt | 8 +-
.../serializers/primitive/DateSerializer.kt | 8 +-
.../primitive/DateTimeSerializer.kt | 10 +-
.../primitive/DccIpDetectionModeSerializer.kt | 11 +-
.../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 | 20 +--
.../serializers/primitive/MsgIdSerializer.kt | 12 +-
.../primitive/NetworkIdSerializer.kt | 10 +-
.../primitive/PeerPtrSerializer.kt | 8 +-
.../serializers/primitive/QCharSerializer.kt | 10 +-
.../primitive/QHostAddressSerializer.kt | 10 +-
.../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 | 8 +-
.../quasseldroid}/protocol/types/BufferId.kt | 2 +-
.../protocol/types/BufferInfo.kt | 4 +-
.../protocol/types/BufferType.kt | 8 +-
.../protocol/types/DccIpDetectionMode.kt | 2 +-
.../protocol/types/DccPortSelectionMode.kt | 2 +-
.../protocol/types/IdentityId.kt | 2 +-
.../quasseldroid}/protocol/types/Message.kt | 2 +-
.../protocol/types/MessageFlag.kt | 8 +-
.../protocol/types/MessageType.kt | 8 +-
.../quasseldroid}/protocol/types/MsgId.kt | 2 +-
.../quasseldroid}/protocol/types/NetworkId.kt | 2 +-
.../protocol/types/NetworkLayerProtocol.kt | 2 +-
.../quasseldroid}/protocol/types/SignedId.kt | 2 +-
.../quasseldroid}/protocol/types/TimeSpec.kt | 2 +-
.../protocol/variant/QVariant.kt | 18 +-
.../quasseldroid}/protocol/variant/QtType.kt | 2 +-
.../protocol/variant/QuasselType.kt | 2 +-
.../ConnectionHeaderSerializerTest.kt | 8 +-
.../protocol/features/FeatureSetTest.kt | 6 +-
.../protocol/io/ChainedByteBufferTest.kt | 5 +-
.../protocol/io/StringEncoderTest.kt | 6 +-
.../handshake/ClientInitSerializerTest.kt | 20 +--
.../primitive/BoolSerializerTest.kt | 11 +-
.../primitive/BufferIdSerializerTest.kt | 13 +-
.../primitive/BufferInfoSerializerTest.kt | 25 ++-
.../primitive/ByteBufferSerializerTest.kt | 13 +-
.../primitive/ByteSerializerTest.kt | 12 +-
.../primitive/DateTimeSerializerTest.kt | 13 +-
.../DccIpDetectionModeSerializerTest.kt | 13 +-
.../DccPortSelectionModeSerializerTest.kt | 13 +-
.../primitive/DoubleSerializerTest.kt | 12 +-
.../primitive/FloatSerializerTest.kt | 11 +-
.../primitive/IdentityIdSerializerTest.kt | 13 +-
.../primitive/IntSerializerTest.kt | 11 +-
.../primitive/LongSerializerTest.kt | 11 +-
.../primitive/MessageSerializerTest.kt | 22 +--
.../primitive/MsgIdSerializerTest.kt | 14 +-
.../primitive/NetworkIdSerializerTest.kt | 13 +-
.../primitive/PeerPtrSerializerTest.kt | 13 +-
.../primitive/QCharSerializerTest.kt | 13 +-
.../primitive/QHostAddressSerializerTest.kt | 10 +-
.../primitive/QVariantListSerializerTest.kt | 17 +-
.../primitive/QVariantMapSerializerTest.kt | 17 +-
.../primitive/QVariantSerializerTest.kt | 14 +-
.../primitive/ShortSerializerTest.kt | 11 +-
.../primitive/StringSerializerTest.kt | 20 +--
.../primitive/UByteSerializerTest.kt | 11 +-
.../primitive/UIntSerializerTest.kt | 11 +-
.../primitive/ULongSerializerTest.kt | 11 +-
.../primitive/UShortSerializerTest.kt | 11 +-
.../primitive/VoidSerializerTest.kt | 10 +-
.../protocol/testutil/byteBufferOf.kt | 2 +-
.../protocol/testutil/deserialize.kt | 11 +-
.../testutil/handshakeSerializerTest.kt | 6 +-
.../testutil/matchers/BomMatcherChar.kt | 2 +-
.../testutil/matchers/BomMatcherString.kt | 2 +-
.../testutil/matchers/ByteBufferMatcher.kt | 7 +-
.../protocol/testutil/matchers/MapMatcher.kt | 2 +-
.../testutil/matchers/TemporalMatcher.kt | 2 +-
.../protocol/testutil/qtSerializerTest.kt | 6 +-
.../testutil/quasselSerializerTest.kt | 6 +-
.../protocol/testutil/serialize.kt | 17 +-
.../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 | 8 +-
191 files changed, 711 insertions(+), 1641 deletions(-)
delete mode 100644 app/src/androidTest/java/de/kuschku/quasseldroid/ExampleInstrumentedTest.kt
rename ci-containers/src/main/kotlin/de/kuschku/ci_containers/providedContainer.kt => app/src/androidTest/java/info/quasseldroid/app/ExampleInstrumentedTest.kt (52%)
rename app/src/main/java/{de/kuschku/quasseldroid => info/quasseldroid/app}/MainActivity.kt (85%)
rename app/src/main/java/{de/kuschku/quasseldroid => info/quasseldroid/app}/QuasseldroidApplication.kt (96%)
rename app/src/main/java/{de/kuschku/quasseldroid/ui => info/quasseldroid/app}/theme/Color.kt (66%)
rename app/src/main/java/{de/kuschku/quasseldroid/ui => info/quasseldroid/app}/theme/Shape.kt (86%)
rename app/src/main/java/{de/kuschku/quasseldroid/ui => info/quasseldroid/app}/theme/Theme.kt (96%)
rename app/src/main/java/{de/kuschku/quasseldroid/ui => info/quasseldroid/app}/theme/Type.kt (94%)
delete mode 100644 bitflags/build.gradle.kts
delete mode 100644 bitflags/src/main/kotlin/de/kuschku/bitflags/Flag.kt
delete mode 100644 bitflags/src/main/kotlin/de/kuschku/bitflags/Flags.kt
delete mode 100644 bitflags/src/main/kotlin/de/kuschku/bitflags/none.kt
delete mode 100644 bitflags/src/main/kotlin/de/kuschku/bitflags/of.kt
delete mode 100644 bitflags/src/main/kotlin/de/kuschku/bitflags/toBits.kt
delete mode 100644 bitflags/src/main/kotlin/de/kuschku/bitflags/toEnumSet.kt
delete mode 100644 bitflags/src/main/kotlin/de/kuschku/bitflags/toFlag.kt
delete mode 100644 bitflags/src/main/kotlin/de/kuschku/bitflags/validValues.kt
delete mode 100644 buildSrc/src/main/kotlin/de/kuschku/coverageconverter/ConvertCoverageReportsAction.kt
delete mode 100644 buildSrc/src/main/kotlin/de/kuschku/coverageconverter/CoverageConverterPlugin.kt
delete mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/de.kuschku.coverageconverter.properties
delete mode 100644 buildSrc/src/main/resources/coverageconverter/cover2cover.py
delete mode 100644 buildSrc/src/main/resources/coverageconverter/source2filename.py
delete mode 100644 ci-containers/build.gradle.kts
delete mode 100644 ci-containers/src/main/kotlin/de/kuschku/ci_containers/CiContainers.kt
delete mode 100644 ci-containers/src/main/kotlin/de/kuschku/ci_containers/CiContainersExtension.kt
delete mode 100644 ci-containers/src/main/kotlin/de/kuschku/ci_containers/GitlabCiProvidedContainer.kt
delete mode 100644 ci-containers/src/main/kotlin/de/kuschku/ci_containers/ProvidedContainer.kt
delete mode 100644 ci-containers/src/main/kotlin/de/kuschku/ci_containers/TestContainersProvidedContainer.kt
rename libquassel/src/main/kotlin/{de/kuschku => info/quasseldroid}/libquassel/io/CoroutineChannel.kt (94%)
rename libquassel/src/main/kotlin/{de/kuschku => info/quasseldroid}/libquassel/io/FixedDeflaterOutputStream.kt (95%)
rename libquassel/src/main/kotlin/{de/kuschku => info/quasseldroid}/libquassel/io/ReadableWrappedChannel.kt (98%)
rename libquassel/src/main/kotlin/{de/kuschku => info/quasseldroid}/libquassel/io/StreamChannel.kt (94%)
rename libquassel/src/main/kotlin/{de/kuschku => info/quasseldroid}/libquassel/io/WritableWrappedChannel.kt (98%)
rename libquassel/src/main/kotlin/{de/kuschku => info/quasseldroid}/libquassel/util/TlsInfo.kt (98%)
rename libquassel/src/main/kotlin/{de/kuschku => info/quasseldroid}/libquassel/util/X509Helper.kt (96%)
delete mode 100644 libquassel/src/test/kotlin/de/kuschku/libquassel/testutil/quasselContainer.kt
rename libquassel/src/test/kotlin/{de/kuschku => info/quasseldroid}/libquassel/EndToEndTest.kt (77%)
rename libquassel/src/test/kotlin/{de/kuschku => info/quasseldroid}/libquassel/testutil/QuasselCoreContainer.kt (97%)
rename libquassel/src/test/kotlin/{de/kuschku => info/quasseldroid}/libquassel/testutil/TestX509TrustManager.kt (96%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/connection/ConnectionHeader.kt (94%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/connection/ConnectionHeaderSerializer.kt (84%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/connection/ProtocolFeature.kt (87%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/connection/ProtocolInfo.kt (94%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/connection/ProtocolInfoSerializer.kt (77%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/connection/ProtocolMeta.kt (94%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/connection/ProtocolMetaSerializer.kt (76%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/connection/ProtocolVersion.kt (95%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/features/FeatureSet.kt (96%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/features/LegacyFeature.kt (95%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/features/QuasselFeature.kt (98%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/io/ByteBufferUtil.kt (97%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/io/ChainedByteBuffer.kt (98%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/io/StringEncoder.kt (98%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/messages/handshake/ClientInit.kt (82%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/messages/handshake/ClientInitAck.kt (79%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/messages/handshake/ClientInitReject.kt (93%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/messages/handshake/ClientLogin.kt (93%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/messages/handshake/ClientLoginAck.kt (93%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/messages/handshake/ClientLoginReject.kt (93%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/messages/handshake/CoreSetupAck.kt (93%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/messages/handshake/CoreSetupData.kt (88%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/messages/handshake/CoreSetupReject.kt (93%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/messages/handshake/SessionInit.kt (87%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/HandshakeSerializers.kt (76%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/NoSerializerForTypeException.kt (92%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/QtSerializers.kt (91%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/QuasselSerializers.kt (91%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/handshake/ClientInitAckSerializer.kt (82%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/handshake/ClientInitRejectSerializer.kt (76%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/handshake/ClientInitSerializer.kt (75%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/handshake/HandshakeSerializer.kt (88%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/BoolSerializer.kt (84%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/BufferIdSerializer.kt (81%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/BufferInfoSerializer.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/ByteBufferSerializer.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/ByteSerializer.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/DateSerializer.kt (86%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/DateTimeSerializer.kt (90%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt (79%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt (82%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/DoubleSerializer.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/FloatSerializer.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/HandshakeMapSerializer.kt (88%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/IdentityIdSerializer.kt (81%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/IntSerializer.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/LongSerializer.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/MessageSerializer.kt (86%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/MsgIdSerializer.kt (81%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/NetworkIdSerializer.kt (81%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/PeerPtrSerializer.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/QCharSerializer.kt (82%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/QHostAddressSerializer.kt (89%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/QStringListSerializer.kt (84%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/QVariantListSerializer.kt (81%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/QVariantMapSerializer.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/QVariantSerializer.kt (81%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/QtSerializer.kt (87%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/QuasselSerializer.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/Serializer.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/ShortSerializer.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/StringSerializer.kt (90%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/StringSerializerAscii.kt (92%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/StringSerializerUtf16.kt (92%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/StringSerializerUtf8.kt (92%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/TimeSerializer.kt (86%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/UByteSerializer.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/UIntSerializer.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/ULongSerializer.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/UShortSerializer.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/VoidSerializer.kt (82%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/types/BufferActivity.kt (88%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/types/BufferId.kt (95%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/types/BufferInfo.kt (92%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/types/BufferType.kt (88%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/types/DccIpDetectionMode.kt (96%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/types/DccPortSelectionMode.kt (96%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/types/IdentityId.kt (95%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/types/Message.kt (96%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/types/MessageFlag.kt (88%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/types/MessageType.kt (90%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/types/MsgId.kt (95%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/types/NetworkId.kt (95%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/types/NetworkLayerProtocol.kt (95%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/types/SignedId.kt (96%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/types/TimeSpec.kt (95%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/variant/QVariant.kt (83%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/variant/QtType.kt (97%)
rename protocol/src/main/java/{de/kuschku/libquassel => info/quasseldroid}/protocol/variant/QuasselType.kt (96%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/connection/ConnectionHeaderSerializerTest.kt (92%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/features/FeatureSetTest.kt (94%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/io/ChainedByteBufferTest.kt (96%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/io/StringEncoderTest.kt (92%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/handshake/ClientInitSerializerTest.kt (81%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/BoolSerializerTest.kt (77%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/BufferIdSerializerTest.kt (78%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/BufferInfoSerializerTest.kt (69%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/ByteBufferSerializerTest.kt (81%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/ByteSerializerTest.kt (79%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/DateTimeSerializerTest.kt (88%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt (75%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt (75%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/DoubleSerializerTest.kt (84%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/FloatSerializerTest.kt (84%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/IdentityIdSerializerTest.kt (78%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/IntSerializerTest.kt (80%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/LongSerializerTest.kt (81%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/MessageSerializerTest.kt (88%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/MsgIdSerializerTest.kt (80%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/NetworkIdSerializerTest.kt (78%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/PeerPtrSerializerTest.kt (80%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/QCharSerializerTest.kt (83%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/QHostAddressSerializerTest.kt (84%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/QVariantListSerializerTest.kt (75%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/QVariantMapSerializerTest.kt (82%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/QVariantSerializerTest.kt (83%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/ShortSerializerTest.kt (81%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/StringSerializerTest.kt (95%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/UByteSerializerTest.kt (80%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/UIntSerializerTest.kt (81%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/ULongSerializerTest.kt (82%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/UShortSerializerTest.kt (81%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/serializers/primitive/VoidSerializerTest.kt (77%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/byteBufferOf.kt (95%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/deserialize.kt (83%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/handshakeSerializerTest.kt (90%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/matchers/BomMatcherChar.kt (95%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/matchers/BomMatcherString.kt (95%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/matchers/ByteBufferMatcher.kt (89%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/matchers/MapMatcher.kt (96%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/matchers/TemporalMatcher.kt (96%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/qtSerializerTest.kt (90%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/quasselSerializerTest.kt (90%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/serialize.kt (71%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/serializerTest.kt (89%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/testHandshakeSerializerDirect.kt (89%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/testHandshakeSerializerEncoded.kt (81%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/testQtSerializerDirect.kt (82%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/testQtSerializerVariant.kt (79%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/testQuasselSerializerDirect.kt (84%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/testutil/testQuasselSerializerVariant.kt (79%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/types/SignedIdTest.kt (98%)
rename protocol/src/test/kotlin/{de/kuschku/libquassel => info/quasseldroid}/protocol/variant/QVariantTest.kt (83%)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9a7edc30d..9f9cae2f6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -18,7 +18,7 @@ android {
}
composeOptions {
- val androidxComposeVersion: String by project.extra
+ val androidxComposeVersion: String by project
kotlinCompilerExtensionVersion = androidxComposeVersion
}
@@ -32,27 +32,27 @@ kapt {
}
dependencies {
- val androidxCoreVersion: String by project.extra
+ val androidxCoreVersion: String by project
implementation("androidx.core", "core-ktx", androidxCoreVersion)
- val androidxAppcompatVersion: String by project.extra
+ val androidxAppcompatVersion: String by project
implementation("androidx.appcompat", "appcompat", androidxAppcompatVersion)
- val mdcVersion: String by project.extra
+ val mdcVersion: String by project
implementation("com.google.android.material", "material", mdcVersion)
- val androidxComposeVersion: String by project.extra
+ val androidxComposeVersion: String by project
implementation("androidx.compose.ui", "ui", androidxComposeVersion)
implementation("androidx.compose.material", "material", androidxComposeVersion)
implementation("androidx.compose.ui", "ui-tooling", androidxComposeVersion)
- val androidxLifecycleVersion: String by project.extra
+ val androidxLifecycleVersion: String by project
implementation("androidx.lifecycle", "lifecycle-runtime-ktx", androidxLifecycleVersion)
- val androidxMultidexVersion: String by project.extra
+ val androidxMultidexVersion: String by project
implementation("androidx.multidex", "multidex", androidxMultidexVersion)
- val daggerHiltVersion: String by project.extra
+ val daggerHiltVersion: String by project
implementation("com.google.dagger", "hilt-android", daggerHiltVersion)
annotationProcessor("com.google.dagger", "hilt-android-compiler", daggerHiltVersion)
testImplementation("com.google.dagger", "hilt-android-testing", daggerHiltVersion)
@@ -67,7 +67,7 @@ dependencies {
implementation("io.coil-kt", "coil", "1.1.1")
implementation("dev.chrisbanes.accompanist", "accompanist-coil", "0.5.0")
- val junit4Version: String by project.extra
+ val junit4Version: String by project
testImplementation("junit", "junit", junit4Version)
androidTestImplementation("androidx.test.ext", "junit", "1.1.2")
androidTestImplementation("androidx.test.espresso", "espresso-core", "3.3.0")
diff --git a/app/src/androidTest/java/de/kuschku/quasseldroid/ExampleInstrumentedTest.kt b/app/src/androidTest/java/de/kuschku/quasseldroid/ExampleInstrumentedTest.kt
deleted file mode 100644
index 18d842d76..000000000
--- a/app/src/androidTest/java/de/kuschku/quasseldroid/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package de.kuschku.quasseldroid
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
- @Test
- fun useAppContext() {
- // Context of the app under test.
- val appContext = InstrumentationRegistry.getInstrumentation().targetContext
- assertEquals("de.kuschku.quasseldroid", appContext.packageName)
- }
-}
diff --git a/ci-containers/src/main/kotlin/de/kuschku/ci_containers/providedContainer.kt b/app/src/androidTest/java/info/quasseldroid/app/ExampleInstrumentedTest.kt
similarity index 52%
rename from ci-containers/src/main/kotlin/de/kuschku/ci_containers/providedContainer.kt
rename to app/src/androidTest/java/info/quasseldroid/app/ExampleInstrumentedTest.kt
index 219fb4d55..d1c52c3fe 100644
--- a/ci-containers/src/main/kotlin/de/kuschku/ci_containers/providedContainer.kt
+++ b/app/src/androidTest/java/info/quasseldroid/app/ExampleInstrumentedTest.kt
@@ -17,17 +17,25 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.ci_containers
+package info.quasseldroid.app
-import java.net.InetSocketAddress
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
-fun providedContainer(
- envVariable: String,
- f: () -> ProvidedContainer
-) = when {
- !System.getenv(envVariable).isNullOrEmpty() -> {
- val (host, port) = System.getenv(envVariable).split(":")
- GitlabCiProvidedContainer(InetSocketAddress(host, port.toInt()))
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+ @Test
+ fun useAppContext() {
+ // Context of the app under test.
+ val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+ assertEquals("info.quasseldroid.app", appContext.packageName)
}
- else -> f()
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 598de7f6c..b710a6b4f 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="de.kuschku.quasseldroid">
+ package="info.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="de.kuschku.quasseldroid.QuasseldroidApplication"
+ android:name="info.quasseldroid.app.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=".MainActivity"
+ android:name="info.quasseldroid.app.MainActivity"
android:label="@string/app_name"
android:theme="@style/Theme.Quasseldroid.NoActionBar">
<intent-filter>
diff --git a/app/src/main/java/de/kuschku/quasseldroid/MainActivity.kt b/app/src/main/java/info/quasseldroid/app/MainActivity.kt
similarity index 85%
rename from app/src/main/java/de/kuschku/quasseldroid/MainActivity.kt
rename to app/src/main/java/info/quasseldroid/app/MainActivity.kt
index e7ebf8663..7a5cf9351 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/MainActivity.kt
+++ b/app/src/main/java/info/quasseldroid/app/MainActivity.kt
@@ -1,4 +1,23 @@
-package de.kuschku.quasseldroid
+/*
+ * 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 info.quasseldroid.app
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
@@ -20,9 +39,9 @@ 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 de.kuschku.quasseldroid.ui.theme.QuasseldroidTheme
-import de.kuschku.quasseldroid.ui.theme.shapes
-import de.kuschku.quasseldroid.ui.theme.typography
+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/de/kuschku/quasseldroid/QuasseldroidApplication.kt b/app/src/main/java/info/quasseldroid/app/QuasseldroidApplication.kt
similarity index 96%
rename from app/src/main/java/de/kuschku/quasseldroid/QuasseldroidApplication.kt
rename to app/src/main/java/info/quasseldroid/app/QuasseldroidApplication.kt
index d998491e4..43e54102c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/QuasseldroidApplication.kt
+++ b/app/src/main/java/info/quasseldroid/app/QuasseldroidApplication.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.quasseldroid
+package info.quasseldroid.app
import androidx.multidex.MultiDexApplication
import dagger.hilt.android.HiltAndroidApp
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/theme/Color.kt b/app/src/main/java/info/quasseldroid/app/theme/Color.kt
similarity index 66%
rename from app/src/main/java/de/kuschku/quasseldroid/ui/theme/Color.kt
rename to app/src/main/java/info/quasseldroid/app/theme/Color.kt
index 0826e9e5f..3e09405ed 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/theme/Color.kt
+++ b/app/src/main/java/info/quasseldroid/app/theme/Color.kt
@@ -1,8 +1,8 @@
-package de.kuschku.quasseldroid.ui.theme
+package info.quasseldroid.app.theme
import androidx.compose.ui.graphics.Color
val purple200 = Color(0xFFBB86FC)
val purple500 = Color(0xFF6200EE)
val purple700 = Color(0xFF3700B3)
-val teal200 = Color(0xFF03DAC5)
\ No newline at end of file
+val teal200 = Color(0xFF03DAC5)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/theme/Shape.kt b/app/src/main/java/info/quasseldroid/app/theme/Shape.kt
similarity index 86%
rename from app/src/main/java/de/kuschku/quasseldroid/ui/theme/Shape.kt
rename to app/src/main/java/info/quasseldroid/app/theme/Shape.kt
index 1e4b1f7da..c42049e2f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/theme/Shape.kt
+++ b/app/src/main/java/info/quasseldroid/app/theme/Shape.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid.ui.theme
+package info.quasseldroid.app.theme
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Shapes
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/theme/Theme.kt b/app/src/main/java/info/quasseldroid/app/theme/Theme.kt
similarity index 96%
rename from app/src/main/java/de/kuschku/quasseldroid/ui/theme/Theme.kt
rename to app/src/main/java/info/quasseldroid/app/theme/Theme.kt
index e18dfe0d3..c1eba54cc 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/theme/Theme.kt
+++ b/app/src/main/java/info/quasseldroid/app/theme/Theme.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid.ui.theme
+package info.quasseldroid.app.theme
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material.MaterialTheme
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/theme/Type.kt b/app/src/main/java/info/quasseldroid/app/theme/Type.kt
similarity index 94%
rename from app/src/main/java/de/kuschku/quasseldroid/ui/theme/Type.kt
rename to app/src/main/java/info/quasseldroid/app/theme/Type.kt
index a2f199dd2..92be9b63b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/theme/Type.kt
+++ b/app/src/main/java/info/quasseldroid/app/theme/Type.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid.ui.theme
+package info.quasseldroid.app.theme
import androidx.compose.material.Typography
import androidx.compose.ui.text.TextStyle
diff --git a/bitflags/build.gradle.kts b/bitflags/build.gradle.kts
deleted file mode 100644
index 67af7e273..000000000
--- a/bitflags/build.gradle.kts
+++ /dev/null
@@ -1,30 +0,0 @@
-plugins {
- kotlin("jvm")
- id("jacoco")
- id("de.kuschku.coverageconverter")
-}
-
-tasks.withType<Test> {
- useJUnitPlatform()
-}
-
-tasks.getByName<JacocoReport>("jacocoTestReport") {
- reports {
- sourceDirectories.from(fileTree("src/main/kotlin"))
- classDirectories.from(fileTree("build/classes"))
- xml.destination = File("$buildDir/reports/jacoco/report.xml")
- html.isEnabled = true
- xml.isEnabled = true
- csv.isEnabled = false
- }
-}
-
-dependencies {
- implementation(kotlin("stdlib"))
-
- val junit5Version: String by project.extra
- testImplementation("org.junit.jupiter", "junit-jupiter-api", junit5Version)
- testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", junit5Version)
- val hamcrestVersion: String by project.extra
- testImplementation("org.hamcrest", "hamcrest-library", hamcrestVersion)
-}
diff --git a/bitflags/src/main/kotlin/de/kuschku/bitflags/Flag.kt b/bitflags/src/main/kotlin/de/kuschku/bitflags/Flag.kt
deleted file mode 100644
index 1a89c5853..000000000
--- a/bitflags/src/main/kotlin/de/kuschku/bitflags/Flag.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.kuschku.bitflags
-
-interface Flag<T> {
- val value: T
-}
diff --git a/bitflags/src/main/kotlin/de/kuschku/bitflags/Flags.kt b/bitflags/src/main/kotlin/de/kuschku/bitflags/Flags.kt
deleted file mode 100644
index 716d905a5..000000000
--- a/bitflags/src/main/kotlin/de/kuschku/bitflags/Flags.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.kuschku.bitflags
-
-interface Flags<T, U> where U : Flag<T>, U : Enum<U> {
- val all: Set<U>
-}
diff --git a/bitflags/src/main/kotlin/de/kuschku/bitflags/none.kt b/bitflags/src/main/kotlin/de/kuschku/bitflags/none.kt
deleted file mode 100644
index da9953d99..000000000
--- a/bitflags/src/main/kotlin/de/kuschku/bitflags/none.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.kuschku.bitflags
-
-import java.util.*
-
-inline fun <reified T> Flags<*, T>.none(): EnumSet<T>
- where T : Flag<*>, T : Enum<T> = EnumSet.noneOf(T::class.java)
diff --git a/bitflags/src/main/kotlin/de/kuschku/bitflags/of.kt b/bitflags/src/main/kotlin/de/kuschku/bitflags/of.kt
deleted file mode 100644
index 7398893ff..000000000
--- a/bitflags/src/main/kotlin/de/kuschku/bitflags/of.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.kuschku.bitflags
-
-import java.util.*
-
-inline fun <reified T> Flags<*, T>.of(vararg values: T): EnumSet<T>
- where T : Flag<*>, T : Enum<T> = values.toEnumSet()
-
-inline fun <reified T> Flags<*, T>.of(values: Collection<T>): EnumSet<T>
- where T : Flag<*>, T : Enum<T> = values.toEnumSet()
diff --git a/bitflags/src/main/kotlin/de/kuschku/bitflags/toBits.kt b/bitflags/src/main/kotlin/de/kuschku/bitflags/toBits.kt
deleted file mode 100644
index fd822c25c..000000000
--- a/bitflags/src/main/kotlin/de/kuschku/bitflags/toBits.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.kuschku.bitflags
-
-import kotlin.experimental.or
-
-@JvmName("toByteFlag")
-fun Set<Flag<Byte>>?.toBits(): Byte = this?.fold(0.toByte()) { acc, el ->
- acc or el.value
-} ?: 0.toByte()
-
-@JvmName("toUByteFlag")
-fun Set<Flag<UByte>>?.toBits(): UByte = this?.fold(0.toUByte()) { acc, el ->
- acc or el.value
-} ?: 0.toUByte()
-
-@JvmName("toShortFlag")
-fun Set<Flag<Short>>?.toBits(): Short = this?.fold(0.toShort()) { acc, el ->
- acc or el.value
-} ?: 0.toShort()
-
-@JvmName("toUShortFlag")
-fun Set<Flag<UShort>>?.toBits(): UShort = this?.fold(0.toUShort()) { acc, el ->
- acc or el.value
-} ?: 0.toUShort()
-
-@JvmName("toIntFlag")
-fun Set<Flag<Int>>?.toBits(): Int = this?.fold(0) { acc, el ->
- acc or el.value
-} ?: 0
-
-@JvmName("toUIntFlag")
-fun Set<Flag<UInt>>?.toBits(): UInt = this?.fold(0.toUInt()) { acc, el ->
- acc or el.value
-} ?: 0u
-
-@JvmName("toLongFlag")
-fun Set<Flag<Long>>?.toBits(): Long = this?.fold(0.toLong()) { acc, el ->
- acc or el.value
-} ?: 0L
-
-@JvmName("toULongFlag")
-fun Set<Flag<ULong>>?.toBits(): ULong = this?.fold(0.toULong()) { acc, el ->
- acc or el.value
-} ?: 0uL
diff --git a/bitflags/src/main/kotlin/de/kuschku/bitflags/toEnumSet.kt b/bitflags/src/main/kotlin/de/kuschku/bitflags/toEnumSet.kt
deleted file mode 100644
index 23ca9dcc2..000000000
--- a/bitflags/src/main/kotlin/de/kuschku/bitflags/toEnumSet.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.kuschku.bitflags
-
-import java.util.*
-
-inline fun <reified T : Enum<T>> Array<out T>.toEnumSet() =
- EnumSet.noneOf(T::class.java).apply {
- addAll(this@toEnumSet)
- }
-
-inline fun <reified T : Enum<T>> Collection<T>.toEnumSet() =
- EnumSet.noneOf(T::class.java).apply {
- addAll(this@toEnumSet)
- }
diff --git a/bitflags/src/main/kotlin/de/kuschku/bitflags/toFlag.kt b/bitflags/src/main/kotlin/de/kuschku/bitflags/toFlag.kt
deleted file mode 100644
index 1eb55bb51..000000000
--- a/bitflags/src/main/kotlin/de/kuschku/bitflags/toFlag.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.kuschku.bitflags
-
-import java.util.*
-import kotlin.experimental.and
-
-inline fun <reified T> Flags<Byte, T>.of(value: Byte?): EnumSet<T> where T : Flag<Byte>, T : Enum<T> {
- if (value == null) return emptyList<T>().toEnumSet()
- return all.filter { (value and it.value) != 0.toByte() }.toEnumSet()
-}
-
-inline fun <reified T> Flags<UByte, T>.of(value: UByte?): EnumSet<T> where T : Flag<UByte>, T : Enum<T> {
- if (value == null) return emptyList<T>().toEnumSet()
- return all.filter { (value and it.value) != 0.toUByte() }.toEnumSet()
-}
-
-inline fun <reified T> Flags<Short, T>.of(value: Short?): EnumSet<T> where T : Flag<Short>, T : Enum<T> {
- if (value == null) return emptyList<T>().toEnumSet()
- return all.filter { (value and it.value) != 0.toShort() }.toEnumSet()
-}
-
-inline fun <reified T> Flags<UShort, T>.of(value: UShort?): EnumSet<T> where T : Flag<UShort>, T : Enum<T> {
- if (value == null) return emptyList<T>().toEnumSet()
- return all.filter { (value and it.value) != 0.toUShort() }.toEnumSet()
-}
-
-inline fun <reified T> Flags<Int, T>.of(value: Int?): EnumSet<T> where T : Flag<Int>, T : Enum<T> {
- if (value == null) return emptyList<T>().toEnumSet()
- return all.filter { (value and it.value) != 0 }.toEnumSet()
-}
-
-inline fun <reified T> Flags<UInt, T>.of(value: UInt?): EnumSet<T> where T : Flag<UInt>, T : Enum<T> {
- if (value == null) return emptyList<T>().toEnumSet()
- return all.filter { (value and it.value) != 0u }.toEnumSet()
-}
-
-inline fun <reified T> Flags<Long, T>.of(value: Long?): EnumSet<T> where T : Flag<Long>, T : Enum<T> {
- if (value == null) return emptyList<T>().toEnumSet()
- return all.filter { (value and it.value) != 0L }.toEnumSet()
-}
-
-inline fun <reified T> Flags<ULong, T>.of(value: ULong?): EnumSet<T> where T : Flag<ULong>, T : Enum<T> {
- if (value == null) return emptyList<T>().toEnumSet()
- return all.filter { (value and it.value) != 0uL }.toEnumSet()
-}
diff --git a/bitflags/src/main/kotlin/de/kuschku/bitflags/validValues.kt b/bitflags/src/main/kotlin/de/kuschku/bitflags/validValues.kt
deleted file mode 100644
index 3485bf8a2..000000000
--- a/bitflags/src/main/kotlin/de/kuschku/bitflags/validValues.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.kuschku.bitflags
-
-import java.util.*
-
-@JvmName("validValuesUByte")
-inline fun <reified T> Flags<UByte, T>.validValues(): EnumSet<T>
- where T : Flag<UByte>, T : Enum<T> =
- all.filter { it.value != 0.toUByte() }.toEnumSet()
-
-@JvmName("validValuesByte")
-inline fun <reified T> Flags<Byte, T>.validValues(): EnumSet<T>
- where T : Flag<Byte>, T : Enum<T> =
- all.filter { it.value != 0.toByte() }.toEnumSet()
-
-@JvmName("validValuesUShort")
-inline fun <reified T> Flags<UShort, T>.validValues(): EnumSet<T>
- where T : Flag<UShort>, T : Enum<T> =
- all.filter { it.value != 0.toUShort() }.toEnumSet()
-
-@JvmName("validValuesShort")
-inline fun <reified T> Flags<Short, T>.validValues(): EnumSet<T>
- where T : Flag<Short>, T : Enum<T> =
- all.filter { it.value != 0.toShort() }.toEnumSet()
-
-@JvmName("validValuesUInt")
-inline fun <reified T> Flags<UInt, T>.validValues(): EnumSet<T>
- where T : Flag<UInt>, T : Enum<T> =
- all.filter { it.value != 0u }.toEnumSet()
-
-@JvmName("validValuesInt")
-inline fun <reified T> Flags<Int, T>.validValues(): EnumSet<T>
- where T : Flag<Int>, T : Enum<T> =
- all.filter { it.value != 0 }.toEnumSet()
-
-@JvmName("validValuesULong")
-inline fun <reified T> Flags<ULong, T>.validValues(): EnumSet<T>
- where T : Flag<ULong>, T : Enum<T> =
- all.filter { it.value != 0uL }.toEnumSet()
-
-@JvmName("validValuesLong")
-inline fun <reified T> Flags<Long, T>.validValues(): EnumSet<T>
- where T : Flag<Long>, T : Enum<T> =
- all.filter { it.value != 0L }.toEnumSet()
diff --git a/build.gradle b/build.gradle
index 10a970267..bec9fa1f2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,9 +16,3 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
-buildscript {
- dependencies {
- classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21'
- }
-}
diff --git a/build.gradle.kts b/build.gradle.kts
index 94dc53a7b..78a62860e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -33,22 +33,11 @@ buildscript {
}
allprojects {
- extra["androidxAppcompatVersion"] = "1.2.0"
- extra["androidxCoreVersion"] = "1.2.0"
- extra["androidxComposeVersion"] = "1.0.0-alpha11"
- extra["androidxLifecycleVersion"] = "2.3.0-rc01"
- extra["androidxMultidexVersion"] = "2.0.1"
- extra["daggerHiltVersion"] = "2.31.2-alpha"
- extra["hamcrestVersion"] = "2.1"
- extra["junit4Version"] = "4.13.1"
- extra["junit5Version"] = "5.3.1"
- extra["mdcVersion"] = "1.2.1"
- extra["testContainersVersion"] = "1.15.1"
-
repositories {
google()
mavenCentral()
jcenter()
+ mavenLocal()
}
tasks.withType<KotlinCompile>().configureEach {
diff --git a/buildSrc/src/main/kotlin/de/kuschku/coverageconverter/ConvertCoverageReportsAction.kt b/buildSrc/src/main/kotlin/de/kuschku/coverageconverter/ConvertCoverageReportsAction.kt
deleted file mode 100644
index 9e2f3aa36..000000000
--- a/buildSrc/src/main/kotlin/de/kuschku/coverageconverter/ConvertCoverageReportsAction.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.kuschku.coverageconverter
-
-import org.gradle.api.Action
-import org.gradle.api.Task
-import org.gradle.testing.jacoco.tasks.JacocoReport
-import java.io.File
-
-internal class ConvertCoverageReportsAction(
- 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(t: Task) {
- val cover2coverScript = createPythonScript("cover2cover.py", t.temporaryDir)
- val source2filenameScript = createPythonScript("source2filename.py", t.temporaryDir)
-
- fun cover2cover(reportFile: File, outputFile: File, sourceDirectories: Iterable<File>) {
- t.project.exec {
- commandLine("python3")
- args(cover2coverScript.absolutePath)
- args(reportFile.absolutePath)
- args(sourceDirectories.map(File::getAbsolutePath))
- standardOutput = outputFile.outputStream()
- }
- }
-
- fun source2filename(reportFile: File) {
- t.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/kuschku/coverageconverter/CoverageConverterPlugin.kt b/buildSrc/src/main/kotlin/de/kuschku/coverageconverter/CoverageConverterPlugin.kt
deleted file mode 100644
index 7c16efefe..000000000
--- a/buildSrc/src/main/kotlin/de/kuschku/coverageconverter/CoverageConverterPlugin.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package de.kuschku.coverageconverter
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.Task
-import org.gradle.api.tasks.testing.Test
-import org.gradle.kotlin.dsl.getByName
-import org.gradle.kotlin.dsl.register
-import org.gradle.testing.jacoco.tasks.JacocoReport
-
-class CoverageConverterPlugin : Plugin<Project> {
- override fun apply(project: Project) {
- project.afterEvaluate {
- val testTask = tasks.getByName<Test>("test")
-
- val jacocoReportTask = tasks.getByName<JacocoReport>("jacocoTestReport"){
- dependsOn(testTask)
- }
-
- tasks.register("coberturaTestReport") {
- dependsOn(jacocoReportTask)
- mustRunAfter(jacocoReportTask)
- group = "verification"
-
- doLast(ConvertCoverageReportsAction(jacocoReportTask))
- }
- }
- }
-}
-
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/de.kuschku.coverageconverter.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/de.kuschku.coverageconverter.properties
deleted file mode 100644
index 170902fa7..000000000
--- a/buildSrc/src/main/resources/META-INF/gradle-plugins/de.kuschku.coverageconverter.properties
+++ /dev/null
@@ -1 +0,0 @@
-implementation-class=de.kuschku.coverageconverter.CoverageConverterPlugin
diff --git a/buildSrc/src/main/resources/coverageconverter/cover2cover.py b/buildSrc/src/main/resources/coverageconverter/cover2cover.py
deleted file mode 100644
index 7561ad560..000000000
--- a/buildSrc/src/main/resources/coverageconverter/cover2cover.py
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/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
deleted file mode 100644
index 2b60a9b37..000000000
--- a/buildSrc/src/main/resources/coverageconverter/source2filename.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/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/ci-containers/build.gradle.kts b/ci-containers/build.gradle.kts
deleted file mode 100644
index 504442f95..000000000
--- a/ci-containers/build.gradle.kts
+++ /dev/null
@@ -1,11 +0,0 @@
-plugins {
- kotlin("jvm")
-}
-
-dependencies {
- implementation(kotlin("stdlib"))
-
- val testContainersVersion: String by project.extra
- api("org.testcontainers", "testcontainers", testContainersVersion)
- api("org.testcontainers", "junit-jupiter", testContainersVersion)
-}
diff --git a/ci-containers/src/main/kotlin/de/kuschku/ci_containers/CiContainers.kt b/ci-containers/src/main/kotlin/de/kuschku/ci_containers/CiContainers.kt
deleted file mode 100644
index 96cb82e03..000000000
--- a/ci-containers/src/main/kotlin/de/kuschku/ci_containers/CiContainers.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.kuschku.ci_containers
-
-import org.junit.jupiter.api.extension.ExtendWith
-
-@MustBeDocumented
-@Target(AnnotationTarget.CLASS, AnnotationTarget.ANNOTATION_CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-@ExtendWith(CiContainersExtension::class)
-annotation class CiContainers
diff --git a/ci-containers/src/main/kotlin/de/kuschku/ci_containers/CiContainersExtension.kt b/ci-containers/src/main/kotlin/de/kuschku/ci_containers/CiContainersExtension.kt
deleted file mode 100644
index 3a9d84d19..000000000
--- a/ci-containers/src/main/kotlin/de/kuschku/ci_containers/CiContainersExtension.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.kuschku.ci_containers
-
-import org.junit.jupiter.api.extension.AfterEachCallback
-import org.junit.jupiter.api.extension.BeforeEachCallback
-import org.junit.jupiter.api.extension.ExtensionContext
-
-class CiContainersExtension : BeforeEachCallback, AfterEachCallback {
- private fun getContainers(context: ExtensionContext?): List<ProvidedContainer> {
- val containers = mutableListOf<ProvidedContainer>()
- context?.requiredTestInstances?.allInstances?.forEach { instance ->
- instance.javaClass.declaredFields.map { field ->
- if (field.type == ProvidedContainer::class.java) {
- field.trySetAccessible()
- containers.add(field.get(instance) as ProvidedContainer)
- }
- }
- }
- return containers
- }
-
- override fun beforeEach(context: ExtensionContext?) {
- getContainers(context).forEach(ProvidedContainer::start)
- }
-
- override fun afterEach(context: ExtensionContext?) {
- getContainers(context).forEach(ProvidedContainer::stop)
- }
-}
diff --git a/ci-containers/src/main/kotlin/de/kuschku/ci_containers/GitlabCiProvidedContainer.kt b/ci-containers/src/main/kotlin/de/kuschku/ci_containers/GitlabCiProvidedContainer.kt
deleted file mode 100644
index 2f49a38e8..000000000
--- a/ci-containers/src/main/kotlin/de/kuschku/ci_containers/GitlabCiProvidedContainer.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.kuschku.ci_containers
-
-import java.net.InetSocketAddress
-
-class GitlabCiProvidedContainer(
- override val address: InetSocketAddress
-) : ProvidedContainer {
- override fun start() = Unit
- override fun stop() = Unit
-}
diff --git a/ci-containers/src/main/kotlin/de/kuschku/ci_containers/ProvidedContainer.kt b/ci-containers/src/main/kotlin/de/kuschku/ci_containers/ProvidedContainer.kt
deleted file mode 100644
index 7056b507a..000000000
--- a/ci-containers/src/main/kotlin/de/kuschku/ci_containers/ProvidedContainer.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.kuschku.ci_containers
-
-import java.net.InetSocketAddress
-
-interface ProvidedContainer {
- fun start()
- fun stop()
-
- val address: InetSocketAddress
-}
diff --git a/ci-containers/src/main/kotlin/de/kuschku/ci_containers/TestContainersProvidedContainer.kt b/ci-containers/src/main/kotlin/de/kuschku/ci_containers/TestContainersProvidedContainer.kt
deleted file mode 100644
index 7b76f4bf3..000000000
--- a/ci-containers/src/main/kotlin/de/kuschku/ci_containers/TestContainersProvidedContainer.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.kuschku.ci_containers
-
-import org.testcontainers.containers.GenericContainer
-import java.net.InetSocketAddress
-
-class TestContainersProvidedContainer<T : GenericContainer<T>>(
- private val container: T,
- private val port: Int
-) : ProvidedContainer {
- override fun start() = container.start()
- override fun stop() = container.stop()
- override val address
- get() = InetSocketAddress(
- container.containerIpAddress,
- container.getMappedPort(port)
- )
-}
diff --git a/gradle.properties b/gradle.properties
index b7d373b95..92a927257 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,3 +32,18 @@ org.gradle.caching=true
# Enable AndroidX
android.useAndroidX=true
android.enableJetifier=true
+
+# Dependency versions
+androidxAppcompatVersion=1.2.0
+androidxCoreVersion=1.2.0
+androidxComposeVersion=1.0.0-alpha11
+androidxLifecycleVersion=2.3.0-rc01
+androidxMultidexVersion=2.0.1
+daggerHiltVersion=2.31.2-alpha
+hamcrestVersion=2.1
+junit4Version=4.13.1
+junit5Version=5.3.1
+kotlinBitflagsVersion=1.0.1
+mdcVersion=1.2.1
+sl4jVersion=1.7.30
+testcontainersCiVersion=1.0.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index da9702f9e..78f43eab3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionSha256Sum=8de6efc274ab52332a9c820366dd5cf5fc9d35ec7078fd70c8ec6913431ee610
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/libquassel/build.gradle.kts b/libquassel/build.gradle.kts
index 47ed5b5ab..7216904bb 100644
--- a/libquassel/build.gradle.kts
+++ b/libquassel/build.gradle.kts
@@ -1,22 +1,15 @@
plugins {
kotlin("jvm")
id("jacoco")
- id("de.kuschku.coverageconverter")
+ id("de.justjanne.jacoco-cobertura-converter") version "1.0"
}
tasks.withType<Test> {
useJUnitPlatform()
}
-tasks.getByName<JacocoReport>("jacocoTestReport") {
- reports {
- sourceDirectories.from(fileTree("src/main/kotlin"))
- classDirectories.from(fileTree("build/classes"))
- xml.destination = File("$buildDir/reports/jacoco/report.xml")
- html.isEnabled = true
- xml.isEnabled = true
- csv.isEnabled = false
- }
+coverage {
+ autoConfigureCoverage = true
}
dependencies {
@@ -25,13 +18,15 @@ dependencies {
implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-test", "1.4.2")
api(project(":protocol"))
- val junit5Version: String by project.extra
+ val junit5Version: String by project
testImplementation("org.junit.jupiter", "junit-jupiter-api", junit5Version)
testImplementation("org.junit.jupiter", "junit-jupiter-params", junit5Version)
testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", junit5Version)
- val hamcrestVersion: String by project.extra
+ val hamcrestVersion: String by project
testImplementation("org.hamcrest", "hamcrest-library", hamcrestVersion)
- testImplementation(project(":ci-containers"))
- testImplementation("org.slf4j", "slf4j-simple", "1.7.30")
+ val testcontainersCiVersion: String by project
+ testImplementation("de.justjanne", "testcontainers-ci", testcontainersCiVersion)
+ val sl4jVersion: String by project
+ testImplementation("org.slf4j", "slf4j-simple", sl4jVersion)
}
diff --git a/libquassel/src/main/kotlin/de/kuschku/libquassel/io/CoroutineChannel.kt b/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/CoroutineChannel.kt
similarity index 94%
rename from libquassel/src/main/kotlin/de/kuschku/libquassel/io/CoroutineChannel.kt
rename to libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/CoroutineChannel.kt
index a2d3b88db..b629ef242 100644
--- a/libquassel/src/main/kotlin/de/kuschku/libquassel/io/CoroutineChannel.kt
+++ b/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/CoroutineChannel.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.quasseldroid.protocol.io
+package info.quasseldroid.libquassel.io
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.quasseldroid.util.TlsInfo
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.libquassel.util.TlsInfo
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.asCoroutineDispatcher
import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/libquassel/src/main/kotlin/de/kuschku/libquassel/io/FixedDeflaterOutputStream.kt b/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/FixedDeflaterOutputStream.kt
similarity index 95%
rename from libquassel/src/main/kotlin/de/kuschku/libquassel/io/FixedDeflaterOutputStream.kt
rename to libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/FixedDeflaterOutputStream.kt
index abdad9f25..d626e96eb 100644
--- a/libquassel/src/main/kotlin/de/kuschku/libquassel/io/FixedDeflaterOutputStream.kt
+++ b/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/FixedDeflaterOutputStream.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.quasseldroid.protocol.io
+package info.quasseldroid.libquassel.io
import java.io.OutputStream
import java.util.zip.DeflaterOutputStream
diff --git a/libquassel/src/main/kotlin/de/kuschku/libquassel/io/ReadableWrappedChannel.kt b/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/ReadableWrappedChannel.kt
similarity index 98%
rename from libquassel/src/main/kotlin/de/kuschku/libquassel/io/ReadableWrappedChannel.kt
rename to libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/ReadableWrappedChannel.kt
index f8009d937..fa2918d4e 100644
--- a/libquassel/src/main/kotlin/de/kuschku/libquassel/io/ReadableWrappedChannel.kt
+++ b/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/ReadableWrappedChannel.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.io
+package info.quasseldroid.libquassel.io
import java.io.InputStream
import java.nio.ByteBuffer
diff --git a/libquassel/src/main/kotlin/de/kuschku/libquassel/io/StreamChannel.kt b/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/StreamChannel.kt
similarity index 94%
rename from libquassel/src/main/kotlin/de/kuschku/libquassel/io/StreamChannel.kt
rename to libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/StreamChannel.kt
index 382be13d3..80c407952 100644
--- a/libquassel/src/main/kotlin/de/kuschku/libquassel/io/StreamChannel.kt
+++ b/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/StreamChannel.kt
@@ -17,10 +17,9 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.quasseldroid.protocol.io
+package info.quasseldroid.libquassel.io
-import de.kuschku.libquassel.io.ReadableWrappedChannel
-import de.kuschku.quasseldroid.util.TlsInfo
+import info.quasseldroid.libquassel.util.TlsInfo
import java.io.Flushable
import java.io.InputStream
import java.io.OutputStream
diff --git a/libquassel/src/main/kotlin/de/kuschku/libquassel/io/WritableWrappedChannel.kt b/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/WritableWrappedChannel.kt
similarity index 98%
rename from libquassel/src/main/kotlin/de/kuschku/libquassel/io/WritableWrappedChannel.kt
rename to libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/WritableWrappedChannel.kt
index ce25556b3..b1ea8aae4 100644
--- a/libquassel/src/main/kotlin/de/kuschku/libquassel/io/WritableWrappedChannel.kt
+++ b/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/WritableWrappedChannel.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.quasseldroid.protocol.io
+package info.quasseldroid.libquassel.io
import java.io.OutputStream
import java.nio.ByteBuffer
diff --git a/libquassel/src/main/kotlin/de/kuschku/libquassel/util/TlsInfo.kt b/libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/TlsInfo.kt
similarity index 98%
rename from libquassel/src/main/kotlin/de/kuschku/libquassel/util/TlsInfo.kt
rename to libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/TlsInfo.kt
index d2e781dd9..f1e3f085c 100644
--- a/libquassel/src/main/kotlin/de/kuschku/libquassel/util/TlsInfo.kt
+++ b/libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/TlsInfo.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.quasseldroid.util
+package info.quasseldroid.libquassel.util
import java.security.cert.Certificate
import java.security.cert.X509Certificate
diff --git a/libquassel/src/main/kotlin/de/kuschku/libquassel/util/X509Helper.kt b/libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/X509Helper.kt
similarity index 96%
rename from libquassel/src/main/kotlin/de/kuschku/libquassel/util/X509Helper.kt
rename to libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/X509Helper.kt
index 0c5b88177..cdc72065e 100644
--- a/libquassel/src/main/kotlin/de/kuschku/libquassel/util/X509Helper.kt
+++ b/libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/X509Helper.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.quasseldroid.util
+package info.quasseldroid.libquassel.util
import java.io.ByteArrayInputStream
import java.security.cert.Certificate
diff --git a/libquassel/src/test/kotlin/de/kuschku/libquassel/testutil/quasselContainer.kt b/libquassel/src/test/kotlin/de/kuschku/libquassel/testutil/quasselContainer.kt
deleted file mode 100644
index 44b7c1e78..000000000
--- a/libquassel/src/test/kotlin/de/kuschku/libquassel/testutil/quasselContainer.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.kuschku.libquassel.testutil
-
-import de.kuschku.ci_containers.TestContainersProvidedContainer
-import de.kuschku.ci_containers.providedContainer
-
-fun quasselContainer() = providedContainer("QUASSEL_CONTAINER") {
- TestContainersProvidedContainer(
- QuasselCoreContainer(),
- QuasselCoreContainer.QUASSEL_PORT
- )
-}
diff --git a/libquassel/src/test/kotlin/de/kuschku/libquassel/EndToEndTest.kt b/libquassel/src/test/kotlin/info/quasseldroid/libquassel/EndToEndTest.kt
similarity index 77%
rename from libquassel/src/test/kotlin/de/kuschku/libquassel/EndToEndTest.kt
rename to libquassel/src/test/kotlin/info/quasseldroid/libquassel/EndToEndTest.kt
index 474b79019..80c90cd9c 100644
--- a/libquassel/src/test/kotlin/de/kuschku/libquassel/EndToEndTest.kt
+++ b/libquassel/src/test/kotlin/info/quasseldroid/libquassel/EndToEndTest.kt
@@ -17,36 +17,37 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel
+package info.quasseldroid.libquassel
-import de.kuschku.bitflags.of
-import de.kuschku.ci_containers.CiContainers
-import de.kuschku.ci_containers.CiContainersExtension
-import de.kuschku.libquassel.protocol.connection.*
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.messages.handshake.ClientInit
-import de.kuschku.libquassel.protocol.serializers.HandshakeSerializers
-import de.kuschku.libquassel.protocol.serializers.handshake.ClientInitSerializer
-import de.kuschku.libquassel.protocol.serializers.primitive.HandshakeMapSerializer
-import de.kuschku.libquassel.protocol.serializers.primitive.IntSerializer
-import de.kuschku.libquassel.protocol.variant.into
-import de.kuschku.libquassel.testutil.TestX509TrustManager
-import de.kuschku.libquassel.testutil.quasselContainer
-import de.kuschku.quasseldroid.protocol.io.CoroutineChannel
+import de.justjanne.bitflags.of
+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.ClientInit
+import info.quasseldroid.protocol.serializers.HandshakeSerializers
+import info.quasseldroid.protocol.serializers.handshake.ClientInitSerializer
+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
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
+import java.net.InetSocketAddress
import java.nio.ByteBuffer
import javax.net.ssl.SSLContext
@ExperimentalCoroutinesApi
@CiContainers
class EndToEndTest {
- private val quassel = quasselContainer()
+ private val quassel = providedContainer("QUASSEL_CONTAINER") {
+ QuasselCoreContainer()
+ }
private val sslContext = SSLContext.getInstance("TLSv1.3").apply {
init(null, arrayOf(TestX509TrustManager), null)
@@ -59,7 +60,12 @@ class EndToEndTest {
@Test
fun testConnect() = runBlocking {
- channel.connect(quassel.address)
+ channel.connect(
+ InetSocketAddress(
+ quassel.address,
+ quassel.getMappedPort(4242)
+ )
+ )
println("Writing protocol")
write(sizePrefix = false) {
diff --git a/libquassel/src/test/kotlin/de/kuschku/libquassel/testutil/QuasselCoreContainer.kt b/libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/QuasselCoreContainer.kt
similarity index 97%
rename from libquassel/src/test/kotlin/de/kuschku/libquassel/testutil/QuasselCoreContainer.kt
rename to libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/QuasselCoreContainer.kt
index b985a594c..8cd3afe40 100644
--- a/libquassel/src/test/kotlin/de/kuschku/libquassel/testutil/QuasselCoreContainer.kt
+++ b/libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/QuasselCoreContainer.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.testutil
+package info.quasseldroid.libquassel.testutil
import org.slf4j.LoggerFactory
import org.testcontainers.containers.BindMode
diff --git a/libquassel/src/test/kotlin/de/kuschku/libquassel/testutil/TestX509TrustManager.kt b/libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/TestX509TrustManager.kt
similarity index 96%
rename from libquassel/src/test/kotlin/de/kuschku/libquassel/testutil/TestX509TrustManager.kt
rename to libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/TestX509TrustManager.kt
index 4ace77892..ceb9ce2ad 100644
--- a/libquassel/src/test/kotlin/de/kuschku/libquassel/testutil/TestX509TrustManager.kt
+++ b/libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/TestX509TrustManager.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.testutil
+package info.quasseldroid.libquassel.testutil
import java.security.cert.X509Certificate
import javax.net.ssl.X509TrustManager
diff --git a/protocol/build.gradle.kts b/protocol/build.gradle.kts
index d665980a0..2be90656a 100644
--- a/protocol/build.gradle.kts
+++ b/protocol/build.gradle.kts
@@ -1,40 +1,28 @@
plugins {
kotlin("jvm")
jacoco
- id("de.kuschku.coverageconverter")
+ id("de.justjanne.jacoco-cobertura-converter") version "1.0"
}
tasks.withType<Test> {
useJUnitPlatform()
}
-jacoco {
- toolVersion = "0.8.3"
-}
-
-tasks.getByName<JacocoReport>("jacocoTestReport") {
- reports {
- sourceDirectories.from(fileTree("src/main/kotlin"))
- xml.destination = File("$buildDir/reports/jacoco/report.xml")
- html.isEnabled = true
- xml.isEnabled = true
- csv.isEnabled = false
- }
+coverage {
+ autoConfigureCoverage = true
}
dependencies {
implementation(kotlin("stdlib"))
api("org.threeten", "threetenbp", "1.4.0")
- api(project(":bitflags"))
+ val kotlinBitflagsVersion: String by project
+ api("de.justjanne", "kotlin-bitflags", kotlinBitflagsVersion)
api(project(":coverage-annotations"))
- val junit5Version: String by project.extra
+ val junit5Version: String by project
testImplementation("org.junit.jupiter", "junit-jupiter-api", junit5Version)
testImplementation("org.junit.jupiter", "junit-jupiter-params", junit5Version)
testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", junit5Version)
- val hamcrestVersion: String by project.extra
+ val hamcrestVersion: String by project
testImplementation("org.hamcrest", "hamcrest-library", hamcrestVersion)
- val testContainersVersion: String by project.extra
- testImplementation("org.testcontainers", "testcontainers", testContainersVersion)
- testImplementation("org.testcontainers", "junit-jupiter", testContainersVersion)
}
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ConnectionHeader.kt b/protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeader.kt
similarity index 94%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ConnectionHeader.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeader.kt
index 6e0d939d4..8673c6637 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ConnectionHeader.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeader.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.connection
+package info.quasseldroid.protocol.connection
data class ConnectionHeader(
val features: ProtocolFeatures,
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ConnectionHeaderSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeaderSerializer.kt
similarity index 84%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ConnectionHeaderSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeaderSerializer.kt
index aea9cf66e..4d34ca72d 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ConnectionHeaderSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeaderSerializer.kt
@@ -17,15 +17,15 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.connection
+package info.quasseldroid.protocol.connection
-import de.kuschku.bitflags.of
-import de.kuschku.bitflags.toBits
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.serializers.primitive.Serializer
-import de.kuschku.libquassel.protocol.serializers.primitive.UByteSerializer
-import de.kuschku.libquassel.protocol.serializers.primitive.UIntSerializer
+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 java.nio.ByteBuffer
object ConnectionHeaderSerializer : Serializer<ConnectionHeader> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolFeature.kt b/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolFeature.kt
similarity index 87%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolFeature.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolFeature.kt
index 5ecc2de18..493cd137b 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolFeature.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolFeature.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.connection
+package info.quasseldroid.protocol.connection
-import de.kuschku.bitflags.Flag
-import de.kuschku.bitflags.Flags
-import de.kuschku.bitflags.toEnumSet
+import de.justjanne.bitflags.Flag
+import de.justjanne.bitflags.Flags
+import de.justjanne.bitflags.toEnumSet
enum class ProtocolFeature(
override val value: UByte,
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolInfo.kt b/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfo.kt
similarity index 94%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolInfo.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfo.kt
index 1ec8299c8..ea7f2e971 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolInfo.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfo.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.connection
+package info.quasseldroid.protocol.connection
data class ProtocolInfo(
val flags: ProtocolFeatures,
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolInfoSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfoSerializer.kt
similarity index 77%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolInfoSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfoSerializer.kt
index 2a48500c0..9285a7046 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolInfoSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfoSerializer.kt
@@ -17,14 +17,14 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.connection
+package info.quasseldroid.protocol.connection
-import de.kuschku.bitflags.of
-import de.kuschku.bitflags.toBits
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.serializers.primitive.Serializer
-import de.kuschku.libquassel.protocol.serializers.primitive.UByteSerializer
+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 java.nio.ByteBuffer
object ProtocolInfoSerializer : Serializer<ProtocolInfo> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolMeta.kt b/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMeta.kt
similarity index 94%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolMeta.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMeta.kt
index f8c3323d7..261356305 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolMeta.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMeta.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.connection
+package info.quasseldroid.protocol.connection
data class ProtocolMeta(
val data: UShort,
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolMetaSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMetaSerializer.kt
similarity index 76%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolMetaSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMetaSerializer.kt
index 54628ff1c..920f9f5cb 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolMetaSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMetaSerializer.kt
@@ -17,13 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.connection
+package info.quasseldroid.protocol.connection
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.serializers.primitive.Serializer
-import de.kuschku.libquassel.protocol.serializers.primitive.UByteSerializer
-import de.kuschku.libquassel.protocol.serializers.primitive.UShortSerializer
+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 java.nio.ByteBuffer
object ProtocolMetaSerializer : Serializer<ProtocolMeta> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolVersion.kt b/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolVersion.kt
similarity index 95%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolVersion.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolVersion.kt
index b4fc9e379..3052c14a9 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/connection/ProtocolVersion.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolVersion.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.connection
+package info.quasseldroid.protocol.connection
enum class ProtocolVersion(
val value: UByte,
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/features/FeatureSet.kt b/protocol/src/main/java/info/quasseldroid/protocol/features/FeatureSet.kt
similarity index 96%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/features/FeatureSet.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/features/FeatureSet.kt
index c8502a6f7..24cce95f8 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/features/FeatureSet.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/features/FeatureSet.kt
@@ -17,9 +17,9 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.features
+package info.quasseldroid.protocol.features
-import de.kuschku.bitflags.of
+import de.justjanne.bitflags.of
class FeatureSet internal constructor(
private val features: Set<QuasselFeature>,
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/features/LegacyFeature.kt b/protocol/src/main/java/info/quasseldroid/protocol/features/LegacyFeature.kt
similarity index 95%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/features/LegacyFeature.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/features/LegacyFeature.kt
index fece09639..25733d33e 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/features/LegacyFeature.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/features/LegacyFeature.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.features
+package info.quasseldroid.protocol.features
-import de.kuschku.bitflags.Flag
-import de.kuschku.bitflags.Flags
-import de.kuschku.bitflags.toEnumSet
+import de.justjanne.bitflags.Flag
+import de.justjanne.bitflags.Flags
+import de.justjanne.bitflags.toEnumSet
/**
* A list of features that are optional in core and/or client, but need runtime checking
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/features/QuasselFeature.kt b/protocol/src/main/java/info/quasseldroid/protocol/features/QuasselFeature.kt
similarity index 98%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/features/QuasselFeature.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/features/QuasselFeature.kt
index 09ee52b71..09dd7f4ae 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/features/QuasselFeature.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/features/QuasselFeature.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.features
+package info.quasseldroid.protocol.features
import de.kuschku.codecoverage.Generated
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/io/ByteBufferUtil.kt b/protocol/src/main/java/info/quasseldroid/protocol/io/ByteBufferUtil.kt
similarity index 97%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/io/ByteBufferUtil.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/io/ByteBufferUtil.kt
index 15bf1c782..72ed1e26b 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/io/ByteBufferUtil.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/io/ByteBufferUtil.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.io
+package info.quasseldroid.protocol.io
import java.nio.ByteBuffer
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/io/ChainedByteBuffer.kt b/protocol/src/main/java/info/quasseldroid/protocol/io/ChainedByteBuffer.kt
similarity index 98%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/io/ChainedByteBuffer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/io/ChainedByteBuffer.kt
index 20c977ead..a67f0e69f 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/io/ChainedByteBuffer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/io/ChainedByteBuffer.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.io
+package info.quasseldroid.protocol.io
import java.nio.ByteBuffer
import java.util.*
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/io/StringEncoder.kt b/protocol/src/main/java/info/quasseldroid/protocol/io/StringEncoder.kt
similarity index 98%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/io/StringEncoder.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/io/StringEncoder.kt
index 782c8946d..f1c9e9ffc 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/io/StringEncoder.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/io/StringEncoder.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.io
+package info.quasseldroid.protocol.io
import java.nio.ByteBuffer
import java.nio.CharBuffer
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientInit.kt b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInit.kt
similarity index 82%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientInit.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInit.kt
index 433f354b0..51ff8fce0 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientInit.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInit.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.messages.handshake
+package info.quasseldroid.protocol.messages.handshake
-import de.kuschku.libquassel.protocol.features.LegacyFeatures
-import de.kuschku.libquassel.protocol.features.QuasselFeatureName
+import info.quasseldroid.protocol.features.LegacyFeatures
+import info.quasseldroid.protocol.features.QuasselFeatureName
data class ClientInit(
val clientVersion: String?,
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientInitAck.kt b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitAck.kt
similarity index 79%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientInitAck.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitAck.kt
index ec75b1dba..104d43da7 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientInitAck.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitAck.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.messages.handshake
+package info.quasseldroid.protocol.messages.handshake
-import de.kuschku.libquassel.protocol.features.LegacyFeatures
-import de.kuschku.libquassel.protocol.features.QuasselFeatureName
-import de.kuschku.libquassel.protocol.variant.QVariantList
+import info.quasseldroid.protocol.features.LegacyFeatures
+import info.quasseldroid.protocol.features.QuasselFeatureName
+import info.quasseldroid.protocol.variant.QVariantList
data class ClientInitAck(
val coreFeatures: LegacyFeatures,
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientInitReject.kt b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitReject.kt
similarity index 93%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientInitReject.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitReject.kt
index d7710d492..3414d988c 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientInitReject.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitReject.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.messages.handshake
+package info.quasseldroid.protocol.messages.handshake
data class ClientInitReject(
val errorString: String?
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientLogin.kt b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLogin.kt
similarity index 93%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientLogin.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLogin.kt
index 19dd2c254..8a4232ab4 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientLogin.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLogin.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.messages.handshake
+package info.quasseldroid.protocol.messages.handshake
data class ClientLogin(
val user: String?,
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientLoginAck.kt b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginAck.kt
similarity index 93%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientLoginAck.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginAck.kt
index 077607e79..7ed854606 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientLoginAck.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginAck.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.messages.handshake
+package info.quasseldroid.protocol.messages.handshake
object ClientLoginAck {
override fun toString(): String {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientLoginReject.kt b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginReject.kt
similarity index 93%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientLoginReject.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginReject.kt
index 13eee3e75..baecc0b19 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/ClientLoginReject.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginReject.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.messages.handshake
+package info.quasseldroid.protocol.messages.handshake
data class ClientLoginReject(
val errorString: String?
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/CoreSetupAck.kt b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupAck.kt
similarity index 93%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/CoreSetupAck.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupAck.kt
index 5bcf74827..ed4360b35 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/CoreSetupAck.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupAck.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.messages.handshake
+package info.quasseldroid.protocol.messages.handshake
object CoreSetupAck {
override fun toString(): String {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/CoreSetupData.kt b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupData.kt
similarity index 88%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/CoreSetupData.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupData.kt
index b67d6cd71..abf8d27b9 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/CoreSetupData.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupData.kt
@@ -17,9 +17,9 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.messages.handshake
+package info.quasseldroid.protocol.messages.handshake
-import de.kuschku.libquassel.protocol.variant.QVariantMap
+import info.quasseldroid.protocol.variant.QVariantMap
data class CoreSetupData(
val adminUser: String?,
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/CoreSetupReject.kt b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupReject.kt
similarity index 93%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/CoreSetupReject.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupReject.kt
index 4fc468d8f..69278c4ed 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/CoreSetupReject.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupReject.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.messages.handshake
+package info.quasseldroid.protocol.messages.handshake
data class CoreSetupReject(
val errorString: String?
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/SessionInit.kt b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/SessionInit.kt
similarity index 87%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/SessionInit.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/SessionInit.kt
index 0716fa532..47b9aad27 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/messages/handshake/SessionInit.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/SessionInit.kt
@@ -17,9 +17,9 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.messages.handshake
+package info.quasseldroid.protocol.messages.handshake
-import de.kuschku.libquassel.protocol.variant.QVariantList
+import info.quasseldroid.protocol.variant.QVariantList
data class SessionInit(
val identities: QVariantList?,
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/HandshakeSerializers.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/HandshakeSerializers.kt
similarity index 76%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/HandshakeSerializers.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/HandshakeSerializers.kt
index c2a9dba55..4cd8fcbff 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/HandshakeSerializers.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/HandshakeSerializers.kt
@@ -17,13 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers
+package info.quasseldroid.protocol.serializers
-import de.kuschku.libquassel.protocol.serializers.handshake.ClientInitAckSerializer
-import de.kuschku.libquassel.protocol.serializers.handshake.ClientInitRejectSerializer
-import de.kuschku.libquassel.protocol.serializers.handshake.ClientInitSerializer
-import de.kuschku.libquassel.protocol.serializers.handshake.HandshakeSerializer
-import de.kuschku.libquassel.protocol.serializers.primitive.*
+import info.quasseldroid.protocol.serializers.handshake.ClientInitAckSerializer
+import info.quasseldroid.protocol.serializers.handshake.ClientInitRejectSerializer
+import info.quasseldroid.protocol.serializers.handshake.ClientInitSerializer
+import info.quasseldroid.protocol.serializers.handshake.HandshakeSerializer
+import info.quasseldroid.protocol.serializers.primitive.*
import java.util.*
object HandshakeSerializers {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/NoSerializerForTypeException.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/NoSerializerForTypeException.kt
similarity index 92%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/NoSerializerForTypeException.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/NoSerializerForTypeException.kt
index b8519291c..a776552ed 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/NoSerializerForTypeException.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/NoSerializerForTypeException.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers
+package info.quasseldroid.protocol.serializers
-import de.kuschku.libquassel.protocol.variant.QtType
-import de.kuschku.libquassel.protocol.variant.QuasselType
+import info.quasseldroid.protocol.variant.QtType
+import info.quasseldroid.protocol.variant.QuasselType
sealed class NoSerializerForTypeException : Exception() {
data class Qt(
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/QtSerializers.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/QtSerializers.kt
similarity index 91%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/QtSerializers.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/QtSerializers.kt
index d03d777dc..22449c4a8 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/QtSerializers.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/QtSerializers.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers
+package info.quasseldroid.protocol.serializers
-import de.kuschku.libquassel.protocol.serializers.primitive.*
-import de.kuschku.libquassel.protocol.variant.QtType
+import info.quasseldroid.protocol.serializers.primitive.*
+import info.quasseldroid.protocol.variant.QtType
import java.util.*
object QtSerializers {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/QuasselSerializers.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/QuasselSerializers.kt
similarity index 91%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/QuasselSerializers.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/QuasselSerializers.kt
index ed9ed2883..d923d7d64 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/QuasselSerializers.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/QuasselSerializers.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers
+package info.quasseldroid.protocol.serializers
-import de.kuschku.libquassel.protocol.serializers.primitive.*
-import de.kuschku.libquassel.protocol.variant.QuasselType
+import info.quasseldroid.protocol.serializers.primitive.*
+import info.quasseldroid.protocol.variant.QuasselType
import java.util.*
object QuasselSerializers {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitAckSerializer.kt
similarity index 82%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitAckSerializer.kt
index 76236f54e..c44f4cc3a 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitAckSerializer.kt
@@ -17,14 +17,14 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.handshake
+package info.quasseldroid.protocol.serializers.handshake
-import de.kuschku.bitflags.of
-import de.kuschku.bitflags.toBits
-import de.kuschku.libquassel.protocol.features.LegacyFeature
-import de.kuschku.libquassel.protocol.features.QuasselFeatureName
-import de.kuschku.libquassel.protocol.messages.handshake.ClientInitAck
-import de.kuschku.libquassel.protocol.variant.*
+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.*
object ClientInitAckSerializer : HandshakeSerializer<ClientInitAck> {
override val type: String = "ClientInitAck"
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/handshake/ClientInitRejectSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitRejectSerializer.kt
similarity index 76%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/handshake/ClientInitRejectSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitRejectSerializer.kt
index d06461174..249bf5854 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/handshake/ClientInitRejectSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitRejectSerializer.kt
@@ -17,13 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.handshake
+package info.quasseldroid.protocol.serializers.handshake
-import de.kuschku.libquassel.protocol.messages.handshake.ClientInitReject
-import de.kuschku.libquassel.protocol.variant.QVariantMap
-import de.kuschku.libquassel.protocol.variant.QtType
-import de.kuschku.libquassel.protocol.variant.into
-import de.kuschku.libquassel.protocol.variant.qVariant
+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
object ClientInitRejectSerializer : HandshakeSerializer<ClientInitReject> {
override val type: String = "ClientInitReject"
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/handshake/ClientInitSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializer.kt
similarity index 75%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/handshake/ClientInitSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializer.kt
index 831feaf55..ee1321262 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/handshake/ClientInitSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializer.kt
@@ -17,17 +17,17 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.handshake
+package info.quasseldroid.protocol.serializers.handshake
-import de.kuschku.bitflags.of
-import de.kuschku.bitflags.toBits
-import de.kuschku.libquassel.protocol.features.LegacyFeature
-import de.kuschku.libquassel.protocol.features.QuasselFeatureName
-import de.kuschku.libquassel.protocol.messages.handshake.ClientInit
-import de.kuschku.libquassel.protocol.variant.QVariantMap
-import de.kuschku.libquassel.protocol.variant.QtType
-import de.kuschku.libquassel.protocol.variant.into
-import de.kuschku.libquassel.protocol.variant.qVariant
+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
object ClientInitSerializer : HandshakeSerializer<ClientInit> {
override val type: String = "ClientInit"
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/handshake/HandshakeSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/HandshakeSerializer.kt
similarity index 88%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/handshake/HandshakeSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/HandshakeSerializer.kt
index 45e863f0e..c9f560937 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/handshake/HandshakeSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/HandshakeSerializer.kt
@@ -17,9 +17,9 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.handshake
+package info.quasseldroid.protocol.serializers.handshake
-import de.kuschku.libquassel.protocol.variant.QVariantMap
+import info.quasseldroid.protocol.variant.QVariantMap
interface HandshakeSerializer<T> {
val type: String
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/BoolSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BoolSerializer.kt
similarity index 84%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/BoolSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BoolSerializer.kt
index 1e51bd537..ae36f4b6a 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/BoolSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BoolSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QtType
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.protocol.variant.QtType
import java.nio.ByteBuffer
object BoolSerializer : QtSerializer<Boolean> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/BufferIdSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializer.kt
similarity index 81%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/BufferIdSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializer.kt
index 23791d212..6f527b7d5 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/BufferIdSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.types.BufferId
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 java.nio.ByteBuffer
object BufferIdSerializer : QuasselSerializer<BufferId> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/BufferInfoSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializer.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/BufferInfoSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializer.kt
index 062096780..b400cd6dc 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/BufferInfoSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializer.kt
@@ -17,15 +17,15 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.bitflags.of
-import de.kuschku.bitflags.toBits
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.types.BufferInfo
-import de.kuschku.libquassel.protocol.types.BufferType
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 java.nio.ByteBuffer
object BufferInfoSerializer : QuasselSerializer<BufferInfo> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/ByteBufferSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializer.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/ByteBufferSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializer.kt
index f32731be3..07fc69340 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/ByteBufferSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.io.copyData
-import de.kuschku.libquassel.protocol.variant.QtType
+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 java.nio.ByteBuffer
object ByteBufferSerializer : QtSerializer<ByteBuffer?> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/ByteSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteSerializer.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/ByteSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteSerializer.kt
index 2d3d7083c..b3dd069a9 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/ByteSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QtType
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.protocol.variant.QtType
import java.nio.ByteBuffer
object ByteSerializer : QtSerializer<Byte> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/DateSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateSerializer.kt
similarity index 86%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/DateSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateSerializer.kt
index 6c11ed3e0..0a02256bd 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/DateSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QtType
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.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/de/kuschku/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializer.kt
similarity index 90%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializer.kt
index a727ed77e..a532f9672 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.types.TimeSpec
-import de.kuschku.libquassel.protocol.variant.QtType
+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 org.threeten.bp.*
import org.threeten.bp.temporal.Temporal
import java.nio.ByteBuffer
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt
similarity index 79%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt
index 3f79c42b5..fcc9ad1ff 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt
@@ -17,13 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.types.DccIpDetectionMode
-import de.kuschku.libquassel.protocol.types.DccPortSelectionMode
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 java.nio.ByteBuffer
object DccIpDetectionModeSerializer : QuasselSerializer<DccIpDetectionMode?> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt
similarity index 82%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt
index 6d1d10796..27b78d5f5 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.types.DccPortSelectionMode
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 java.nio.ByteBuffer
object DccPortSelectionModeSerializer : QuasselSerializer<DccPortSelectionMode?> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/DoubleSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DoubleSerializer.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/DoubleSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DoubleSerializer.kt
index 1e81a519d..f708071b5 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/DoubleSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DoubleSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QtType
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.protocol.variant.QtType
import java.nio.ByteBuffer
object DoubleSerializer : QtSerializer<Double> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/FloatSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/FloatSerializer.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/FloatSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/FloatSerializer.kt
index 636262b56..c759d6077 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/FloatSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/FloatSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QtType
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.protocol.variant.QtType
import java.nio.ByteBuffer
object FloatSerializer : QtSerializer<Float> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/HandshakeMapSerializer.kt
similarity index 88%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/HandshakeMapSerializer.kt
index 5f7b4c2b1..b281e570d 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/HandshakeMapSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.*
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.protocol.variant.*
import java.nio.ByteBuffer
object HandshakeMapSerializer : QtSerializer<QVariantMap> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/IdentityIdSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializer.kt
similarity index 81%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/IdentityIdSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializer.kt
index 256f80a1e..872520600 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/IdentityIdSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.types.IdentityId
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 java.nio.ByteBuffer
object IdentityIdSerializer : QuasselSerializer<IdentityId> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/IntSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IntSerializer.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/IntSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IntSerializer.kt
index 54db40355..4276b63ef 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/IntSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IntSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QtType
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.protocol.variant.QtType
import java.nio.ByteBuffer
object IntSerializer : QtSerializer<Int> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/LongSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/LongSerializer.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/LongSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/LongSerializer.kt
index d592f55ef..4d47fcc47 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/LongSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/LongSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QtType
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.protocol.variant.QtType
import java.nio.ByteBuffer
object LongSerializer : QtSerializer<Long> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/MessageSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MessageSerializer.kt
similarity index 86%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/MessageSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MessageSerializer.kt
index 4eaf85cad..cd426cf26 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/MessageSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MessageSerializer.kt
@@ -17,17 +17,17 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.bitflags.of
-import de.kuschku.bitflags.toBits
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.features.QuasselFeature
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.types.Message
-import de.kuschku.libquassel.protocol.types.MessageFlag
-import de.kuschku.libquassel.protocol.types.MessageType
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 org.threeten.bp.Instant
import java.nio.ByteBuffer
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/MsgIdSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializer.kt
similarity index 81%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/MsgIdSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializer.kt
index aab03d828..b3885e1bd 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/MsgIdSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializer.kt
@@ -17,13 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.features.QuasselFeature
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.types.MsgId
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 java.nio.ByteBuffer
object MsgIdSerializer : QuasselSerializer<MsgId> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/NetworkIdSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializer.kt
similarity index 81%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/NetworkIdSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializer.kt
index 6827e02a8..2afa5409b 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/NetworkIdSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.types.NetworkId
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 java.nio.ByteBuffer
object NetworkIdSerializer : QuasselSerializer<NetworkId> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/PeerPtrSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializer.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/PeerPtrSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializer.kt
index 461e00935..713f91b94 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/PeerPtrSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QuasselType
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.protocol.variant.QuasselType
import java.nio.ByteBuffer
object PeerPtrSerializer : QuasselSerializer<ULong> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QCharSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QCharSerializer.kt
similarity index 82%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QCharSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QCharSerializer.kt
index 77045149b..3355e7eaf 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QCharSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QCharSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.io.StringEncoder
-import de.kuschku.libquassel.protocol.variant.QtType
+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 java.nio.ByteBuffer
import kotlin.concurrent.getOrSet
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QHostAddressSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializer.kt
similarity index 89%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QHostAddressSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializer.kt
index be4194644..9c377f94a 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QHostAddressSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.types.NetworkLayerProtocol
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 java.net.Inet4Address
import java.net.Inet6Address
import java.net.InetAddress
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QStringListSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QStringListSerializer.kt
similarity index 84%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QStringListSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QStringListSerializer.kt
index 4a3db40a1..518c6c589 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QStringListSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QStringListSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QStringList
-import de.kuschku.libquassel.protocol.variant.QtType
+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 java.nio.ByteBuffer
object QStringListSerializer : QtSerializer<QStringList> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QVariantListSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializer.kt
similarity index 81%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QVariantListSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializer.kt
index 986fb5660..208615e86 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QVariantListSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializer.kt
@@ -17,13 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QVariantList
-import de.kuschku.libquassel.protocol.variant.QVariant_
-import de.kuschku.libquassel.protocol.variant.QtType
+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 java.nio.ByteBuffer
object QVariantListSerializer : QtSerializer<QVariantList> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QVariantMapSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializer.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QVariantMapSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializer.kt
index 7de240159..f64b6f612 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QVariantMapSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializer.kt
@@ -17,13 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QVariantMap
-import de.kuschku.libquassel.protocol.variant.QVariant_
-import de.kuschku.libquassel.protocol.variant.QtType
+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 java.nio.ByteBuffer
object QVariantMapSerializer : QtSerializer<QVariantMap> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QVariantSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantSerializer.kt
similarity index 81%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QVariantSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantSerializer.kt
index 18b9113a1..2d28fdbef 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QVariantSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantSerializer.kt
@@ -17,17 +17,17 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.serializers.NoSerializerForTypeException
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.serializers.QuasselSerializers
-import de.kuschku.libquassel.protocol.variant.QVariant
-import de.kuschku.libquassel.protocol.variant.QVariant_
-import de.kuschku.libquassel.protocol.variant.QtType
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 java.nio.ByteBuffer
object QVariantSerializer : QtSerializer<QVariant_> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QtSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QtSerializer.kt
similarity index 87%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QtSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QtSerializer.kt
index 3e26d5b56..e981e8108 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QtSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QtSerializer.kt
@@ -17,9 +17,9 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.variant.QtType
+import info.quasseldroid.protocol.variant.QtType
interface QtSerializer<T> : Serializer<T> {
val qtType: QtType
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QuasselSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QuasselSerializer.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QuasselSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QuasselSerializer.kt
index a2530f4a9..cb83b4aa3 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/QuasselSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QuasselSerializer.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.variant.QtType
-import de.kuschku.libquassel.protocol.variant.QuasselType
+import info.quasseldroid.protocol.variant.QtType
+import info.quasseldroid.protocol.variant.QuasselType
interface QuasselSerializer<T> : QtSerializer<T> {
override val qtType: QtType get() = quasselType.qtType
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/Serializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/Serializer.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/Serializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/Serializer.kt
index 40dd0fc98..49eb6c66a 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/Serializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/Serializer.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
import java.nio.ByteBuffer
interface Serializer<T> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/ShortSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ShortSerializer.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/ShortSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ShortSerializer.kt
index d3ea4dd89..094c649f5 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/ShortSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ShortSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QtType
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.protocol.variant.QtType
import java.nio.ByteBuffer
object ShortSerializer : QtSerializer<Short> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/StringSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializer.kt
similarity index 90%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/StringSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializer.kt
index e2040f2e1..649178a50 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/StringSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializer.kt
@@ -17,12 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.io.StringEncoder
-import de.kuschku.libquassel.protocol.variant.QtType
+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 java.nio.ByteBuffer
import java.nio.charset.Charset
import kotlin.concurrent.getOrSet
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/StringSerializerAscii.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerAscii.kt
similarity index 92%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/StringSerializerAscii.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerAscii.kt
index 8811510ea..9eec4bb68 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/StringSerializerAscii.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerAscii.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
object StringSerializerAscii : StringSerializer(Charsets.ISO_8859_1, true)
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/StringSerializerUtf16.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf16.kt
similarity index 92%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/StringSerializerUtf16.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf16.kt
index 3cbefd468..2d40edba1 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/StringSerializerUtf16.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf16.kt
@@ -17,6 +17,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
object StringSerializerUtf16 : StringSerializer(Charsets.UTF_16BE, false)
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/StringSerializerUtf8.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf8.kt
similarity index 92%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/StringSerializerUtf8.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf8.kt
index 4d05c3d01..9c9d4ce21 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/StringSerializerUtf8.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf8.kt
@@ -17,6 +17,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
object StringSerializerUtf8 : StringSerializer(Charsets.UTF_8, false)
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/TimeSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/TimeSerializer.kt
similarity index 86%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/TimeSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/TimeSerializer.kt
index c608474f8..323d83a11 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/TimeSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/TimeSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QtType
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.protocol.variant.QtType
import org.threeten.bp.LocalTime
import java.nio.ByteBuffer
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/UByteSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UByteSerializer.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/UByteSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UByteSerializer.kt
index e30301479..d9da69a55 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/UByteSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UByteSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QtType
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.protocol.variant.QtType
import java.nio.ByteBuffer
object UByteSerializer : QtSerializer<UByte> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/UIntSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UIntSerializer.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/UIntSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UIntSerializer.kt
index 39221efb9..8f19b4595 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/UIntSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UIntSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QtType
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.protocol.variant.QtType
import java.nio.ByteBuffer
object UIntSerializer : QtSerializer<UInt> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/ULongSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ULongSerializer.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/ULongSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ULongSerializer.kt
index 92e3c68bf..7173df173 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/ULongSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ULongSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QtType
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.protocol.variant.QtType
import java.nio.ByteBuffer
object ULongSerializer : QtSerializer<ULong> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/UShortSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UShortSerializer.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/UShortSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UShortSerializer.kt
index ae6e66f57..21cf31879 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/UShortSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UShortSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QtType
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.protocol.variant.QtType
import java.nio.ByteBuffer
object UShortSerializer : QtSerializer<UShort> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/VoidSerializer.kt b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/VoidSerializer.kt
similarity index 82%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/VoidSerializer.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/VoidSerializer.kt
index c3b9b6002..f97a587b4 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/serializers/primitive/VoidSerializer.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/VoidSerializer.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.variant.QtType
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.protocol.variant.QtType
import java.nio.ByteBuffer
object VoidSerializer : QtSerializer<Unit> {
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/BufferActivity.kt b/protocol/src/main/java/info/quasseldroid/protocol/types/BufferActivity.kt
similarity index 88%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/types/BufferActivity.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/types/BufferActivity.kt
index 5aa12c8ae..e5ba3f4e1 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/BufferActivity.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/types/BufferActivity.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.types
+package info.quasseldroid.protocol.types
-import de.kuschku.bitflags.Flag
-import de.kuschku.bitflags.Flags
-import de.kuschku.bitflags.toEnumSet
+import de.justjanne.bitflags.Flag
+import de.justjanne.bitflags.Flags
+import de.justjanne.bitflags.toEnumSet
enum class BufferActivity(
override val value: UInt,
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/BufferId.kt b/protocol/src/main/java/info/quasseldroid/protocol/types/BufferId.kt
similarity index 95%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/types/BufferId.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/types/BufferId.kt
index 5664ee365..38c04f463 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/BufferId.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/types/BufferId.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.types
+package info.quasseldroid.protocol.types
private typealias BufferIdType = SignedIdType
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/BufferInfo.kt b/protocol/src/main/java/info/quasseldroid/protocol/types/BufferInfo.kt
similarity index 92%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/types/BufferInfo.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/types/BufferInfo.kt
index a3c516466..d94211e47 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/BufferInfo.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/types/BufferInfo.kt
@@ -17,9 +17,9 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.types
+package info.quasseldroid.protocol.types
-import de.kuschku.bitflags.none
+import de.justjanne.bitflags.none
data class BufferInfo(
val bufferId: BufferId = BufferId(-1),
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/BufferType.kt b/protocol/src/main/java/info/quasseldroid/protocol/types/BufferType.kt
similarity index 88%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/types/BufferType.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/types/BufferType.kt
index cc71f3465..0207df841 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/BufferType.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/types/BufferType.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.types
+package info.quasseldroid.protocol.types
-import de.kuschku.bitflags.Flag
-import de.kuschku.bitflags.Flags
-import de.kuschku.bitflags.toEnumSet
+import de.justjanne.bitflags.Flag
+import de.justjanne.bitflags.Flags
+import de.justjanne.bitflags.toEnumSet
enum class BufferType(
override val value: UShort,
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/DccIpDetectionMode.kt b/protocol/src/main/java/info/quasseldroid/protocol/types/DccIpDetectionMode.kt
similarity index 96%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/types/DccIpDetectionMode.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/types/DccIpDetectionMode.kt
index dc6dc77b4..7f8d17043 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/DccIpDetectionMode.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/types/DccIpDetectionMode.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.types
+package info.quasseldroid.protocol.types
/**
* Mode for detecting the outgoing IP
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/DccPortSelectionMode.kt b/protocol/src/main/java/info/quasseldroid/protocol/types/DccPortSelectionMode.kt
similarity index 96%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/types/DccPortSelectionMode.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/types/DccPortSelectionMode.kt
index 705bed66e..42ee157be 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/DccPortSelectionMode.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/types/DccPortSelectionMode.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.types
+package info.quasseldroid.protocol.types
/**
* Mode for selecting the port range for DCC
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/IdentityId.kt b/protocol/src/main/java/info/quasseldroid/protocol/types/IdentityId.kt
similarity index 95%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/types/IdentityId.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/types/IdentityId.kt
index bd2c4ba04..d24d0367e 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/IdentityId.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/types/IdentityId.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.types
+package info.quasseldroid.protocol.types
private typealias IdentityIdType = SignedIdType
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/Message.kt b/protocol/src/main/java/info/quasseldroid/protocol/types/Message.kt
similarity index 96%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/types/Message.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/types/Message.kt
index f9e85d450..16739cd81 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/Message.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/types/Message.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.types
+package info.quasseldroid.protocol.types
import org.threeten.bp.Instant
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/MessageFlag.kt b/protocol/src/main/java/info/quasseldroid/protocol/types/MessageFlag.kt
similarity index 88%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/types/MessageFlag.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/types/MessageFlag.kt
index 86008c5a4..5f43db435 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/MessageFlag.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/types/MessageFlag.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.types
+package info.quasseldroid.protocol.types
-import de.kuschku.bitflags.Flag
-import de.kuschku.bitflags.Flags
-import de.kuschku.bitflags.toEnumSet
+import de.justjanne.bitflags.Flag
+import de.justjanne.bitflags.Flags
+import de.justjanne.bitflags.toEnumSet
enum class MessageFlag(
override val value: UInt,
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/MessageType.kt b/protocol/src/main/java/info/quasseldroid/protocol/types/MessageType.kt
similarity index 90%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/types/MessageType.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/types/MessageType.kt
index 4badbe176..fe418098f 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/MessageType.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/types/MessageType.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.types
+package info.quasseldroid.protocol.types
-import de.kuschku.bitflags.Flag
-import de.kuschku.bitflags.Flags
-import de.kuschku.bitflags.toEnumSet
+import de.justjanne.bitflags.Flag
+import de.justjanne.bitflags.Flags
+import de.justjanne.bitflags.toEnumSet
enum class MessageType(
override val value: UInt,
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/MsgId.kt b/protocol/src/main/java/info/quasseldroid/protocol/types/MsgId.kt
similarity index 95%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/types/MsgId.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/types/MsgId.kt
index c06ee0e3e..b5b3a24ae 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/MsgId.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/types/MsgId.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.types
+package info.quasseldroid.protocol.types
private typealias MsgIdType = SignedId64Type
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/NetworkId.kt b/protocol/src/main/java/info/quasseldroid/protocol/types/NetworkId.kt
similarity index 95%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/types/NetworkId.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/types/NetworkId.kt
index 81ee3c8a5..5d60b4fb9 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/NetworkId.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/types/NetworkId.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.types
+package info.quasseldroid.protocol.types
private typealias NetworkIdType = SignedIdType
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/NetworkLayerProtocol.kt b/protocol/src/main/java/info/quasseldroid/protocol/types/NetworkLayerProtocol.kt
similarity index 95%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/types/NetworkLayerProtocol.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/types/NetworkLayerProtocol.kt
index ccae5f617..d0b26730c 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/NetworkLayerProtocol.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/types/NetworkLayerProtocol.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.types
+package info.quasseldroid.protocol.types
enum class NetworkLayerProtocol(
val value: UByte,
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/SignedId.kt b/protocol/src/main/java/info/quasseldroid/protocol/types/SignedId.kt
similarity index 96%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/types/SignedId.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/types/SignedId.kt
index 364ec2206..e30ce878d 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/SignedId.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/types/SignedId.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.types
+package info.quasseldroid.protocol.types
import de.kuschku.codecoverage.Generated
import java.io.Serializable
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/TimeSpec.kt b/protocol/src/main/java/info/quasseldroid/protocol/types/TimeSpec.kt
similarity index 95%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/types/TimeSpec.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/types/TimeSpec.kt
index 52e07dffc..42d25c0f8 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/types/TimeSpec.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/types/TimeSpec.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.types
+package info.quasseldroid.protocol.types
enum class TimeSpec(val value: Byte) {
LocalUnknown(-1),
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/variant/QVariant.kt b/protocol/src/main/java/info/quasseldroid/protocol/variant/QVariant.kt
similarity index 83%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/variant/QVariant.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/variant/QVariant.kt
index ae6ac6ab1..50678718a 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/variant/QVariant.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/variant/QVariant.kt
@@ -17,15 +17,15 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.variant
-
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.io.contentToString
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.serializers.QuasselSerializers
-import de.kuschku.libquassel.protocol.serializers.primitive.QtSerializer
-import de.kuschku.libquassel.protocol.serializers.primitive.QuasselSerializer
+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
import java.nio.ByteBuffer
typealias QVariant_ = QVariant<*>
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/variant/QtType.kt b/protocol/src/main/java/info/quasseldroid/protocol/variant/QtType.kt
similarity index 97%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/variant/QtType.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/variant/QtType.kt
index e8c4626d7..70f9eedba 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/variant/QtType.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/variant/QtType.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http:
*/
-package de.kuschku.libquassel.protocol.variant
+package info.quasseldroid.protocol.variant
enum class QtType(val id: kotlin.Int) {
Void(0),
diff --git a/protocol/src/main/java/de/kuschku/libquassel/protocol/variant/QuasselType.kt b/protocol/src/main/java/info/quasseldroid/protocol/variant/QuasselType.kt
similarity index 96%
rename from protocol/src/main/java/de/kuschku/libquassel/protocol/variant/QuasselType.kt
rename to protocol/src/main/java/info/quasseldroid/protocol/variant/QuasselType.kt
index 64f13fa4e..d7ba1e364 100644
--- a/protocol/src/main/java/de/kuschku/libquassel/protocol/variant/QuasselType.kt
+++ b/protocol/src/main/java/info/quasseldroid/protocol/variant/QuasselType.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.variant
+package info.quasseldroid.protocol.variant
enum class QuasselType(
val typeName: String,
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/connection/ConnectionHeaderSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/connection/ConnectionHeaderSerializerTest.kt
similarity index 92%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/connection/ConnectionHeaderSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/connection/ConnectionHeaderSerializerTest.kt
index 0aaf86216..2249f9ef9 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/connection/ConnectionHeaderSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/connection/ConnectionHeaderSerializerTest.kt
@@ -17,11 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.connection
+package info.quasseldroid.protocol.connection
-import de.kuschku.bitflags.of
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.serializerTest
+import de.justjanne.bitflags.of
+import info.quasseldroid.protocol.testutil.byteBufferOf
+import info.quasseldroid.protocol.testutil.serializerTest
import org.junit.jupiter.api.Test
class ConnectionHeaderSerializerTest {
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/features/FeatureSetTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/features/FeatureSetTest.kt
similarity index 94%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/features/FeatureSetTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/features/FeatureSetTest.kt
index 90088d3bf..df0c80342 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/features/FeatureSetTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/features/FeatureSetTest.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.features
+package info.quasseldroid.protocol.features
-import de.kuschku.bitflags.none
-import de.kuschku.bitflags.of
+import de.justjanne.bitflags.none
+import de.justjanne.bitflags.of
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/io/ChainedByteBufferTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/io/ChainedByteBufferTest.kt
similarity index 96%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/io/ChainedByteBufferTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/io/ChainedByteBufferTest.kt
index b76e10163..5e96454de 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/io/ChainedByteBufferTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/io/ChainedByteBufferTest.kt
@@ -17,15 +17,14 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.io
+package info.quasseldroid.protocol.io
-import de.kuschku.libquassel.protocol.testutil.matchers.ByteBufferMatcher
+import info.quasseldroid.protocol.testutil.matchers.ByteBufferMatcher
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertDoesNotThrow
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertThrows
-import java.lang.AssertionError
import java.nio.ByteBuffer
class ChainedByteBufferTest {
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/io/StringEncoderTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/io/StringEncoderTest.kt
similarity index 92%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/io/StringEncoderTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/io/StringEncoderTest.kt
index cb1db12ab..2e03e0d7e 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/io/StringEncoderTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/io/StringEncoderTest.kt
@@ -17,10 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.io
+package info.quasseldroid.protocol.io
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.matchers.ByteBufferMatcher
+import info.quasseldroid.protocol.testutil.byteBufferOf
+import info.quasseldroid.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/de/kuschku/libquassel/protocol/serializers/handshake/ClientInitSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializerTest.kt
similarity index 81%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/handshake/ClientInitSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializerTest.kt
index a48194552..20c2f967f 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/handshake/ClientInitSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializerTest.kt
@@ -16,19 +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 de.kuschku.libquassel.protocol.serializers.handshake
+package info.quasseldroid.protocol.serializers.handshake
-import de.kuschku.bitflags.none
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.features.LegacyFeature
-import de.kuschku.libquassel.protocol.messages.handshake.ClientInit
-import de.kuschku.libquassel.protocol.serializers.HandshakeSerializers
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.serializers.primitive.BoolSerializer
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.handshakeSerializerTest
-import de.kuschku.libquassel.protocol.variant.QtType
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Test
import org.junit.jupiter.api.Assertions.assertEquals as assertEquals
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/BoolSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BoolSerializerTest.kt
similarity index 77%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/BoolSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BoolSerializerTest.kt
index 4e38c0ba9..aae04c194 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/BoolSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BoolSerializerTest.kt
@@ -16,13 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QtType
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/BufferIdSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializerTest.kt
similarity index 78%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/BufferIdSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializerTest.kt
index 21f9d2cbd..a6f291e7f 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/BufferIdSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializerTest.kt
@@ -16,14 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QuasselSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.testutil.quasselSerializerTest
-import de.kuschku.libquassel.protocol.types.BufferId
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/BufferInfoSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializerTest.kt
similarity index 69%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/BufferInfoSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializerTest.kt
index 934aef98c..7a9c6a3d7 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/BufferInfoSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializerTest.kt
@@ -16,21 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.bitflags.none
-import de.kuschku.bitflags.validValues
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.serializers.QuasselSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.quasselSerializerTest
-import de.kuschku.libquassel.protocol.types.BufferId
-import de.kuschku.libquassel.protocol.types.BufferInfo
-import de.kuschku.libquassel.protocol.types.BufferType
-import de.kuschku.libquassel.protocol.types.NetworkId
-import de.kuschku.libquassel.protocol.variant.QtType
-import de.kuschku.libquassel.protocol.variant.QuasselType
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/ByteBufferSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializerTest.kt
similarity index 81%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/ByteBufferSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializerTest.kt
index b0671da59..67bd99c52 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/ByteBufferSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializerTest.kt
@@ -16,14 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.matchers.ByteBufferMatcher
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QtType
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/ByteSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteSerializerTest.kt
similarity index 79%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/ByteSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteSerializerTest.kt
index 0a8557f30..6ef6bc714 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/ByteSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteSerializerTest.kt
@@ -16,16 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QtType
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
-import java.nio.ByteBuffer
import kotlin.experimental.inv
class ByteSerializerTest {
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializerTest.kt
similarity index 88%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializerTest.kt
index a93efda96..3821eb635 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializerTest.kt
@@ -16,14 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.matchers.TemporalMatcher
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QtType
-import org.junit.jupiter.api.Assertions
+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 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/de/kuschku/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
similarity index 75%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
index 901267d4f..8b069b08a 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
@@ -16,14 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QuasselSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.quasselSerializerTest
-import de.kuschku.libquassel.protocol.types.DccIpDetectionMode
-import de.kuschku.libquassel.protocol.types.DccPortSelectionMode
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt
similarity index 75%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt
index aeeca6e97..f6ffb7dd5 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt
@@ -16,14 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QuasselSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.quasselSerializerTest
-import de.kuschku.libquassel.protocol.types.DccIpDetectionMode
-import de.kuschku.libquassel.protocol.types.DccPortSelectionMode
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/DoubleSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DoubleSerializerTest.kt
similarity index 84%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/DoubleSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DoubleSerializerTest.kt
index 0242bcb35..c67d69c9d 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/DoubleSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DoubleSerializerTest.kt
@@ -16,16 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QtType
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
-import org.threeten.bp.temporal.Temporal
class DoubleSerializerTest {
@Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/FloatSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/FloatSerializerTest.kt
similarity index 84%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/FloatSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/FloatSerializerTest.kt
index b491e312c..b4978f533 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/FloatSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/FloatSerializerTest.kt
@@ -16,13 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QtType
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/IdentityIdSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializerTest.kt
similarity index 78%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/IdentityIdSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializerTest.kt
index 34e0fc5b5..225cb273e 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/IdentityIdSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializerTest.kt
@@ -16,14 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QuasselSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.testutil.quasselSerializerTest
-import de.kuschku.libquassel.protocol.types.IdentityId
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/IntSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IntSerializerTest.kt
similarity index 80%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/IntSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IntSerializerTest.kt
index 21bd1bb8d..53aa3c9a9 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/IntSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IntSerializerTest.kt
@@ -16,13 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QtType
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/LongSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/LongSerializerTest.kt
similarity index 81%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/LongSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/LongSerializerTest.kt
index 0c9fec88c..a1f20b413 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/LongSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/LongSerializerTest.kt
@@ -16,13 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QtType
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MessageSerializerTest.kt
similarity index 88%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MessageSerializerTest.kt
index e07503e16..75f0342a4 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MessageSerializerTest.kt
@@ -17,23 +17,19 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.bitflags.none
-import de.kuschku.bitflags.validValues
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.serializers.QuasselSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.quasselSerializerTest
-import de.kuschku.libquassel.protocol.types.*
-import de.kuschku.libquassel.protocol.variant.QtType
-import de.kuschku.libquassel.protocol.variant.QuasselType
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import org.threeten.bp.Instant
-import java.nio.ByteBuffer
class MessageSerializerTest {
@Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/MsgIdSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializerTest.kt
similarity index 80%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/MsgIdSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializerTest.kt
index ce2107d82..957f9c5ad 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/MsgIdSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.serializers.QuasselSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.quasselSerializerTest
-import de.kuschku.libquassel.protocol.types.MsgId
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/NetworkIdSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializerTest.kt
similarity index 78%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/NetworkIdSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializerTest.kt
index 996bc8975..58ba01e13 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/NetworkIdSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializerTest.kt
@@ -16,14 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QuasselSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.testutil.quasselSerializerTest
-import de.kuschku.libquassel.protocol.types.NetworkId
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/PeerPtrSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializerTest.kt
similarity index 80%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/PeerPtrSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializerTest.kt
index 0018e5a64..bd6f61e0a 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/PeerPtrSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializerTest.kt
@@ -16,14 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.serializers.QuasselSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.quasselSerializerTest
-import de.kuschku.libquassel.protocol.types.MsgId
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QCharSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QCharSerializerTest.kt
similarity index 83%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QCharSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QCharSerializerTest.kt
index b152f1f40..eaa1685e6 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QCharSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QCharSerializerTest.kt
@@ -16,14 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.matchers.BomMatcherChar
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QtType
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QHostAddressSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializerTest.kt
similarity index 84%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QHostAddressSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializerTest.kt
index 08de96efb..9e7ce4642 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QHostAddressSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QuasselSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.quasselSerializerTest
-import de.kuschku.libquassel.protocol.variant.QuasselType
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import java.net.Inet4Address
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QVariantListSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializerTest.kt
similarity index 75%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QVariantListSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializerTest.kt
index 4bbff8522..fddad7d84 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QVariantListSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializerTest.kt
@@ -16,17 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.matchers.MapMatcher
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QVariantList
-import de.kuschku.libquassel.protocol.variant.QVariantMap
-import de.kuschku.libquassel.protocol.variant.QtType
-import de.kuschku.libquassel.protocol.variant.qVariant
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QVariantMapSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QVariantMapSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializerTest.kt
index 04d60612c..8c5699260 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QVariantMapSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializerTest.kt
@@ -16,16 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.matchers.MapMatcher
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QVariantMap
-import de.kuschku.libquassel.protocol.variant.QtType
-import de.kuschku.libquassel.protocol.variant.qVariant
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QVariantSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantSerializerTest.kt
similarity index 83%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QVariantSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantSerializerTest.kt
index 483a8782e..52403ebc1 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QVariantSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.NoSerializerForTypeException
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.deserialize
-import de.kuschku.libquassel.protocol.variant.QVariant_
-import de.kuschku.libquassel.protocol.variant.QtType
+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 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/de/kuschku/libquassel/protocol/serializers/primitive/ShortSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ShortSerializerTest.kt
similarity index 81%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/ShortSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ShortSerializerTest.kt
index cd0832003..025d207c7 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/ShortSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ShortSerializerTest.kt
@@ -16,13 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QtType
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import kotlin.experimental.inv
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/StringSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/StringSerializerTest.kt
similarity index 95%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/StringSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/StringSerializerTest.kt
index 98484c464..282e8245b 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/StringSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.serializers.primitive
-
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.deserialize
-import de.kuschku.libquassel.protocol.testutil.matchers.BomMatcherString
-import de.kuschku.libquassel.protocol.testutil.matchers.ByteBufferMatcher
-import de.kuschku.libquassel.protocol.testutil.testQtSerializerDirect
-import de.kuschku.libquassel.protocol.testutil.testQtSerializerVariant
-import de.kuschku.libquassel.protocol.variant.QtType
+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
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/de/kuschku/libquassel/protocol/serializers/primitive/UByteSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UByteSerializerTest.kt
similarity index 80%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/UByteSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UByteSerializerTest.kt
index df63eeca9..0d1b29f4e 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/UByteSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UByteSerializerTest.kt
@@ -16,13 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QtType
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/UIntSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UIntSerializerTest.kt
similarity index 81%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/UIntSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UIntSerializerTest.kt
index 5cdd0b78e..a1ff80599 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/UIntSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UIntSerializerTest.kt
@@ -16,13 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QtType
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/ULongSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ULongSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/ULongSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ULongSerializerTest.kt
index 53db1a21d..3eead2bfd 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/ULongSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ULongSerializerTest.kt
@@ -16,13 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QtType
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/UShortSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UShortSerializerTest.kt
similarity index 81%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/UShortSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UShortSerializerTest.kt
index 9d7cfeb27..448483309 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/UShortSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UShortSerializerTest.kt
@@ -16,13 +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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QtType
-import org.junit.jupiter.api.Assertions
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/VoidSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/VoidSerializerTest.kt
similarity index 77%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/VoidSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/VoidSerializerTest.kt
index 76db87989..b5763b2fe 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/VoidSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.serializers.primitive
+package info.quasseldroid.protocol.serializers.primitive
-import de.kuschku.libquassel.protocol.serializers.QtSerializers
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
-import de.kuschku.libquassel.protocol.variant.QtType
+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 org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/byteBufferOf.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/byteBufferOf.kt
similarity index 95%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/byteBufferOf.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/byteBufferOf.kt
index 61e196dd7..62f5d7028 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/byteBufferOf.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.testutil
+package info.quasseldroid.protocol.testutil
import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/deserialize.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/deserialize.kt
similarity index 83%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/deserialize.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/deserialize.kt
index aec66f404..0191234d3 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/deserialize.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/deserialize.kt
@@ -16,13 +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 de.kuschku.libquassel.protocol.testutil
+package info.quasseldroid.protocol.testutil
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.serializers.handshake.HandshakeSerializer
-import de.kuschku.libquassel.protocol.serializers.primitive.HandshakeMapSerializer
-import de.kuschku.libquassel.protocol.serializers.primitive.QtSerializer
-import de.kuschku.libquassel.protocol.serializers.primitive.Serializer
+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 org.hamcrest.Matcher
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/handshakeSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/handshakeSerializerTest.kt
similarity index 90%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/handshakeSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/handshakeSerializerTest.kt
index 2139c07a5..5cbf4d92e 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/handshakeSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.testutil
+package info.quasseldroid.protocol.testutil
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.serializers.handshake.HandshakeSerializer
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.serializers.handshake.HandshakeSerializer
import org.hamcrest.Matcher
import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/matchers/BomMatcherChar.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/BomMatcherChar.kt
similarity index 95%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/matchers/BomMatcherChar.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/BomMatcherChar.kt
index e128e8f68..172700bc2 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/matchers/BomMatcherChar.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.testutil.matchers
+package info.quasseldroid.protocol.testutil.matchers
import org.hamcrest.BaseMatcher
import org.hamcrest.Description
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/matchers/BomMatcherString.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/BomMatcherString.kt
similarity index 95%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/matchers/BomMatcherString.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/BomMatcherString.kt
index ac9e7121c..898c3c049 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/matchers/BomMatcherString.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.testutil.matchers
+package info.quasseldroid.protocol.testutil.matchers
import org.hamcrest.BaseMatcher
import org.hamcrest.Description
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/matchers/ByteBufferMatcher.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/ByteBufferMatcher.kt
similarity index 89%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/matchers/ByteBufferMatcher.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/ByteBufferMatcher.kt
index 69ab7faf8..1ac3a6ad7 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/matchers/ByteBufferMatcher.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/ByteBufferMatcher.kt
@@ -16,14 +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 de.kuschku.libquassel.protocol.testutil.matchers
+package info.quasseldroid.protocol.testutil.matchers
-import de.kuschku.libquassel.protocol.io.contentToString
-import de.kuschku.libquassel.protocol.io.isEmpty
+import info.quasseldroid.protocol.io.contentToString
+import info.quasseldroid.protocol.io.isEmpty
import org.hamcrest.BaseMatcher
import org.hamcrest.Description
import java.nio.ByteBuffer
-import kotlin.math.exp
class ByteBufferMatcher(buffer: ByteBuffer?) : BaseMatcher<ByteBuffer>() {
private val expected = buffer?.let { original ->
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/matchers/MapMatcher.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/MapMatcher.kt
similarity index 96%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/matchers/MapMatcher.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/MapMatcher.kt
index 4ca0dc72e..749e268b3 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/matchers/MapMatcher.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/MapMatcher.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.testutil.matchers
+package info.quasseldroid.protocol.testutil.matchers
import org.hamcrest.BaseMatcher
import org.hamcrest.Description
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/matchers/TemporalMatcher.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/TemporalMatcher.kt
similarity index 96%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/matchers/TemporalMatcher.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/TemporalMatcher.kt
index 848e016e9..e2f1cc879 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/matchers/TemporalMatcher.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.testutil.matchers
+package info.quasseldroid.protocol.testutil.matchers
import org.hamcrest.BaseMatcher
import org.hamcrest.Description
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/qtSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/qtSerializerTest.kt
similarity index 90%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/qtSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/qtSerializerTest.kt
index 80b11b526..7a5244d81 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/qtSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.testutil
+package info.quasseldroid.protocol.testutil
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.serializers.primitive.QtSerializer
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.serializers.primitive.QtSerializer
import org.hamcrest.Matcher
import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/quasselSerializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/quasselSerializerTest.kt
similarity index 90%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/quasselSerializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/quasselSerializerTest.kt
index eae1a5751..dc203a9aa 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/quasselSerializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.testutil
+package info.quasseldroid.protocol.testutil
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.serializers.primitive.QuasselSerializer
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.serializers.primitive.QuasselSerializer
import org.hamcrest.Matcher
import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/serialize.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serialize.kt
similarity index 71%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/serialize.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serialize.kt
index d389756f2..4b44e36f0 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/serialize.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serialize.kt
@@ -16,18 +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 de.kuschku.libquassel.protocol.testutil
+package info.quasseldroid.protocol.testutil
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.serializers.handshake.HandshakeSerializer
-import de.kuschku.libquassel.protocol.serializers.primitive.HandshakeMapSerializer
-import de.kuschku.libquassel.protocol.serializers.primitive.QtSerializer
-import de.kuschku.libquassel.protocol.serializers.primitive.Serializer
-import de.kuschku.libquassel.protocol.testutil.matchers.ByteBufferMatcher
-import org.hamcrest.Matcher
+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 org.hamcrest.MatcherAssert.assertThat
-import org.junit.jupiter.api.Assertions.assertEquals
import java.nio.ByteBuffer
fun <T> serialize(
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/serializerTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serializerTest.kt
similarity index 89%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/serializerTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serializerTest.kt
index e6d4299d8..15e2c4e68 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/serializerTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.testutil
+package info.quasseldroid.protocol.testutil
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.serializers.primitive.Serializer
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.serializers.primitive.Serializer
import org.hamcrest.Matcher
import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/testHandshakeSerializerDirect.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testHandshakeSerializerDirect.kt
similarity index 89%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/testHandshakeSerializerDirect.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testHandshakeSerializerDirect.kt
index 45208f297..82beecf2c 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/testHandshakeSerializerDirect.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.testutil
+package info.quasseldroid.protocol.testutil
-import de.kuschku.libquassel.protocol.serializers.handshake.HandshakeSerializer
+import info.quasseldroid.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/de/kuschku/libquassel/protocol/testutil/testHandshakeSerializerEncoded.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testHandshakeSerializerEncoded.kt
similarity index 81%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/testHandshakeSerializerEncoded.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testHandshakeSerializerEncoded.kt
index b511b7705..d16dc072c 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/testHandshakeSerializerEncoded.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.testutil
+package info.quasseldroid.protocol.testutil
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.serializers.handshake.HandshakeSerializer
-import de.kuschku.libquassel.protocol.serializers.primitive.HandshakeMapSerializer
+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 org.hamcrest.Matcher
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/testQtSerializerDirect.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQtSerializerDirect.kt
similarity index 82%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/testQtSerializerDirect.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQtSerializerDirect.kt
index a07f194fe..6280db52c 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/testQtSerializerDirect.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.testutil
+package info.quasseldroid.protocol.testutil
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.io.contentToString
-import de.kuschku.libquassel.protocol.serializers.primitive.QtSerializer
+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 org.hamcrest.Matcher
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/testQtSerializerVariant.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQtSerializerVariant.kt
similarity index 79%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/testQtSerializerVariant.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQtSerializerVariant.kt
index 9ddb5bfd6..70726cb56 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/testQtSerializerVariant.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.testutil
+package info.quasseldroid.protocol.testutil
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.serializers.primitive.QVariantSerializer
-import de.kuschku.libquassel.protocol.serializers.primitive.QtSerializer
-import de.kuschku.libquassel.protocol.variant.QVariant
+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 org.hamcrest.Matcher
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/testQuasselSerializerDirect.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQuasselSerializerDirect.kt
similarity index 84%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/testQuasselSerializerDirect.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQuasselSerializerDirect.kt
index 18aa22057..239081a94 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/testQuasselSerializerDirect.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.testutil
+package info.quasseldroid.protocol.testutil
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.serializers.primitive.QuasselSerializer
+import info.quasseldroid.protocol.features.FeatureSet
+import info.quasseldroid.protocol.io.ChainedByteBuffer
+import info.quasseldroid.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/de/kuschku/libquassel/protocol/testutil/testQuasselSerializerVariant.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQuasselSerializerVariant.kt
similarity index 79%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/testQuasselSerializerVariant.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQuasselSerializerVariant.kt
index 1cbff786c..adcfcf017 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/testQuasselSerializerVariant.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/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 de.kuschku.libquassel.protocol.testutil
+package info.quasseldroid.protocol.testutil
-import de.kuschku.libquassel.protocol.features.FeatureSet
-import de.kuschku.libquassel.protocol.io.ChainedByteBuffer
-import de.kuschku.libquassel.protocol.serializers.primitive.QVariantSerializer
-import de.kuschku.libquassel.protocol.serializers.primitive.QuasselSerializer
-import de.kuschku.libquassel.protocol.variant.QVariant
+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 org.hamcrest.Matcher
import org.hamcrest.MatcherAssert.assertThat
import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/types/SignedIdTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/types/SignedIdTest.kt
similarity index 98%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/types/SignedIdTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/types/SignedIdTest.kt
index c3520885e..94779e693 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/types/SignedIdTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/types/SignedIdTest.kt
@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.types
+package info.quasseldroid.protocol.types
import org.junit.jupiter.api.Assertions.*
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/variant/QVariantTest.kt b/protocol/src/test/kotlin/info/quasseldroid/protocol/variant/QVariantTest.kt
similarity index 83%
rename from protocol/src/test/kotlin/de/kuschku/libquassel/protocol/variant/QVariantTest.kt
rename to protocol/src/test/kotlin/info/quasseldroid/protocol/variant/QVariantTest.kt
index b55e43f4b..7a94751ed 100644
--- a/protocol/src/test/kotlin/de/kuschku/libquassel/protocol/variant/QVariantTest.kt
+++ b/protocol/src/test/kotlin/info/quasseldroid/protocol/variant/QVariantTest.kt
@@ -17,12 +17,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.libquassel.protocol.variant
+package info.quasseldroid.protocol.variant
-import de.kuschku.libquassel.protocol.testutil.byteBufferOf
-import de.kuschku.libquassel.protocol.types.BufferId
-import de.kuschku.libquassel.protocol.variant.QtType
-import de.kuschku.libquassel.protocol.variant.qVariant
+import info.quasseldroid.protocol.testutil.byteBufferOf
+import info.quasseldroid.protocol.types.BufferId
import org.junit.jupiter.api.Assertions.*
import org.junit.jupiter.api.Test
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e1c2b62c8..a881985c1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -22,9 +22,15 @@ rootProject.buildFileName = "build.gradle.kts"
include(
":app",
- ":bitflags",
":protocol",
":coverage-annotations",
":libquassel",
":ci-containers"
)
+
+pluginManagement {
+ repositories {
+ mavenLocal()
+ gradlePluginPortal()
+ }
+}
--
GitLab