From 5958e7a4ae4329dbc3a31c85ed4234d6abc56bd9 Mon Sep 17 00:00:00 2001
From: fankesyooni <qzmmcn@163.com>
Date: Sun, 6 Jul 2025 21:02:53 +0800
Subject: [PATCH] refactor: update KavaRef usage to 1.0.1

---
 gradle/sweet-dependency/sweet-dependency-config.yaml          | 4 ++--
 .../src/main/java/com/highcapable/hikage/core/Hikage.kt       | 3 ++-
 .../main/java/com/highcapable/hikage/extension/PopupWindow.kt | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gradle/sweet-dependency/sweet-dependency-config.yaml b/gradle/sweet-dependency/sweet-dependency-config.yaml
index fb9adef..417096e 100644
--- a/gradle/sweet-dependency/sweet-dependency-config.yaml
+++ b/gradle/sweet-dependency/sweet-dependency-config.yaml
@@ -69,9 +69,9 @@ libraries:
       version: 6.1
   com.highcapable.kavaref:
     kavaref-core:
-      version: 1.0.0
+      version: 1.0.1
     kavaref-extension:
-      version: 1.0.0
+      version: 1.0.1
   com.highcapable.pangutext:
     pangutext-android:
       version: 1.0.2
diff --git a/hikage-core/src/main/java/com/highcapable/hikage/core/Hikage.kt b/hikage-core/src/main/java/com/highcapable/hikage/core/Hikage.kt
index 6fdf889..62d1fc2 100644
--- a/hikage-core/src/main/java/com/highcapable/hikage/core/Hikage.kt
+++ b/hikage-core/src/main/java/com/highcapable/hikage/core/Hikage.kt
@@ -61,6 +61,7 @@ import com.highcapable.hikage.core.base.HikageView
 import com.highcapable.hikage.core.base.PerformerException
 import com.highcapable.hikage.core.base.ProvideException
 import com.highcapable.hikage.core.extension.ResourcesScope
+import com.highcapable.kavaref.KavaRef.Companion.asResolver
 import com.highcapable.kavaref.KavaRef.Companion.resolve
 import com.highcapable.kavaref.extension.classOf
 import com.highcapable.kavaref.extension.createInstanceOrNull
@@ -892,7 +893,7 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
          */
         private fun createDefaultLayoutParams(lparams: ViewGroup.LayoutParams? = null): ViewGroup.LayoutParams {
             val wrapped = lparams?.let {
-                parent?.resolve()?.optional(silent = true)?.firstMethodOrNull {
+                parent?.asResolver()?.optional(silent = true)?.firstMethodOrNull {
                     name = "generateLayoutParams"
                     parameters(ViewGroup.LayoutParams::class)
                     superclass()
diff --git a/hikage-extension/src/main/java/com/highcapable/hikage/extension/PopupWindow.kt b/hikage-extension/src/main/java/com/highcapable/hikage/extension/PopupWindow.kt
index baaa36b..7eea3fe 100644
--- a/hikage-extension/src/main/java/com/highcapable/hikage/extension/PopupWindow.kt
+++ b/hikage-extension/src/main/java/com/highcapable/hikage/extension/PopupWindow.kt
@@ -31,7 +31,7 @@ import com.highcapable.hikage.core.Hikage
 import com.highcapable.hikage.core.base.HikageFactoryBuilder
 import com.highcapable.hikage.core.base.HikagePerformer
 import com.highcapable.hikage.core.base.Hikageable
-import com.highcapable.kavaref.KavaRef.Companion.resolve
+import com.highcapable.kavaref.KavaRef.Companion.asResolver
 
 /**
  * @see PopupWindow.setContentView
@@ -67,5 +67,5 @@ fun PopupWindow.setContentView(
  * @return [Context]
  */
 private fun PopupWindow.requireContext() =
-    resolve().optional(silent = true).firstFieldOrNull { name = "mContext" }?.getQuietly<Context>()
+    asResolver().optional(silent = true).firstFieldOrNull { name = "mContext" }?.getQuietly<Context>()
         ?: error("Hikage need a Context to create PopupWindow content view.")
\ No newline at end of file