Simplified modules

Signed-off-by: Arnau Mora Gras <[email protected]>
bitfireAT · Oct 21, 2024 · 1c4473a · 1c4473a
1 parent 5439c1f
commit 1c4473a
Show file tree

Hide file tree

Showing 106 changed files with 111 additions and 118 deletions.
diff --git 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
diff --git 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/...e/vcard4android/AndroidAddressBookTest.kt → ...e/vcard4android/AndroidAddressBookTest.kt b/...e/vcard4android/AndroidAddressBookTest.kt → ...e/vcard4android/AndroidAddressBookTest.kt
diff --git a/...tfire/vcard4android/AndroidContactTest.kt → ...tfire/vcard4android/AndroidContactTest.kt b/...tfire/vcard4android/AndroidContactTest.kt → ...tfire/vcard4android/AndroidContactTest.kt
diff --git a/...bitfire/vcard4android/AndroidGroupTest.kt → ...bitfire/vcard4android/AndroidGroupTest.kt b/...bitfire/vcard4android/AndroidGroupTest.kt → ...bitfire/vcard4android/AndroidGroupTest.kt
diff --git a/...ard4android/LocaleNonWesternDigitsTest.kt → ...ard4android/LocaleNonWesternDigitsTest.kt b/...ard4android/LocaleNonWesternDigitsTest.kt → ...ard4android/LocaleNonWesternDigitsTest.kt
diff --git a/...lin/at/bitfire/vcard4android/TestUtils.kt → ...lin/at/bitfire/vcard4android/TestUtils.kt b/...lin/at/bitfire/vcard4android/TestUtils.kt → ...lin/at/bitfire/vcard4android/TestUtils.kt
diff --git a/...4android/contactrow/DataRowBuilderTest.kt → ...4android/contactrow/DataRowBuilderTest.kt b/...4android/contactrow/DataRowBuilderTest.kt → ...4android/contactrow/DataRowBuilderTest.kt
diff --git a/...rd4android/contactrow/EmailBuilderTest.kt → ...rd4android/contactrow/EmailBuilderTest.kt b/...rd4android/contactrow/EmailBuilderTest.kt → ...rd4android/contactrow/EmailBuilderTest.kt
diff --git a/...rd4android/contactrow/EmailHandlerTest.kt → ...rd4android/contactrow/EmailHandlerTest.kt b/...rd4android/contactrow/EmailHandlerTest.kt → ...rd4android/contactrow/EmailHandlerTest.kt
diff --git a/...rd4android/contactrow/EventBuilderTest.kt → ...rd4android/contactrow/EventBuilderTest.kt b/...rd4android/contactrow/EventBuilderTest.kt → ...rd4android/contactrow/EventBuilderTest.kt
diff --git a/...rd4android/contactrow/EventHandlerTest.kt → ...rd4android/contactrow/EventHandlerTest.kt b/...rd4android/contactrow/EventHandlerTest.kt → ...rd4android/contactrow/EventHandlerTest.kt
diff --git a/...vcard4android/contactrow/ImBuilderTest.kt → ...vcard4android/contactrow/ImBuilderTest.kt b/...vcard4android/contactrow/ImBuilderTest.kt → ...vcard4android/contactrow/ImBuilderTest.kt
diff --git a/...vcard4android/contactrow/ImHandlerTest.kt → ...vcard4android/contactrow/ImHandlerTest.kt b/...vcard4android/contactrow/ImHandlerTest.kt → ...vcard4android/contactrow/ImHandlerTest.kt
diff --git a/...android/contactrow/NicknameBuilderTest.kt → ...android/contactrow/NicknameBuilderTest.kt b/...android/contactrow/NicknameBuilderTest.kt → ...android/contactrow/NicknameBuilderTest.kt
diff --git a/...android/contactrow/NicknameHandlerTest.kt → ...android/contactrow/NicknameHandlerTest.kt b/...android/contactrow/NicknameHandlerTest.kt → ...android/contactrow/NicknameHandlerTest.kt
diff --git a/...ard4android/contactrow/NoteBuilderTest.kt → ...ard4android/contactrow/NoteBuilderTest.kt b/...ard4android/contactrow/NoteBuilderTest.kt → ...ard4android/contactrow/NoteBuilderTest.kt
diff --git a/...ard4android/contactrow/NoteHandlerTest.kt → ...ard4android/contactrow/NoteHandlerTest.kt b/...ard4android/contactrow/NoteHandlerTest.kt → ...ard4android/contactrow/NoteHandlerTest.kt
diff --git a/...oid/contactrow/OrganizationBuilderTest.kt → ...oid/contactrow/OrganizationBuilderTest.kt b/...oid/contactrow/OrganizationBuilderTest.kt → ...oid/contactrow/OrganizationBuilderTest.kt
diff --git a/...oid/contactrow/OrganizationHandlerTest.kt → ...oid/contactrow/OrganizationHandlerTest.kt b/...oid/contactrow/OrganizationHandlerTest.kt → ...oid/contactrow/OrganizationHandlerTest.kt
diff --git a/...rd4android/contactrow/PhoneBuilderTest.kt → ...rd4android/contactrow/PhoneBuilderTest.kt b/...rd4android/contactrow/PhoneBuilderTest.kt → ...rd4android/contactrow/PhoneBuilderTest.kt
diff --git a/...rd4android/contactrow/PhoneHandlerTest.kt → ...rd4android/contactrow/PhoneHandlerTest.kt b/...rd4android/contactrow/PhoneHandlerTest.kt → ...rd4android/contactrow/PhoneHandlerTest.kt
diff --git a/...rd4android/contactrow/PhotoBuilderTest.kt → ...rd4android/contactrow/PhotoBuilderTest.kt b/...rd4android/contactrow/PhotoBuilderTest.kt → ...rd4android/contactrow/PhotoBuilderTest.kt
diff --git a/...rd4android/contactrow/PhotoHandlerTest.kt → ...rd4android/contactrow/PhotoHandlerTest.kt b/...rd4android/contactrow/PhotoHandlerTest.kt → ...rd4android/contactrow/PhotoHandlerTest.kt
diff --git a/...android/contactrow/RelationBuilderTest.kt → ...android/contactrow/RelationBuilderTest.kt b/...android/contactrow/RelationBuilderTest.kt → ...android/contactrow/RelationBuilderTest.kt
diff --git a/...android/contactrow/RelationHandlerTest.kt → ...android/contactrow/RelationHandlerTest.kt b/...android/contactrow/RelationHandlerTest.kt → ...android/contactrow/RelationHandlerTest.kt
diff --git a/...droid/contactrow/SipAddressBuilderTest.kt → ...droid/contactrow/SipAddressBuilderTest.kt b/...droid/contactrow/SipAddressBuilderTest.kt → ...droid/contactrow/SipAddressBuilderTest.kt
diff --git a/...droid/contactrow/SipAddressHandlerTest.kt → ...droid/contactrow/SipAddressHandlerTest.kt b/...droid/contactrow/SipAddressHandlerTest.kt → ...droid/contactrow/SipAddressHandlerTest.kt
diff --git a/...d/contactrow/StructuredNameBuilderTest.kt → ...d/contactrow/StructuredNameBuilderTest.kt b/...d/contactrow/StructuredNameBuilderTest.kt → ...d/contactrow/StructuredNameBuilderTest.kt
diff --git a/...d/contactrow/StructuredNameHandlerTest.kt → ...d/contactrow/StructuredNameHandlerTest.kt b/...d/contactrow/StructuredNameHandlerTest.kt → ...d/contactrow/StructuredNameHandlerTest.kt
diff --git a/...contactrow/StructuredPostalBuilderTest.kt → ...contactrow/StructuredPostalBuilderTest.kt b/...contactrow/StructuredPostalBuilderTest.kt → ...contactrow/StructuredPostalBuilderTest.kt
diff --git a/...contactrow/StructuredPostalHandlerTest.kt → ...contactrow/StructuredPostalHandlerTest.kt b/...contactrow/StructuredPostalHandlerTest.kt → ...contactrow/StructuredPostalHandlerTest.kt
diff --git a/...4android/contactrow/WebsiteBuilderTest.kt → ...4android/contactrow/WebsiteBuilderTest.kt b/...4android/contactrow/WebsiteBuilderTest.kt → ...4android/contactrow/WebsiteBuilderTest.kt
diff --git a/...4android/contactrow/WebsiteHandlerTest.kt → ...4android/contactrow/WebsiteHandlerTest.kt b/...4android/contactrow/WebsiteHandlerTest.kt → ...4android/contactrow/WebsiteHandlerTest.kt
diff --git a/...ire/vcard4android/impl/TestAddressBook.kt → ...ire/vcard4android/impl/TestAddressBook.kt b/...ire/vcard4android/impl/TestAddressBook.kt → ...ire/vcard4android/impl/TestAddressBook.kt
diff --git a/lib/src/androidTest/resources/large.jpg → src/androidTest/resources/large.jpg b/lib/src/androidTest/resources/large.jpg → src/androidTest/resources/large.jpg
diff --git a/...c/androidTest/resources/large.jpg.LICENSE → src/androidTest/resources/large.jpg.LICENSE b/...c/androidTest/resources/large.jpg.LICENSE → src/androidTest/resources/large.jpg.LICENSE
diff --git a/lib/src/androidTest/resources/small.jpg → src/androidTest/resources/small.jpg b/lib/src/androidTest/resources/small.jpg → src/androidTest/resources/small.jpg
diff --git a/lib/src/androidTest/resources/small.png → src/androidTest/resources/small.png b/lib/src/androidTest/resources/small.png → src/androidTest/resources/small.png
diff --git a/lib/src/main/AndroidManifest.xml → src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml → src/main/AndroidManifest.xml
diff --git a/...tfire/vcard4android/AndroidAddressBook.kt → ...tfire/vcard4android/AndroidAddressBook.kt b/...tfire/vcard4android/AndroidAddressBook.kt → ...tfire/vcard4android/AndroidAddressBook.kt
diff --git a/...t/bitfire/vcard4android/AndroidContact.kt → ...t/bitfire/vcard4android/AndroidContact.kt b/...t/bitfire/vcard4android/AndroidContact.kt → ...t/bitfire/vcard4android/AndroidContact.kt
diff --git a/...re/vcard4android/AndroidContactFactory.kt → ...re/vcard4android/AndroidContactFactory.kt b/...re/vcard4android/AndroidContactFactory.kt → ...re/vcard4android/AndroidContactFactory.kt
diff --git a/.../at/bitfire/vcard4android/AndroidGroup.kt → .../at/bitfire/vcard4android/AndroidGroup.kt b/.../at/bitfire/vcard4android/AndroidGroup.kt → .../at/bitfire/vcard4android/AndroidGroup.kt
diff --git a/...fire/vcard4android/AndroidGroupFactory.kt → ...fire/vcard4android/AndroidGroupFactory.kt b/...fire/vcard4android/AndroidGroupFactory.kt → ...fire/vcard4android/AndroidGroupFactory.kt
diff --git a/...t/bitfire/vcard4android/BatchOperation.kt → ...t/bitfire/vcard4android/BatchOperation.kt b/...t/bitfire/vcard4android/BatchOperation.kt → ...t/bitfire/vcard4android/BatchOperation.kt
diff --git a/...re/vcard4android/CachedGroupMembership.kt → ...re/vcard4android/CachedGroupMembership.kt b/...re/vcard4android/CachedGroupMembership.kt → ...re/vcard4android/CachedGroupMembership.kt
diff --git a/...otlin/at/bitfire/vcard4android/Contact.kt → ...otlin/at/bitfire/vcard4android/Contact.kt b/...otlin/at/bitfire/vcard4android/Contact.kt → ...otlin/at/bitfire/vcard4android/Contact.kt
diff --git a/...at/bitfire/vcard4android/ContactReader.kt → ...at/bitfire/vcard4android/ContactReader.kt b/...at/bitfire/vcard4android/ContactReader.kt → ...at/bitfire/vcard4android/ContactReader.kt
diff --git a/...at/bitfire/vcard4android/ContactWriter.kt → ...at/bitfire/vcard4android/ContactWriter.kt b/...at/bitfire/vcard4android/ContactWriter.kt → ...at/bitfire/vcard4android/ContactWriter.kt
diff --git a/...vcard4android/ContactsStorageException.kt → ...vcard4android/ContactsStorageException.kt b/...vcard4android/ContactsStorageException.kt → ...vcard4android/ContactsStorageException.kt
diff --git a/...n/at/bitfire/vcard4android/GroupMethod.kt → ...n/at/bitfire/vcard4android/GroupMethod.kt b/...n/at/bitfire/vcard4android/GroupMethod.kt → ...n/at/bitfire/vcard4android/GroupMethod.kt
diff --git a/.../bitfire/vcard4android/LabeledProperty.kt → .../bitfire/vcard4android/LabeledProperty.kt b/.../bitfire/vcard4android/LabeledProperty.kt → .../bitfire/vcard4android/LabeledProperty.kt
diff --git a/.../kotlin/at/bitfire/vcard4android/Utils.kt → .../kotlin/at/bitfire/vcard4android/Utils.kt b/.../kotlin/at/bitfire/vcard4android/Utils.kt → .../kotlin/at/bitfire/vcard4android/Utils.kt
diff --git a/...rd4android/contactrow/ContactProcessor.kt → ...rd4android/contactrow/ContactProcessor.kt b/...rd4android/contactrow/ContactProcessor.kt → ...rd4android/contactrow/ContactProcessor.kt
diff --git a/...card4android/contactrow/DataRowBuilder.kt → ...card4android/contactrow/DataRowBuilder.kt b/...card4android/contactrow/DataRowBuilder.kt → ...card4android/contactrow/DataRowBuilder.kt
diff --git a/...card4android/contactrow/DataRowHandler.kt → ...card4android/contactrow/DataRowHandler.kt b/...card4android/contactrow/DataRowHandler.kt → ...card4android/contactrow/DataRowHandler.kt
diff --git a/.../vcard4android/contactrow/EmailBuilder.kt → .../vcard4android/contactrow/EmailBuilder.kt b/.../vcard4android/contactrow/EmailBuilder.kt → .../vcard4android/contactrow/EmailBuilder.kt
diff --git a/.../vcard4android/contactrow/EmailHandler.kt → .../vcard4android/contactrow/EmailHandler.kt b/.../vcard4android/contactrow/EmailHandler.kt → .../vcard4android/contactrow/EmailHandler.kt
diff --git a/.../vcard4android/contactrow/EventBuilder.kt → .../vcard4android/contactrow/EventBuilder.kt b/.../vcard4android/contactrow/EventBuilder.kt → .../vcard4android/contactrow/EventBuilder.kt
diff --git a/.../vcard4android/contactrow/EventHandler.kt → .../vcard4android/contactrow/EventHandler.kt b/.../vcard4android/contactrow/EventHandler.kt → .../vcard4android/contactrow/EventHandler.kt
diff --git a/...ire/vcard4android/contactrow/ImBuilder.kt → ...ire/vcard4android/contactrow/ImBuilder.kt b/...ire/vcard4android/contactrow/ImBuilder.kt → ...ire/vcard4android/contactrow/ImBuilder.kt
diff --git a/...ire/vcard4android/contactrow/ImHandler.kt → ...ire/vcard4android/contactrow/ImHandler.kt b/...ire/vcard4android/contactrow/ImHandler.kt → ...ire/vcard4android/contactrow/ImHandler.kt
diff --git a/...ard4android/contactrow/NicknameBuilder.kt → ...ard4android/contactrow/NicknameBuilder.kt b/...ard4android/contactrow/NicknameBuilder.kt → ...ard4android/contactrow/NicknameBuilder.kt
diff --git a/...ard4android/contactrow/NicknameHandler.kt → ...ard4android/contactrow/NicknameHandler.kt b/...ard4android/contactrow/NicknameHandler.kt → ...ard4android/contactrow/NicknameHandler.kt
diff --git a/...e/vcard4android/contactrow/NoteBuilder.kt → ...e/vcard4android/contactrow/NoteBuilder.kt b/...e/vcard4android/contactrow/NoteBuilder.kt → ...e/vcard4android/contactrow/NoteBuilder.kt
diff --git a/...e/vcard4android/contactrow/NoteHandler.kt → ...e/vcard4android/contactrow/NoteHandler.kt b/...e/vcard4android/contactrow/NoteHandler.kt → ...e/vcard4android/contactrow/NoteHandler.kt
diff --git a/...android/contactrow/OrganizationBuilder.kt → ...android/contactrow/OrganizationBuilder.kt b/...android/contactrow/OrganizationBuilder.kt → ...android/contactrow/OrganizationBuilder.kt
diff --git a/...android/contactrow/OrganizationHandler.kt → ...android/contactrow/OrganizationHandler.kt b/...android/contactrow/OrganizationHandler.kt → ...android/contactrow/OrganizationHandler.kt
diff --git a/.../vcard4android/contactrow/PhoneBuilder.kt → .../vcard4android/contactrow/PhoneBuilder.kt b/.../vcard4android/contactrow/PhoneBuilder.kt → .../vcard4android/contactrow/PhoneBuilder.kt
diff --git a/.../vcard4android/contactrow/PhoneHandler.kt → .../vcard4android/contactrow/PhoneHandler.kt b/.../vcard4android/contactrow/PhoneHandler.kt → .../vcard4android/contactrow/PhoneHandler.kt
diff --git a/.../vcard4android/contactrow/PhotoBuilder.kt → .../vcard4android/contactrow/PhotoBuilder.kt b/.../vcard4android/contactrow/PhotoBuilder.kt → .../vcard4android/contactrow/PhotoBuilder.kt
diff --git a/.../vcard4android/contactrow/PhotoHandler.kt → .../vcard4android/contactrow/PhotoHandler.kt b/.../vcard4android/contactrow/PhotoHandler.kt → .../vcard4android/contactrow/PhotoHandler.kt
diff --git a/...ard4android/contactrow/RelationBuilder.kt → ...ard4android/contactrow/RelationBuilder.kt b/...ard4android/contactrow/RelationBuilder.kt → ...ard4android/contactrow/RelationBuilder.kt
diff --git a/...ard4android/contactrow/RelationHandler.kt → ...ard4android/contactrow/RelationHandler.kt b/...ard4android/contactrow/RelationHandler.kt → ...ard4android/contactrow/RelationHandler.kt
diff --git a/...d4android/contactrow/SipAddressBuilder.kt → ...d4android/contactrow/SipAddressBuilder.kt b/...d4android/contactrow/SipAddressBuilder.kt → ...d4android/contactrow/SipAddressBuilder.kt
diff --git a/...d4android/contactrow/SipAddressHandler.kt → ...d4android/contactrow/SipAddressHandler.kt b/...d4android/contactrow/SipAddressHandler.kt → ...d4android/contactrow/SipAddressHandler.kt
diff --git a/...droid/contactrow/StructuredNameBuilder.kt → ...droid/contactrow/StructuredNameBuilder.kt b/...droid/contactrow/StructuredNameBuilder.kt → ...droid/contactrow/StructuredNameBuilder.kt
diff --git a/...droid/contactrow/StructuredNameHandler.kt → ...droid/contactrow/StructuredNameHandler.kt b/...droid/contactrow/StructuredNameHandler.kt → ...droid/contactrow/StructuredNameHandler.kt
diff --git a/...oid/contactrow/StructuredPostalBuilder.kt → ...oid/contactrow/StructuredPostalBuilder.kt b/...oid/contactrow/StructuredPostalBuilder.kt → ...oid/contactrow/StructuredPostalBuilder.kt
diff --git a/...oid/contactrow/StructuredPostalHandler.kt → ...oid/contactrow/StructuredPostalHandler.kt b/...oid/contactrow/StructuredPostalHandler.kt → ...oid/contactrow/StructuredPostalHandler.kt
diff --git a/...card4android/contactrow/WebsiteBuilder.kt → ...card4android/contactrow/WebsiteBuilder.kt b/...card4android/contactrow/WebsiteBuilder.kt → ...card4android/contactrow/WebsiteBuilder.kt
diff --git a/...card4android/contactrow/WebsiteHandler.kt → ...card4android/contactrow/WebsiteHandler.kt b/...card4android/contactrow/WebsiteHandler.kt → ...card4android/contactrow/WebsiteHandler.kt
diff --git a/...e/vcard4android/property/CustomScribes.kt → ...e/vcard4android/property/CustomScribes.kt b/...e/vcard4android/property/CustomScribes.kt → ...e/vcard4android/property/CustomScribes.kt
diff --git a/...fire/vcard4android/property/CustomType.kt → ...fire/vcard4android/property/CustomType.kt b/...fire/vcard4android/property/CustomType.kt → ...fire/vcard4android/property/CustomType.kt
diff --git a/...bitfire/vcard4android/property/XAbDate.kt → ...bitfire/vcard4android/property/XAbDate.kt b/...bitfire/vcard4android/property/XAbDate.kt → ...bitfire/vcard4android/property/XAbDate.kt
diff --git a/...itfire/vcard4android/property/XAbLabel.kt → ...itfire/vcard4android/property/XAbLabel.kt b/...itfire/vcard4android/property/XAbLabel.kt → ...itfire/vcard4android/property/XAbLabel.kt
diff --git a/...vcard4android/property/XAbRelatedNames.kt → ...vcard4android/property/XAbRelatedNames.kt b/...vcard4android/property/XAbRelatedNames.kt → ...vcard4android/property/XAbRelatedNames.kt
diff --git a/...ndroid/property/XAddressBookServerKind.kt → ...ndroid/property/XAddressBookServerKind.kt b/...ndroid/property/XAddressBookServerKind.kt → ...ndroid/property/XAddressBookServerKind.kt
diff --git a/...roid/property/XAddressBookServerMember.kt → ...roid/property/XAddressBookServerMember.kt b/...roid/property/XAddressBookServerMember.kt → ...roid/property/XAddressBookServerMember.kt
diff --git a/...rd4android/property/XPhoneticFirstName.kt → ...rd4android/property/XPhoneticFirstName.kt b/...rd4android/property/XPhoneticFirstName.kt → ...rd4android/property/XPhoneticFirstName.kt
diff --git a/...ard4android/property/XPhoneticLastName.kt → ...ard4android/property/XPhoneticLastName.kt b/...ard4android/property/XPhoneticLastName.kt → ...ard4android/property/XPhoneticLastName.kt
diff --git a/...d4android/property/XPhoneticMiddleName.kt → ...d4android/property/XPhoneticMiddleName.kt b/...d4android/property/XPhoneticMiddleName.kt → ...d4android/property/XPhoneticMiddleName.kt
diff --git a/...at/bitfire/vcard4android/property/XSip.kt → ...at/bitfire/vcard4android/property/XSip.kt b/...at/bitfire/vcard4android/property/XSip.kt → ...at/bitfire/vcard4android/property/XSip.kt
diff --git a/lib/src/main/res/values/about_strings.xml → src/main/res/values/about_strings.xml b/lib/src/main/res/values/about_strings.xml → src/main/res/values/about_strings.xml
diff --git a/...itfire/vcard4android/ContactReaderTest.kt → ...itfire/vcard4android/ContactReaderTest.kt b/...itfire/vcard4android/ContactReaderTest.kt → ...itfire/vcard4android/ContactReaderTest.kt
diff --git a/...n/at/bitfire/vcard4android/ContactTest.kt → ...n/at/bitfire/vcard4android/ContactTest.kt b/...n/at/bitfire/vcard4android/ContactTest.kt → ...n/at/bitfire/vcard4android/ContactTest.kt
diff --git a/...itfire/vcard4android/ContactWriterTest.kt → ...itfire/vcard4android/ContactWriterTest.kt b/...itfire/vcard4android/ContactWriterTest.kt → ...itfire/vcard4android/ContactWriterTest.kt
diff --git a/...n/at/bitfire/vcard4android/EzVCardTest.kt → ...n/at/bitfire/vcard4android/EzVCardTest.kt b/...n/at/bitfire/vcard4android/EzVCardTest.kt → ...n/at/bitfire/vcard4android/EzVCardTest.kt
diff --git a/...lin/at/bitfire/vcard4android/UtilsTest.kt → ...lin/at/bitfire/vcard4android/UtilsTest.kt b/...lin/at/bitfire/vcard4android/UtilsTest.kt → ...lin/at/bitfire/vcard4android/UtilsTest.kt
diff --git a/lib/src/test/resources/allfields-vcard3.vcf → src/test/resources/allfields-vcard3.vcf b/lib/src/test/resources/allfields-vcard3.vcf → src/test/resources/allfields-vcard3.vcf
diff --git a/lib/src/test/resources/lol.jpg → src/test/resources/lol.jpg b/lib/src/test/resources/lol.jpg → src/test/resources/lol.jpg
diff --git a/lib/src/test/resources/strange-rev.vcf → src/test/resources/strange-rev.vcf b/lib/src/test/resources/strange-rev.vcf → 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/...ources/unknown-properties-with-labels.vcf → ...ources/unknown-properties-with-labels.vcf b/...ources/unknown-properties-with-labels.vcf → ...ources/unknown-properties-with-labels.vcf
diff --git a/lib/src/test/resources/vcard4.vcf → src/test/resources/vcard4.vcf b/lib/src/test/resources/vcard4.vcf → src/test/resources/vcard4.vcf