Update to ez-vcard 0.12.0 (#12) (ebed43ef) · Commits · e / os / vcard4android

build.gradle

+5 −2

Original line number	Diff line number	Diff line
		@@ -33,13 +33,15 @@ android {
		buildToolsVersion '33.0.2'

		defaultConfig {
		minSdkVersion 19 // Android 4.4
		minSdkVersion 21 // Android 5.0
		targetSdkVersion 32 // Android 12v2
		}

		compileOptions {
		sourceCompatibility JavaVersion.VERSION_1_8
		targetCompatibility JavaVersion.VERSION_1_8

		coreLibraryDesugaringEnabled true
		}

		namespace 'at.bitfire.vcard4android'
		@@ -66,6 +68,7 @@ android {

		dependencies {
		implementation "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"
		coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")

		implementation 'androidx.annotation:annotation:1.6.0'
		// noinspection GradleDependency
		@@ -74,7 +77,7 @@ dependencies {
		implementation "org.apache.commons:commons-text:${versions.commonsText}"

		// ez-vcard to parse/generate vCards
		api('com.googlecode.ez-vcard:ez-vcard:0.11.3') { // 0.12.0 requires Java 8, may imply minSdkVersion 26
		api('com.googlecode.ez-vcard:ez-vcard:0.12.0') { // requires Java 8
		// hCard functionality not needed
		exclude group: 'org.jsoup'
		exclude group: 'org.freemarker'

src/androidTest/java/at/bitfire/vcard4android/AndroidContactTest.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ import org.junit.*
		import org.junit.Assert.*
		import java.io.ByteArrayOutputStream
		import java.io.StringReader
		import java.text.SimpleDateFormat
		import java.time.LocalDate

		class AndroidContactTest {

		@@ -71,7 +71,7 @@ class AndroidContactTest {
		vcard.phoneticGivenName = "Först"
		vcard.phoneticMiddleName = "Mittelerde"
		vcard.phoneticFamilyName = "Fämilie"
		vcard.birthDay = Birthday(SimpleDateFormat("yyyy-MM-dd").parse("1980-04-16"))
		vcard.birthDay = Birthday(LocalDate.parse("1980-04-16"))
		vcard.customDates += LabeledProperty(XAbDate(PartialDate.parse("--0102")), "Custom Date")
		vcard.photo = samplePhoto

src/androidTest/java/at/bitfire/vcard4android/contactrow/DataRowBuilderTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ package at.bitfire.vcard4android.contactrow
		import android.net.Uri
		import at.bitfire.vcard4android.BatchOperation
		import at.bitfire.vcard4android.Contact
		import org.junit.Assert.*
		import org.junit.Assert.assertEquals
		import org.junit.Test
		import java.util.*

src/androidTest/java/at/bitfire/vcard4android/contactrow/EventBuilderTest.kt

+20 −20

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ import ezvcard.property.Birthday
		import ezvcard.util.PartialDate
		import org.junit.Assert.assertEquals
		import org.junit.Test
		import java.util.*
		import java.time.LocalDate

		class EventBuilderTest {

		@@ -29,9 +29,9 @@ class EventBuilderTest {
		@Test
		fun testStartDate_FullDate() {
		EventBuilder(Uri.EMPTY, null, Contact().apply {
		anniversary = Anniversary(Calendar.getInstance().apply {
		set(1984, /* zero-based */ 7, 20)
		})
		anniversary = Anniversary(
		LocalDate.of(1984, 8, 20)
		)
		}, false).build().also { result ->
		assertEquals(1, result.size)
		assertEquals("1984-08-20", result[0].values[CommonDataKinds.Event.START_DATE])
		@@ -39,27 +39,27 @@ class EventBuilderTest {
		}
		}

		// TODO enable test as soon as https://github.com/mangstadt/ez-vcard/issues/113 is fixed
		/*@Test()

		@Test
		fun testStartDate_PartialDate() {
		EventBuilder(Uri.EMPTY, null, Contact().apply {
		anniversary = Anniversary(PartialDate.builder()
		.date(20)
		.month(8)
		.build())
		}).build().also { result ->
		}, true).build().also { result ->
		assertEquals(1, result.size)
		assertEquals("--08-20", result[0].values[CommonDataKinds.Event.START_DATE])
		}
		}*/
		}


		@Test
		fun testBirthday_FullDate() {
		EventBuilder(Uri.EMPTY, null, Contact().apply {
		anniversary = Anniversary(Calendar.getInstance().apply {
		set(1984, /* zero-based */ 7, 20)
		})
		anniversary = Anniversary(
		LocalDate.of(1984, 8, 20)
		)
		}, false).build().also { result ->
		assertEquals(1, result.size)
		assertEquals("1984-08-20", result[0].values[CommonDataKinds.Event.START_DATE])
		@@ -84,9 +84,9 @@ class EventBuilderTest {
		@Test
		fun testMimeType() {
		val c = Contact().apply {
		anniversary = Anniversary(Calendar.getInstance().apply {
		set(1984, /* zero-based */ 7, 20)
		})
		anniversary = Anniversary(
		LocalDate.of(1984, /* zero-based */ 7, 20)
		)
		}
		EventBuilder(Uri.EMPTY, null, c, false).build().also { result ->
		assertEquals(CommonDataKinds.Event.CONTENT_ITEM_TYPE, result[0].values[CommonDataKinds.Event.MIMETYPE])
		@@ -97,9 +97,9 @@ class EventBuilderTest {
		@Test
		fun testType_Anniversary() {
		EventBuilder(Uri.EMPTY, null, Contact().apply {
		anniversary = Anniversary(Calendar.getInstance().apply {
		set(1984, /* zero-based */ 7, 20)
		})
		anniversary = Anniversary(
		LocalDate.of(1984, /* zero-based */ 7, 20)
		)
		}, false).build().also { result ->
		assertEquals(CommonDataKinds.Event.TYPE_ANNIVERSARY, result[0].values[CommonDataKinds.Event.TYPE])
		}
		@@ -108,9 +108,9 @@ class EventBuilderTest {
		@Test
		fun testType_Birthday() {
		EventBuilder(Uri.EMPTY, null, Contact().apply {
		birthDay = Birthday(Calendar.getInstance().apply {
		set(1984, /* zero-based */ 7, 20)
		})
		birthDay = Birthday(
		LocalDate.of(1984, /* zero-based */ 7, 20)
		)
		}, false).build().also { result ->
		assertEquals(CommonDataKinds.Event.TYPE_BIRTHDAY, result[0].values[CommonDataKinds.Event.TYPE])
		}

src/androidTest/java/at/bitfire/vcard4android/contactrow/EventHandlerTest.kt

+4 −6

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ import at.bitfire.vcard4android.Contact
		import ezvcard.util.PartialDate
		import org.junit.Assert.*
		import org.junit.Test
		import java.util.*
		import java.time.LocalDate

		class EventHandlerTest {

		@@ -32,11 +32,9 @@ class EventHandlerTest {
		put(Event.START_DATE, "1984-08-20")
		}, contact)
		assertEquals(
		Calendar.getInstance().apply {
		set(1984, /* zero-based */7, 20, 0, 0, 0)
		set(Calendar.MILLISECOND, 0)
		}.timeInMillis,
		contact.customDates[0].property.date.time)
		LocalDate.of(1984, 8, 20),
		contact.customDates[0].property.date
		)
		}

		@Test