From 1c4473abb1dc33b38ef6cdb87c67327c4362603f Mon Sep 17 00:00:00 2001 From: Arnau Mora Date: Mon, 21 Oct 2024 10:51:15 +0200 Subject: [PATCH] Simplified modules Signed-off-by: Arnau Mora Gras --- build.gradle.kts | 103 +++++++++++++++++- lib/build.gradle.kts | 102 ----------------- settings.gradle.kts | 2 - .../vcard4android/AndroidAddressBookTest.kt | 0 .../vcard4android/AndroidContactTest.kt | 0 .../bitfire/vcard4android/AndroidGroupTest.kt | 0 .../LocaleNonWesternDigitsTest.kt | 0 .../at/bitfire/vcard4android/TestUtils.kt | 0 .../contactrow/DataRowBuilderTest.kt | 0 .../contactrow/EmailBuilderTest.kt | 0 .../contactrow/EmailHandlerTest.kt | 0 .../contactrow/EventBuilderTest.kt | 0 .../contactrow/EventHandlerTest.kt | 0 .../vcard4android/contactrow/ImBuilderTest.kt | 0 .../vcard4android/contactrow/ImHandlerTest.kt | 0 .../contactrow/NicknameBuilderTest.kt | 0 .../contactrow/NicknameHandlerTest.kt | 0 .../contactrow/NoteBuilderTest.kt | 0 .../contactrow/NoteHandlerTest.kt | 0 .../contactrow/OrganizationBuilderTest.kt | 0 .../contactrow/OrganizationHandlerTest.kt | 0 .../contactrow/PhoneBuilderTest.kt | 0 .../contactrow/PhoneHandlerTest.kt | 0 .../contactrow/PhotoBuilderTest.kt | 0 .../contactrow/PhotoHandlerTest.kt | 0 .../contactrow/RelationBuilderTest.kt | 0 .../contactrow/RelationHandlerTest.kt | 0 .../contactrow/SipAddressBuilderTest.kt | 0 .../contactrow/SipAddressHandlerTest.kt | 0 .../contactrow/StructuredNameBuilderTest.kt | 0 .../contactrow/StructuredNameHandlerTest.kt | 0 .../contactrow/StructuredPostalBuilderTest.kt | 0 .../contactrow/StructuredPostalHandlerTest.kt | 0 .../contactrow/WebsiteBuilderTest.kt | 0 .../contactrow/WebsiteHandlerTest.kt | 0 .../vcard4android/impl/TestAddressBook.kt | 0 .../androidTest/resources/large.jpg | Bin .../androidTest/resources/large.jpg.LICENSE | 0 .../androidTest/resources/small.jpg | Bin .../androidTest/resources/small.png | Bin {lib/src => src}/main/AndroidManifest.xml | 0 .../vcard4android/AndroidAddressBook.kt | 0 .../bitfire/vcard4android/AndroidContact.kt | 0 .../vcard4android/AndroidContactFactory.kt | 0 .../at/bitfire/vcard4android/AndroidGroup.kt | 0 .../vcard4android/AndroidGroupFactory.kt | 0 .../bitfire/vcard4android/BatchOperation.kt | 0 .../vcard4android/CachedGroupMembership.kt | 0 .../at/bitfire/vcard4android/Contact.kt | 0 .../at/bitfire/vcard4android/ContactReader.kt | 0 .../at/bitfire/vcard4android/ContactWriter.kt | 0 .../vcard4android/ContactsStorageException.kt | 0 .../at/bitfire/vcard4android/GroupMethod.kt | 0 .../bitfire/vcard4android/LabeledProperty.kt | 0 .../kotlin/at/bitfire/vcard4android/Utils.kt | 0 .../contactrow/ContactProcessor.kt | 0 .../contactrow/DataRowBuilder.kt | 0 .../contactrow/DataRowHandler.kt | 0 .../vcard4android/contactrow/EmailBuilder.kt | 0 .../vcard4android/contactrow/EmailHandler.kt | 0 .../vcard4android/contactrow/EventBuilder.kt | 0 .../vcard4android/contactrow/EventHandler.kt | 0 .../vcard4android/contactrow/ImBuilder.kt | 0 .../vcard4android/contactrow/ImHandler.kt | 0 .../contactrow/NicknameBuilder.kt | 0 .../contactrow/NicknameHandler.kt | 0 .../vcard4android/contactrow/NoteBuilder.kt | 0 .../vcard4android/contactrow/NoteHandler.kt | 0 .../contactrow/OrganizationBuilder.kt | 0 .../contactrow/OrganizationHandler.kt | 0 .../vcard4android/contactrow/PhoneBuilder.kt | 0 .../vcard4android/contactrow/PhoneHandler.kt | 0 .../vcard4android/contactrow/PhotoBuilder.kt | 0 .../vcard4android/contactrow/PhotoHandler.kt | 0 .../contactrow/RelationBuilder.kt | 0 .../contactrow/RelationHandler.kt | 0 .../contactrow/SipAddressBuilder.kt | 0 .../contactrow/SipAddressHandler.kt | 0 .../contactrow/StructuredNameBuilder.kt | 0 .../contactrow/StructuredNameHandler.kt | 0 .../contactrow/StructuredPostalBuilder.kt | 0 .../contactrow/StructuredPostalHandler.kt | 0 .../contactrow/WebsiteBuilder.kt | 0 .../contactrow/WebsiteHandler.kt | 0 .../vcard4android/property/CustomScribes.kt | 0 .../vcard4android/property/CustomType.kt | 0 .../bitfire/vcard4android/property/XAbDate.kt | 0 .../vcard4android/property/XAbLabel.kt | 0 .../vcard4android/property/XAbRelatedNames.kt | 0 .../property/XAddressBookServerKind.kt | 0 .../property/XAddressBookServerMember.kt | 0 .../property/XPhoneticFirstName.kt | 0 .../property/XPhoneticLastName.kt | 0 .../property/XPhoneticMiddleName.kt | 0 .../at/bitfire/vcard4android/property/XSip.kt | 0 .../main/res/values/about_strings.xml | 0 .../vcard4android/ContactReaderTest.kt | 0 .../at/bitfire/vcard4android/ContactTest.kt | 0 .../vcard4android/ContactWriterTest.kt | 0 .../at/bitfire/vcard4android/EzVCardTest.kt | 0 .../at/bitfire/vcard4android/UtilsTest.kt | 0 .../test/resources/allfields-vcard3.vcf | 0 {lib/src => src}/test/resources/lol.jpg | Bin .../test/resources/strange-rev.vcf | 22 ++-- .../unknown-properties-with-labels.vcf | 0 {lib/src => src}/test/resources/vcard4.vcf | 0 106 files changed, 111 insertions(+), 118 deletions(-) delete mode 100644 lib/build.gradle.kts rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/AndroidAddressBookTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/AndroidContactTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/AndroidGroupTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/LocaleNonWesternDigitsTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/TestUtils.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/DataRowBuilderTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EmailBuilderTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EmailHandlerTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EventBuilderTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EventHandlerTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/ImBuilderTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/ImHandlerTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NicknameBuilderTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NicknameHandlerTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NoteBuilderTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NoteHandlerTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/OrganizationBuilderTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/OrganizationHandlerTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhoneBuilderTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhoneHandlerTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilderTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandlerTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/RelationBuilderTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/RelationHandlerTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/SipAddressBuilderTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/SipAddressHandlerTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameBuilderTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameHandlerTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalBuilderTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalHandlerTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/WebsiteBuilderTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/contactrow/WebsiteHandlerTest.kt (100%) rename {lib/src => src}/androidTest/kotlin/at/bitfire/vcard4android/impl/TestAddressBook.kt (100%) rename {lib/src => src}/androidTest/resources/large.jpg (100%) rename {lib/src => src}/androidTest/resources/large.jpg.LICENSE (100%) rename {lib/src => src}/androidTest/resources/small.jpg (100%) rename {lib/src => src}/androidTest/resources/small.png (100%) rename {lib/src => src}/main/AndroidManifest.xml (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/AndroidAddressBook.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/AndroidContact.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/AndroidContactFactory.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/AndroidGroup.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/AndroidGroupFactory.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/BatchOperation.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/CachedGroupMembership.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/Contact.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/ContactReader.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/ContactWriter.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/ContactsStorageException.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/GroupMethod.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/LabeledProperty.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/Utils.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/ContactProcessor.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/DataRowBuilder.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/DataRowHandler.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/EmailBuilder.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/EmailHandler.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/EventBuilder.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/EventHandler.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/ImBuilder.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/ImHandler.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/NicknameBuilder.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/NicknameHandler.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/NoteBuilder.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/NoteHandler.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/OrganizationBuilder.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/OrganizationHandler.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/PhoneBuilder.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/PhoneHandler.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilder.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandler.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/RelationBuilder.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/RelationHandler.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/SipAddressBuilder.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/SipAddressHandler.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameBuilder.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameHandler.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalBuilder.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalHandler.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/WebsiteBuilder.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/contactrow/WebsiteHandler.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/property/CustomScribes.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/property/CustomType.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/property/XAbDate.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/property/XAbLabel.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/property/XAbRelatedNames.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/property/XAddressBookServerKind.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/property/XAddressBookServerMember.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/property/XPhoneticFirstName.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/property/XPhoneticLastName.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/property/XPhoneticMiddleName.kt (100%) rename {lib/src => src}/main/kotlin/at/bitfire/vcard4android/property/XSip.kt (100%) rename {lib/src => src}/main/res/values/about_strings.xml (100%) rename {lib/src => src}/test/kotlin/at/bitfire/vcard4android/ContactReaderTest.kt (100%) rename {lib/src => src}/test/kotlin/at/bitfire/vcard4android/ContactTest.kt (100%) rename {lib/src => src}/test/kotlin/at/bitfire/vcard4android/ContactWriterTest.kt (100%) rename {lib/src => src}/test/kotlin/at/bitfire/vcard4android/EzVCardTest.kt (100%) rename {lib/src => src}/test/kotlin/at/bitfire/vcard4android/UtilsTest.kt (100%) rename {lib/src => src}/test/resources/allfields-vcard3.vcf (100%) rename {lib/src => src}/test/resources/lol.jpg (100%) rename {lib/src => src}/test/resources/strange-rev.vcf (95%) rename {lib/src => src}/test/resources/unknown-properties-with-labels.vcf (100%) rename {lib/src => src}/test/resources/vcard4.vcf (100%) diff --git a/build.gradle.kts b/build.gradle.kts index 74aa34e..6479340 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,105 @@ plugins { - alias(libs.plugins.android.library) apply false - alias(libs.plugins.kotlin.android) apply false - alias(libs.plugins.dokka) apply false + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.dokka) + `maven-publish` } group = "at.bitfire" version = System.getenv("GIT_COMMIT") + +android { + namespace = "at.bitfire.vcard4android" + + compileSdk = 34 + + defaultConfig { + minSdk = 23 // Android 6 + + aarMetadata { + minCompileSdk = 29 + } + } + + compileOptions { + isCoreLibraryDesugaringEnabled = true + } + kotlin { + jvmToolchain(21) + } + + buildTypes { + release { + isMinifyEnabled = false + } + } + + packaging { + resources { + excludes += listOf("LICENSE", "META-INF/LICENSE.txt", "META-INF/NOTICE.txt") + } + } + + lint { + disable += listOf("AllowBackup", "InvalidPackage") + } + + defaultConfig { + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + @Suppress("UnstableApiUsage") + testOptions { + managedDevices { + localDevices { + create("virtual") { + device = "Pixel 3" + apiLevel = 33 + systemImageSource = "aosp-atd" + } + } + } + } + + publishing { + // Configure publish variant + singleVariant("release") { + withSourcesJar() + } + } +} + +publishing { + // Configure publishing data + publications { + register("release", MavenPublication::class.java) { + groupId = "com.github.bitfireAT" + artifactId = "vcard4android" + version = System.getenv("GIT_COMMIT") + + afterEvaluate { + from(components["release"]) + } + } + } +} + +dependencies { + implementation(libs.kotlin.stdlib) + coreLibraryDesugaring(libs.desugar) + + implementation(libs.androidx.annotation) + implementation(libs.guava) + + // ez-vcard to parse/generate vCards + api(libs.ezvcard) { // requires Java 8 + // hCard functionality not needed + exclude(group = "org.jsoup") + exclude(group = "org.freemarker") + } + + androidTestImplementation(libs.androidx.test.rules) + androidTestImplementation(libs.androidx.test.runner) + + testImplementation(libs.junit) +} diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts deleted file mode 100644 index bd045ee..0000000 --- a/lib/build.gradle.kts +++ /dev/null @@ -1,102 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) - alias(libs.plugins.dokka) - `maven-publish` -} - -android { - namespace = "at.bitfire.vcard4android" - - compileSdk = 34 - - defaultConfig { - minSdk = 23 // Android 6 - - aarMetadata { - minCompileSdk = 29 - } - } - - compileOptions { - isCoreLibraryDesugaringEnabled = true - } - kotlin { - jvmToolchain(21) - } - - buildTypes { - release { - isMinifyEnabled = false - } - } - - packaging { - resources { - excludes += listOf("LICENSE", "META-INF/LICENSE.txt", "META-INF/NOTICE.txt") - } - } - - lint { - disable += listOf("AllowBackup", "InvalidPackage") - } - - defaultConfig { - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - @Suppress("UnstableApiUsage") - testOptions { - managedDevices { - localDevices { - create("virtual") { - device = "Pixel 3" - apiLevel = 33 - systemImageSource = "aosp-atd" - } - } - } - } - - publishing { - // Configure publish variant - singleVariant("release") { - withSourcesJar() - } - } -} - -publishing { - // Configure publishing data - publications { - register("release", MavenPublication::class.java) { - groupId = "com.github.bitfireAT" - artifactId = "vcard4android" - version = System.getenv("GIT_COMMIT") - - afterEvaluate { - from(components["release"]) - } - } - } -} - -dependencies { - implementation(libs.kotlin.stdlib) - coreLibraryDesugaring(libs.desugar) - - implementation(libs.androidx.annotation) - implementation(libs.guava) - - // ez-vcard to parse/generate vCards - api(libs.ezvcard) { // requires Java 8 - // hCard functionality not needed - exclude(group = "org.jsoup") - exclude(group = "org.freemarker") - } - - androidTestImplementation(libs.androidx.test.rules) - androidTestImplementation(libs.androidx.test.runner) - - testImplementation(libs.junit) -} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index f1b8ded..22c2f37 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,5 +15,3 @@ dependencyResolutionManagement { } rootProject.name = "vcard4android" -include (":lib") -project(":lib").name = "vcard4android" diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidAddressBookTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidAddressBookTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidAddressBookTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/AndroidAddressBookTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidContactTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidContactTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidContactTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/AndroidContactTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidGroupTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidGroupTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/AndroidGroupTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/AndroidGroupTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/LocaleNonWesternDigitsTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/LocaleNonWesternDigitsTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/LocaleNonWesternDigitsTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/LocaleNonWesternDigitsTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/TestUtils.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/TestUtils.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/TestUtils.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/TestUtils.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/DataRowBuilderTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/DataRowBuilderTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/DataRowBuilderTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/DataRowBuilderTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EmailBuilderTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EmailBuilderTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EmailBuilderTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EmailBuilderTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EmailHandlerTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EmailHandlerTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EmailHandlerTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EmailHandlerTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EventBuilderTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EventBuilderTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EventBuilderTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EventBuilderTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EventHandlerTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EventHandlerTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EventHandlerTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/EventHandlerTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/ImBuilderTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/ImBuilderTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/ImBuilderTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/ImBuilderTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/ImHandlerTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/ImHandlerTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/ImHandlerTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/ImHandlerTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NicknameBuilderTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NicknameBuilderTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NicknameBuilderTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NicknameBuilderTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NicknameHandlerTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NicknameHandlerTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NicknameHandlerTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NicknameHandlerTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NoteBuilderTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NoteBuilderTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NoteBuilderTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NoteBuilderTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NoteHandlerTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NoteHandlerTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NoteHandlerTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/NoteHandlerTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/OrganizationBuilderTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/OrganizationBuilderTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/OrganizationBuilderTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/OrganizationBuilderTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/OrganizationHandlerTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/OrganizationHandlerTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/OrganizationHandlerTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/OrganizationHandlerTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhoneBuilderTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhoneBuilderTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhoneBuilderTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhoneBuilderTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhoneHandlerTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhoneHandlerTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhoneHandlerTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhoneHandlerTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilderTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilderTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilderTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilderTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandlerTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandlerTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandlerTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandlerTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/RelationBuilderTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/RelationBuilderTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/RelationBuilderTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/RelationBuilderTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/RelationHandlerTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/RelationHandlerTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/RelationHandlerTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/RelationHandlerTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/SipAddressBuilderTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/SipAddressBuilderTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/SipAddressBuilderTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/SipAddressBuilderTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/SipAddressHandlerTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/SipAddressHandlerTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/SipAddressHandlerTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/SipAddressHandlerTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameBuilderTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameBuilderTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameBuilderTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameBuilderTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameHandlerTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameHandlerTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameHandlerTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameHandlerTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalBuilderTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalBuilderTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalBuilderTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalBuilderTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalHandlerTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalHandlerTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalHandlerTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalHandlerTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/WebsiteBuilderTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/WebsiteBuilderTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/WebsiteBuilderTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/WebsiteBuilderTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/WebsiteHandlerTest.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/WebsiteHandlerTest.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/WebsiteHandlerTest.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/contactrow/WebsiteHandlerTest.kt diff --git a/lib/src/androidTest/kotlin/at/bitfire/vcard4android/impl/TestAddressBook.kt b/src/androidTest/kotlin/at/bitfire/vcard4android/impl/TestAddressBook.kt similarity index 100% rename from lib/src/androidTest/kotlin/at/bitfire/vcard4android/impl/TestAddressBook.kt rename to src/androidTest/kotlin/at/bitfire/vcard4android/impl/TestAddressBook.kt diff --git a/lib/src/androidTest/resources/large.jpg b/src/androidTest/resources/large.jpg similarity index 100% rename from lib/src/androidTest/resources/large.jpg rename to src/androidTest/resources/large.jpg diff --git a/lib/src/androidTest/resources/large.jpg.LICENSE b/src/androidTest/resources/large.jpg.LICENSE similarity index 100% rename from lib/src/androidTest/resources/large.jpg.LICENSE rename to src/androidTest/resources/large.jpg.LICENSE diff --git a/lib/src/androidTest/resources/small.jpg b/src/androidTest/resources/small.jpg similarity index 100% rename from lib/src/androidTest/resources/small.jpg rename to src/androidTest/resources/small.jpg diff --git a/lib/src/androidTest/resources/small.png b/src/androidTest/resources/small.png similarity index 100% rename from lib/src/androidTest/resources/small.png rename to src/androidTest/resources/small.png diff --git a/lib/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml similarity index 100% rename from lib/src/main/AndroidManifest.xml rename to src/main/AndroidManifest.xml diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/AndroidAddressBook.kt b/src/main/kotlin/at/bitfire/vcard4android/AndroidAddressBook.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/AndroidAddressBook.kt rename to src/main/kotlin/at/bitfire/vcard4android/AndroidAddressBook.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/AndroidContact.kt b/src/main/kotlin/at/bitfire/vcard4android/AndroidContact.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/AndroidContact.kt rename to src/main/kotlin/at/bitfire/vcard4android/AndroidContact.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/AndroidContactFactory.kt b/src/main/kotlin/at/bitfire/vcard4android/AndroidContactFactory.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/AndroidContactFactory.kt rename to src/main/kotlin/at/bitfire/vcard4android/AndroidContactFactory.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/AndroidGroup.kt b/src/main/kotlin/at/bitfire/vcard4android/AndroidGroup.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/AndroidGroup.kt rename to src/main/kotlin/at/bitfire/vcard4android/AndroidGroup.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/AndroidGroupFactory.kt b/src/main/kotlin/at/bitfire/vcard4android/AndroidGroupFactory.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/AndroidGroupFactory.kt rename to src/main/kotlin/at/bitfire/vcard4android/AndroidGroupFactory.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/BatchOperation.kt b/src/main/kotlin/at/bitfire/vcard4android/BatchOperation.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/BatchOperation.kt rename to src/main/kotlin/at/bitfire/vcard4android/BatchOperation.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/CachedGroupMembership.kt b/src/main/kotlin/at/bitfire/vcard4android/CachedGroupMembership.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/CachedGroupMembership.kt rename to src/main/kotlin/at/bitfire/vcard4android/CachedGroupMembership.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/Contact.kt b/src/main/kotlin/at/bitfire/vcard4android/Contact.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/Contact.kt rename to src/main/kotlin/at/bitfire/vcard4android/Contact.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/ContactReader.kt b/src/main/kotlin/at/bitfire/vcard4android/ContactReader.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/ContactReader.kt rename to src/main/kotlin/at/bitfire/vcard4android/ContactReader.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/ContactWriter.kt b/src/main/kotlin/at/bitfire/vcard4android/ContactWriter.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/ContactWriter.kt rename to src/main/kotlin/at/bitfire/vcard4android/ContactWriter.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/ContactsStorageException.kt b/src/main/kotlin/at/bitfire/vcard4android/ContactsStorageException.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/ContactsStorageException.kt rename to src/main/kotlin/at/bitfire/vcard4android/ContactsStorageException.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/GroupMethod.kt b/src/main/kotlin/at/bitfire/vcard4android/GroupMethod.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/GroupMethod.kt rename to src/main/kotlin/at/bitfire/vcard4android/GroupMethod.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/LabeledProperty.kt b/src/main/kotlin/at/bitfire/vcard4android/LabeledProperty.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/LabeledProperty.kt rename to src/main/kotlin/at/bitfire/vcard4android/LabeledProperty.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/Utils.kt b/src/main/kotlin/at/bitfire/vcard4android/Utils.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/Utils.kt rename to src/main/kotlin/at/bitfire/vcard4android/Utils.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/ContactProcessor.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/ContactProcessor.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/ContactProcessor.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/ContactProcessor.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/DataRowBuilder.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/DataRowBuilder.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/DataRowBuilder.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/DataRowBuilder.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/DataRowHandler.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/DataRowHandler.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/DataRowHandler.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/DataRowHandler.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EmailBuilder.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/EmailBuilder.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EmailBuilder.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/EmailBuilder.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EmailHandler.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/EmailHandler.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EmailHandler.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/EmailHandler.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EventBuilder.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/EventBuilder.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EventBuilder.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/EventBuilder.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EventHandler.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/EventHandler.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EventHandler.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/EventHandler.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/ImBuilder.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/ImBuilder.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/ImBuilder.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/ImBuilder.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/ImHandler.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/ImHandler.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/ImHandler.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/ImHandler.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NicknameBuilder.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/NicknameBuilder.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NicknameBuilder.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/NicknameBuilder.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NicknameHandler.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/NicknameHandler.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NicknameHandler.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/NicknameHandler.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NoteBuilder.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/NoteBuilder.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NoteBuilder.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/NoteBuilder.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NoteHandler.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/NoteHandler.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/NoteHandler.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/NoteHandler.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/OrganizationBuilder.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/OrganizationBuilder.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/OrganizationBuilder.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/OrganizationBuilder.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/OrganizationHandler.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/OrganizationHandler.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/OrganizationHandler.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/OrganizationHandler.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhoneBuilder.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhoneBuilder.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhoneBuilder.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/PhoneBuilder.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhoneHandler.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhoneHandler.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhoneHandler.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/PhoneHandler.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilder.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilder.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilder.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoBuilder.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandler.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandler.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandler.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/PhotoHandler.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/RelationBuilder.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/RelationBuilder.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/RelationBuilder.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/RelationBuilder.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/RelationHandler.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/RelationHandler.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/RelationHandler.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/RelationHandler.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/SipAddressBuilder.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/SipAddressBuilder.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/SipAddressBuilder.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/SipAddressBuilder.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/SipAddressHandler.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/SipAddressHandler.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/SipAddressHandler.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/SipAddressHandler.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameBuilder.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameBuilder.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameBuilder.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameBuilder.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameHandler.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameHandler.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameHandler.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredNameHandler.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalBuilder.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalBuilder.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalBuilder.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalBuilder.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalHandler.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalHandler.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalHandler.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/StructuredPostalHandler.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/WebsiteBuilder.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/WebsiteBuilder.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/WebsiteBuilder.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/WebsiteBuilder.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/WebsiteHandler.kt b/src/main/kotlin/at/bitfire/vcard4android/contactrow/WebsiteHandler.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/WebsiteHandler.kt rename to src/main/kotlin/at/bitfire/vcard4android/contactrow/WebsiteHandler.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/CustomScribes.kt b/src/main/kotlin/at/bitfire/vcard4android/property/CustomScribes.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/CustomScribes.kt rename to src/main/kotlin/at/bitfire/vcard4android/property/CustomScribes.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/CustomType.kt b/src/main/kotlin/at/bitfire/vcard4android/property/CustomType.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/CustomType.kt rename to src/main/kotlin/at/bitfire/vcard4android/property/CustomType.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XAbDate.kt b/src/main/kotlin/at/bitfire/vcard4android/property/XAbDate.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XAbDate.kt rename to src/main/kotlin/at/bitfire/vcard4android/property/XAbDate.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XAbLabel.kt b/src/main/kotlin/at/bitfire/vcard4android/property/XAbLabel.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XAbLabel.kt rename to src/main/kotlin/at/bitfire/vcard4android/property/XAbLabel.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XAbRelatedNames.kt b/src/main/kotlin/at/bitfire/vcard4android/property/XAbRelatedNames.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XAbRelatedNames.kt rename to src/main/kotlin/at/bitfire/vcard4android/property/XAbRelatedNames.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XAddressBookServerKind.kt b/src/main/kotlin/at/bitfire/vcard4android/property/XAddressBookServerKind.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XAddressBookServerKind.kt rename to src/main/kotlin/at/bitfire/vcard4android/property/XAddressBookServerKind.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XAddressBookServerMember.kt b/src/main/kotlin/at/bitfire/vcard4android/property/XAddressBookServerMember.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XAddressBookServerMember.kt rename to src/main/kotlin/at/bitfire/vcard4android/property/XAddressBookServerMember.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticFirstName.kt b/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticFirstName.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticFirstName.kt rename to src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticFirstName.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticLastName.kt b/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticLastName.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticLastName.kt rename to src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticLastName.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticMiddleName.kt b/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticMiddleName.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticMiddleName.kt rename to src/main/kotlin/at/bitfire/vcard4android/property/XPhoneticMiddleName.kt diff --git a/lib/src/main/kotlin/at/bitfire/vcard4android/property/XSip.kt b/src/main/kotlin/at/bitfire/vcard4android/property/XSip.kt similarity index 100% rename from lib/src/main/kotlin/at/bitfire/vcard4android/property/XSip.kt rename to src/main/kotlin/at/bitfire/vcard4android/property/XSip.kt diff --git a/lib/src/main/res/values/about_strings.xml b/src/main/res/values/about_strings.xml similarity index 100% rename from lib/src/main/res/values/about_strings.xml rename to src/main/res/values/about_strings.xml diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/ContactReaderTest.kt b/src/test/kotlin/at/bitfire/vcard4android/ContactReaderTest.kt similarity index 100% rename from lib/src/test/kotlin/at/bitfire/vcard4android/ContactReaderTest.kt rename to src/test/kotlin/at/bitfire/vcard4android/ContactReaderTest.kt diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/ContactTest.kt b/src/test/kotlin/at/bitfire/vcard4android/ContactTest.kt similarity index 100% rename from lib/src/test/kotlin/at/bitfire/vcard4android/ContactTest.kt rename to src/test/kotlin/at/bitfire/vcard4android/ContactTest.kt diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/ContactWriterTest.kt b/src/test/kotlin/at/bitfire/vcard4android/ContactWriterTest.kt similarity index 100% rename from lib/src/test/kotlin/at/bitfire/vcard4android/ContactWriterTest.kt rename to src/test/kotlin/at/bitfire/vcard4android/ContactWriterTest.kt diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/EzVCardTest.kt b/src/test/kotlin/at/bitfire/vcard4android/EzVCardTest.kt similarity index 100% rename from lib/src/test/kotlin/at/bitfire/vcard4android/EzVCardTest.kt rename to src/test/kotlin/at/bitfire/vcard4android/EzVCardTest.kt diff --git a/lib/src/test/kotlin/at/bitfire/vcard4android/UtilsTest.kt b/src/test/kotlin/at/bitfire/vcard4android/UtilsTest.kt similarity index 100% rename from lib/src/test/kotlin/at/bitfire/vcard4android/UtilsTest.kt rename to src/test/kotlin/at/bitfire/vcard4android/UtilsTest.kt diff --git a/lib/src/test/resources/allfields-vcard3.vcf b/src/test/resources/allfields-vcard3.vcf similarity index 100% rename from lib/src/test/resources/allfields-vcard3.vcf rename to src/test/resources/allfields-vcard3.vcf diff --git a/lib/src/test/resources/lol.jpg b/src/test/resources/lol.jpg similarity index 100% rename from lib/src/test/resources/lol.jpg rename to src/test/resources/lol.jpg diff --git a/lib/src/test/resources/strange-rev.vcf b/src/test/resources/strange-rev.vcf similarity index 95% rename from lib/src/test/resources/strange-rev.vcf rename to src/test/resources/strange-rev.vcf index 84158c3..b4e1b9b 100644 --- a/lib/src/test/resources/strange-rev.vcf +++ b/src/test/resources/strange-rev.vcf @@ -1,11 +1,11 @@ -BEGIN:VCARD -VERSION:4.0 -PRODID:+//IDN bitfire.at//DAVdroid/1.3.4.1-ose vcard4android ez-vcard/0.10. - 0 -REV;VALUE=timestamp:2016-11-19T17:44:22.057Z -UID:2e4f2d8d8a -FN:Name Name -N:Name;Name;;; -TEL;TYPE=fax:+49000000 -TEL;TYPE=voice:+49000000 -END:VCARD +BEGIN:VCARD +VERSION:4.0 +PRODID:+//IDN bitfire.at//DAVdroid/1.3.4.1-ose vcard4android ez-vcard/0.10. + 0 +REV;VALUE=timestamp:2016-11-19T17:44:22.057Z +UID:2e4f2d8d8a +FN:Name Name +N:Name;Name;;; +TEL;TYPE=fax:+49000000 +TEL;TYPE=voice:+49000000 +END:VCARD diff --git a/lib/src/test/resources/unknown-properties-with-labels.vcf b/src/test/resources/unknown-properties-with-labels.vcf similarity index 100% rename from lib/src/test/resources/unknown-properties-with-labels.vcf rename to src/test/resources/unknown-properties-with-labels.vcf diff --git a/lib/src/test/resources/vcard4.vcf b/src/test/resources/vcard4.vcf similarity index 100% rename from lib/src/test/resources/vcard4.vcf rename to src/test/resources/vcard4.vcf