Merge pull request #117 from undroid-dew/patch-1

Fix passing of formatted string vararg
KakaoCup · Feb 6, 2024 · 99cd7c1 · 99cd7c1
2 parents 92fad75 + 4090497
commit 99cd7c1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/buildSrc/src/main/kotlin/convention.library.gradle.kts b/buildSrc/src/main/kotlin/convention.library.gradle.kts
@@ -3,7 +3,3 @@ plugins {
     id("convention.android-base")
     id("convention.kotlin")
 }
-
-android {
-    packaging.resources.excludes.add("META-INF/*")
-}
diff --git a/buildSrc/src/main/kotlin/convention.publishing.gradle.kts b/buildSrc/src/main/kotlin/convention.publishing.gradle.kts
@@ -32,7 +32,7 @@ configure<PublishingExtension> {
             pom {
                 name.set(project.name)
                 url.set("https://github.com/KakaoCup/Kakao")
-                description.set(project.description)
+                description.set(project.description ?: "Nice and simple DSL for Espresso in Kotlin")
 
                 licenses {
                     license {

diff --git a/kakao/src/main/kotlin/io/github/kakaocup/kakao/common/utilities/ContextUtils.kt b/kakao/src/main/kotlin/io/github/kakaocup/kakao/common/utilities/ContextUtils.kt
@@ -11,7 +11,7 @@ fun getResourceString(@StringRes resId: Int) =
     InstrumentationRegistry.getInstrumentation().targetContext.resources.getString(resId)
 
 fun getResourceString(@StringRes resId: Int, vararg args: Any) =
-    InstrumentationRegistry.getInstrumentation().targetContext.resources.getString(resId, args)
+    InstrumentationRegistry.getInstrumentation().targetContext.resources.getString(resId, *args)
 
 fun getQuantityString(@PluralsRes resId: Int, quantity: Int) =
     InstrumentationRegistry.getInstrumentation().targetContext.resources.getQuantityString(resId, quantity)

diff --git a/kakao/version b/kakao/version
@@ -1 +1 @@
-3.5.0
+3.5.1