Don't limit name arguments to String

rewe-digital · Jan 29, 2020 · cf13736 · cf13736
1 parent 16fdc8e
commit cf13736
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Version 1.12.1
+
+_2020-01-29_
+
+* Bugfix: `alias()` & set-related `get()` name arguments were limited to `String` but should be `Any`
+
 ## Version 1.12.0
 
 _2020-01-27_

diff --git a/Getting Started.md b/Getting Started.md
@@ -191,9 +191,9 @@ a repository to your project. Then add the following dependencies:
 
 ```gradle
 dependencies {
-    implementation 'org.rewedigital.katana:katana-core:1.12.0'
+    implementation 'org.rewedigital.katana:katana-core:1.12.1'
     // Use this artifact for Katana on Android
-    implementation 'org.rewedigital.katana:katana-android:1.12.0'
+    implementation 'org.rewedigital.katana:katana-android:1.12.1'
 }
 ```
 
diff --git a/android-example/build.gradle.kts b/android-example/build.gradle.kts
@@ -22,16 +22,16 @@ android {
 
         applicationId = "org.rewedigital.katana.android.example"
         versionCode = 1
-        versionName = "1.12.0"
+        versionName = "1.12.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 }
 
 dependencies {
-    implementation("org.rewedigital.katana:katana-android:1.12.0")
-    implementation("org.rewedigital.katana:katana-androidx-fragment:1.12.0")
-    implementation("org.rewedigital.katana:katana-androidx-viewmodel-savedstate:1.12.0")
+    implementation("org.rewedigital.katana:katana-android:1.12.1")
+    implementation("org.rewedigital.katana:katana-androidx-fragment:1.12.1")
+    implementation("org.rewedigital.katana:katana-androidx-viewmodel-savedstate:1.12.1")
     implementation("androidx.appcompat:appcompat:1.1.0")
     implementation("androidx.constraintlayout:constraintlayout:1.1.3")
     implementation("org.jetbrains.kotlin:kotlin-reflect:1.3.61")

diff --git a/buildSrc/src/main/kotlin/BaseProject.kt b/buildSrc/src/main/kotlin/BaseProject.kt
@@ -39,7 +39,7 @@ fun Project.configureBase(
     }
 
     group = "org.rewedigital.katana"
-    version = "1.12.0"
+    version = "1.12.1"
 
     tasks.withType<Jar> {
         archiveBaseName.set(artifactName)

diff --git a/core/src/main/kotlin/org/rewedigital/katana/dsl/Dsl.kt b/core/src/main/kotlin/org/rewedigital/katana/dsl/Dsl.kt
@@ -86,8 +86,8 @@ inline fun <reified T> ModuleBindingContext.eagerSingleton(
  * A binding like `alias<MyInterface, MyClass>()` should be conceived as "create alias MyInterface for MyClass".
  */
 inline fun <reified A, reified T : A> ModuleBindingContext.alias(
-    name: String? = null,
-    originalName: String? = null
+    name: Any? = null,
+    originalName: Any? = null
 ) {
     factory<A>(name = name) { get<T>(name = originalName) }
 }
@@ -197,7 +197,7 @@ inline fun <reified T> SetBindingContext<T>.singleton(
  * @param V type of the value added to the set
  */
 inline fun <T, reified V : T> SetBindingContext<T>.get(
-    name: String? = null
+    name: Any? = null
 ) = declaration(
     context = this,
     clazz = V::class.java,