🐳 chore: Upgrade deps for Android V8

caoccao · Oct 3, 2024 · 168c132 · 168c132
1 parent 5af51b2
commit 168c132
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/android_v8/app/build.gradle.kts b/android_v8/app/build.gradle.kts
@@ -21,22 +21,18 @@ plugins {
 
 object Config {
     object Projects {
-        // https://mvnrepository.com/artifact/net.bytebuddy/byte-buddy
-        const val BYTE_BUDDY = "net.bytebuddy:byte-buddy:${Versions.BYTE_BUDDY}"
-
         const val JAVENODE = "com.caoccao.javet:javenode:${Versions.JAVENODE}"
-        const val JAVET__GROUP = "com.caoccao.javet"
-        const val JAVET__MODULE = "javet"
         const val JAVET_ANDROID = "com.caoccao.javet:javet-android-v8:${Versions.JAVET}"
+        const val JAVET_BUDDY = "com.caoccao.javet.buddy:javet-buddy:${Versions.JAVET_BUDDY}"
 
         // https://mvnrepository.com/artifact/io.vertx/vertx-core
         const val VERTX = "io.vertx:vertx-core:${Versions.VERTX}"
     }
 
     object Versions {
-        const val BYTE_BUDDY = "1.14.10"
-        const val JAVENODE = "0.7.0"
-        const val JAVET = "3.1.6"
+        const val JAVENODE = "0.8.0"
+        const val JAVET = "3.1.8"
+        const val JAVET_BUDDY = "0.2.0"
         const val JETTY_WEBSOCKET = "9.4.53.v20231009"
         const val VERTX = "4.5.0"
     }
@@ -101,11 +97,9 @@ dependencies {
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
-    implementation(Config.Projects.BYTE_BUDDY)
-    implementation(Config.Projects.JAVENODE) {
-        exclude(group = Config.Projects.JAVET__GROUP, module = Config.Projects.JAVET__MODULE)
-    }
+    implementation(Config.Projects.JAVENODE)
     implementation(Config.Projects.JAVET_ANDROID)
+    implementation(Config.Projects.JAVET_BUDDY)
     implementation(Config.Projects.VERTX)
     // implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.aar"))))
     // implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))

diff --git a/android_v8/app/src/main/java/com/caoccao/javet/shell/MainActivity.kt b/android_v8/app/src/main/java/com/caoccao/javet/shell/MainActivity.kt
@@ -62,11 +62,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.caoccao.javet.buddy.interop.proxy.JavetReflectionObjectFactory
 import com.caoccao.javet.interop.V8Host
 import com.caoccao.javet.interop.V8Runtime
 import com.caoccao.javet.interop.converters.JavetProxyConverter
 import com.caoccao.javet.interop.loader.JavetLibLoader
-import com.caoccao.javet.interop.proxy.JavetReflectionObjectFactory
 import com.caoccao.javet.javenode.JNEventLoop
 import com.caoccao.javet.javenode.enums.JNModuleType
 import com.caoccao.javet.shell.ui.theme.JavetShellTheme