From b542103c68d4fb679e2cd16ce1d936bb07056c9d Mon Sep 17 00:00:00 2001 From: Anton Malinskiy Date: Mon, 25 Oct 2021 12:16:36 +1100 Subject: [PATCH 1/2] fix(annotation-producer): fix duplicated annotation --- .../adam/junit4/android/listener/TestAnnotationProducer.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android-junit4-test-annotation-producer/src/main/kotlin/com/malinskiy/adam/junit4/android/listener/TestAnnotationProducer.kt b/android-junit4-test-annotation-producer/src/main/kotlin/com/malinskiy/adam/junit4/android/listener/TestAnnotationProducer.kt index 08da01e57..292874e4a 100644 --- a/android-junit4-test-annotation-producer/src/main/kotlin/com/malinskiy/adam/junit4/android/listener/TestAnnotationProducer.kt +++ b/android-junit4-test-annotation-producer/src/main/kotlin/com/malinskiy/adam/junit4/android/listener/TestAnnotationProducer.kt @@ -46,13 +46,13 @@ class TestAnnotationProducer : RunListener() { override fun testStarted(description: Description?) { super.testStarted(description) if (description?.isTest == true) { - val annotations: List = + val annotations: Set = (description.annotations.toList() + description.testClass.annotations.toList()).mapNotNull { annotation -> val fqn = annotation.annotationClass.qualifiedName val parameters = annotation.annotationClass.memberProperties.joinToString(separator = ":") { "${it.name}=${it.getter.call(annotation)}" } "$fqn($parameters)" - } + }.toSet() val bundle = Bundle(1) bundle.putStringArrayList( "com.malinskiy.adam.junit4.android.listener.TestAnnotationProducer.v2", From d46283f4c898ebc8dcd9fb33eb503a43fb2b8a4a Mon Sep 17 00:00:00 2001 From: Anton Malinskiy Date: Mon, 25 Oct 2021 12:16:53 +1100 Subject: [PATCH 2/2] chore(release): bump version --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 1dea3fca3..151d08b5c 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,5 +1,5 @@ object Versions { - val adam = System.getenv("GIT_TAG_NAME") ?: "0.3.4" + val adam = System.getenv("GIT_TAG_NAME") ?: "0.4.2" val kotlin = "1.5.21" val coroutines = "1.5.2" val coroutinesDebug = coroutines