use Google's published layoutlib

freeletics · Jan 13, 2024 · f4f9e51 · f4f9e51
1 parent 23f0dcd
commit f4f9e51
Show file tree

Hide file tree

Showing 25 changed files with 36 additions and 279 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,11 +11,9 @@ ktlint = "0.50.0"
 moshi = "1.15.0"
 
 minSdk = "25"
-compileSdk = "33"
+compileSdk = "34"
 
-# Maps to this commit: https://android.googlesource.com/platform/prebuilts/studio/layoutlib/+/5e972ea
-layoutlib = "2022.3.1-5e972ea"
-layoutlibPrebuiltSha = "5e972ea"
+layoutlib = "14.0.1"
 
 [libraries]
 androidx-annotations = { module = "androidx.annotation:annotation", version = "1.7.1" }
@@ -45,11 +43,6 @@ ktlint = { module = "com.pinterest.ktlint:ktlint-rule-engine", version.ref = "kt
 
 kxml2 = { module = "kxml2:kxml2", version = "2.3.0" }
 
-layoutlib-native-jdk11 = { module = "app.cash.paparazzi:layoutlib-native-jdk11", version.ref = "layoutlib" }
-layoutlib-native-linux = { module = "app.cash.paparazzi:layoutlib-native-linux", version.ref = "layoutlib" }
-layoutlib-native-macArm = { module = "app.cash.paparazzi:layoutlib-native-macarm", version.ref = "layoutlib" }
-layoutlib-native-macOsX = { module = "app.cash.paparazzi:layoutlib-native-macosx", version.ref = "layoutlib" }
-layoutlib-native-windows = { module = "app.cash.paparazzi:layoutlib-native-win", version.ref = "layoutlib" }
 
 moshi-adapters = { module = "com.squareup.moshi:moshi-adapters", version.ref = "moshi" }
 moshi-core = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }
@@ -58,7 +51,9 @@ moshi-kotlinCodegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", vers
 okio = { module = "com.squareup.okio:okio", version = "3.7.0" }
 
 tools-common = { module = "com.android.tools:common", version.ref = "androidTools" }
-tools-layoutlib = { module = "com.android.tools.layoutlib:layoutlib-api", version = "31.1.1" }
+tools-layoutlib-api = { module = "com.android.tools.layoutlib:layoutlib-api", version = "31.4.0-alpha03" }
+tools-layoutlib = { module = "com.android.tools.layoutlib:layoutlib", version.ref = "layoutlib" }
+tools-layoutlib-runtime = { module = "com.android.tools.layoutlib:layoutlib-runtime", version.ref = "layoutlib" }
 tools-ninepatch = { module = "com.android.tools:ninepatch", version.ref = "androidTools" }
 tools-sdkCommon = { module = "com.android.tools:sdk-common", version.ref = "androidTools" }
 

diff --git a/libs/README.md b/libs/README.md
diff --git a/libs/build.gradle b/libs/build.gradle
diff --git a/libs/layoutlib/build.gradle b/libs/layoutlib/build.gradle
diff --git a/libs/layoutlib/gradle.properties b/libs/layoutlib/gradle.properties
diff --git a/libs/native-linux/build.gradle b/libs/native-linux/build.gradle
diff --git a/libs/native-linux/gradle.properties b/libs/native-linux/gradle.properties
diff --git a/libs/native-macarm/build.gradle b/libs/native-macarm/build.gradle
diff --git a/libs/native-macarm/gradle.properties b/libs/native-macarm/gradle.properties
diff --git a/libs/native-macosx/build.gradle b/libs/native-macosx/build.gradle
diff --git a/libs/native-macosx/gradle.properties b/libs/native-macosx/gradle.properties
diff --git a/libs/native-win/build.gradle b/libs/native-win/build.gradle
diff --git a/libs/native-win/gradle.properties b/libs/native-win/gradle.properties
diff --git a/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt b/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt
@@ -278,15 +278,15 @@ class PaparazziPlugin : Plugin<Project> {
     val nativeLibraryArtifactId = when {
       operatingSystem.isMacOsX -> {
         val osArch = System.getProperty("os.arch").lowercase(Locale.US)
-        if (osArch.startsWith("x86")) "macosx" else "macarm"
+        if (osArch.startsWith("x86")) "mac" else "mac-arm"
       }
       operatingSystem.isWindows -> "win"
       else -> "linux"
     }
 
     val nativePlatformConfiguration = configurations.create("nativePlatform")
     nativePlatformConfiguration.dependencies.add(
-      dependencies.create("app.cash.paparazzi:layoutlib-native-$nativeLibraryArtifactId:$NATIVE_LIB_VERSION")
+      dependencies.create("com.android.tools.layoutlib:layoutlib-runtime:$NATIVE_LIB_VERSION:$nativeLibraryArtifactId")
     )
     dependencies.registerTransform(UnzipTransform::class.java) { transform ->
       transform.from.attribute(ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.JAR_TYPE)

diff --git a/paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/PaparazziPluginTest.kt b/paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/PaparazziPluginTest.kt
@@ -1142,7 +1142,7 @@ class PaparazziPluginTest {
 
     val resourceFileContents = resourcesFile.readLines()
     assertThat(resourceFileContents[2]).isEqualTo("33")
-    assertThat(resourceFileContents[3]).isEqualTo("platforms/android-33/")
+    assertThat(resourceFileContents[3]).isEqualTo("platforms/android-34/")
   }
 
   @Test
@@ -1160,7 +1160,7 @@ class PaparazziPluginTest {
 
     val resourceFileContents = resourcesFile.readLines()
     assertThat(resourceFileContents[2]).isEqualTo("29")
-    assertThat(resourceFileContents[3]).isEqualTo("platforms/android-33/")
+    assertThat(resourceFileContents[3]).isEqualTo("platforms/android-34/")
   }
 
   @Test

diff --git a/...radle-plugin/src/test/projects/compose-a11y/src/test/resources/compose_a11y.png b/...radle-plugin/src/test/projects/compose-a11y/src/test/resources/compose_a11y.png
diff --git a/...rojects/compose-a11y/src/test/resources/compose_a11y_change_hierarchy_order.png b/...rojects/compose-a11y/src/test/resources/compose_a11y_change_hierarchy_order.png
diff --git a/...zi-gradle-plugin/src/test/projects/compose/src/test/resources/compose_fonts.png b/...zi-gradle-plugin/src/test/projects/compose/src/test/resources/compose_fonts.png
diff --git a/...azzi-gradle-plugin/src/test/projects/widgets/src/test/resources/full_screen.png b/...azzi-gradle-plugin/src/test/projects/widgets/src/test/resources/full_screen.png
diff --git a/paparazzi-gradle-plugin/src/test/projects/widgets/src/test/resources/widget.png b/paparazzi-gradle-plugin/src/test/projects/widgets/src/test/resources/widget.png
diff --git a/paparazzi/build.gradle b/paparazzi/build.gradle
@@ -41,9 +41,9 @@ dependencies {
   implementation libs.bytebuddy.agent
   implementation libs.bytebuddy.core
   implementation libs.trove4j
-  api libs.layoutlib.native.jdk11
   api libs.tools.common
   api libs.tools.layoutlib
+  api libs.tools.layoutlib.api
   api libs.tools.ninepatch
   api libs.tools.sdkCommon
   api libs.kxml2
@@ -64,14 +64,14 @@ dependencies {
   if (osName.startsWith("mac")) {
     def osArch = System.getProperty("os.arch").toLowerCase(Locale.US)
     if (osArch.startsWith("x86")) {
-      unzip libs.layoutlib.native.macOsX
+      unzip variantOf(libs.tools.layoutlib.runtime) { classifier("mac") }
     } else {
-      unzip libs.layoutlib.native.macArm
+      unzip variantOf(libs.tools.layoutlib.runtime) { classifier("mac-arm") }
     }
   } else if (osName.startsWith("windows")) {
-    unzip libs.layoutlib.native.windows
+    unzip variantOf(libs.tools.layoutlib.runtime) { classifier("win") }
   } else {
-    unzip libs.layoutlib.native.linux
+    unzip variantOf(libs.tools.layoutlib.runtime) { classifier("linux") }
   }
 
   testImplementation libs.truth
@@ -104,8 +104,8 @@ def generateTestConfig = tasks.register("generateTestConfig") {
     configFile.withWriter('utf-8') { writer ->
       writer.writeLine("app.cash.paparazzi")
       writer.writeLine(".")
-      writer.writeLine("31")
-      writer.writeLine("platforms/android-31/")
+      writer.writeLine("34")
+      writer.writeLine("platforms/android-34/")
       writer.writeLine(".")
       writer.writeLine("app.cash.paparazzi")
       writer.writeLine("")