Migrate layoutlib to Android official version 15.0.3

johnsonlee · Oct 4, 2024 · a1d4488 · a1d4488
1 parent ab3588e
commit a1d4488
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,12 +21,12 @@ dependencies {
     api(libs.android.tools.build.aapt2.proto)
     api(libs.android.tools.common)
     api(libs.android.tools.external.intellij.core)
+    api(libs.android.tools.layoutlib)
     api(libs.android.tools.layoutlib.api)
     api(libs.android.tools.sdk.common)
     api(libs.androidx.lifecycle.common.java8)
     api(libs.jackson.databind)
     api(libs.kxml2)
-    api(libs.layoutlib.native.jdk11)
     api(libs.okio)
     api(libs.protobuf)
     api(libs.slf4j.api)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ android-tools = "31.1.2"
 androidx-lifecycle = "2.6.2"
 jackson = "2.13.4"
 kxml2 = "2.3.0"
-layoutlib = "2022.3.1-5e972ea"
+layoutlib = "15.0.3"
 slf4j = "1.7.36"
 okio = "3.4.0"
 protobuf = "3.19.3"
@@ -15,12 +15,14 @@ android-tools-build-aapt2-proto = { module = "com.android.tools.build:aapt2-prot
 android-tools-common = { module = "com.android.tools:common", version.ref = "android-tools" }
 android-tools-external-intellij-core = { module = "com.android.tools.external.com-intellij:intellij-core", version.ref = "android-tools" }
 android-tools-layoutlib-api = { module = "com.android.tools.layoutlib:layoutlib-api", version.ref = "android-tools" }
+android-tools-layoutlib = { module = "com.android.tools.layoutlib:layoutlib", version.ref = "layoutlib" }
+android-tools-layoutlib-resources = { module = "com.android.tools.layoutlib:layoutlib-resources", version.ref = "layoutlib" }
+android-tools-layoutlib-runtime = { module = "com.android.tools.layoutlib:layoutlib-runtime", version.ref = "layoutlib" }
 android-tools-ninepatch = { module = "com.android.tools:ninepatch", version.ref = "android-tools" }
 android-tools-sdk-common = { module = "com.android.tools:sdk-common", version.ref = "android-tools" }
 androidx-lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "androidx-lifecycle" }
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
 kxml2 = { module = "net.sf.kxml:kxml2", version.ref = "kxml2" }
-layoutlib-native-jdk11 = { module = "io.johnsonlee:layoutlib-native-jdk11", version.ref = "layoutlib" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 okio = { module = "com.squareup.okio:okio-jvm", version.ref = "okio" }
 protobuf = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
diff --git a/src/main/kotlin/io/johnsonlee/playground/sandbox/Sandbox.kt b/src/main/kotlin/io/johnsonlee/playground/sandbox/Sandbox.kt
@@ -109,7 +109,7 @@ class Sandbox(private val environment: Environment) : Closeable {
             mCallbacksRunning.setBoolean(choreographer, true)
 
             synchronized(sessionInteractiveData) {
-                Handler_Delegate.executeCallbacks()
+                Handler_Delegate.executeCallbacks(frameNanos)
             }
 
             val currentTimeMs = SystemClock_Delegate.uptimeMillis()