Skip to content

Commit 8a4fce8

Browse files
Update layoutlib to v15 (major) (#1578)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: John Rodriguez <john.rodriguez@gmail.com>
1 parent ce44584 commit 8a4fce8

File tree

11 files changed

+10
-10
lines changed

11 files changed

+10
-10
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ kotlin = "2.0.21"
99
kotlinCompileTesting = "1.6.0"
1010
kotlinPoet = "2.0.0"
1111
ksp = "2.0.21-1.0.26"
12-
layoutlib = "14.0.11"
12+
layoutlib = "15.0.6"
1313
moshi = "1.15.1"
1414

1515
minSdk = "25"

paparazzi-gradle-plugin/src/test/projects/imm-soft-input/src/test/java/app/cash/paparazzi/plugin/test/IMMTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class DummyLayout(context: Context) : FrameLayout(context) {
3636
override fun onAttachedToWindow() {
3737
super.onAttachedToWindow()
3838
// Fake environments such as snapshot tests may return null here, which we can safely ignore.
39-
val inputMethodManager = context.getSystemService(InputMethodManager::class.java)
39+
val inputMethodManager = context.getSystemService(InputMethodManager::class.java)!!
4040
inputMethodManager.hideSoftInputFromWindow(this.windowToken, 0)
4141
}
4242
}

paparazzi-gradle-plugin/src/test/projects/rerun-asset-change/src/test/java/app/cash/paparazzi/plugin/test/RecordTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class RecordTest {
1515
val contents =
1616
paparazzi.context.assets.open("secret.txt").bufferedReader().use { it.readText() }
1717
val root = paparazzi.inflate<FrameLayout>(R.layout.root)
18-
val label = root.findViewById<TextView>(R.id.secret)
18+
val label = root.findViewById<TextView>(R.id.secret)!!
1919
label.text = contents
2020
paparazzi.snapshot(root)
2121
}

paparazzi-gradle-plugin/src/test/projects/verify-aapt/src/test/java/app/cash/paparazzi/plugin/test/AaptDrawableTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class AaptDrawableTest {
1919
@Test
2020
fun inXml() {
2121
val view = paparazzi.inflate<View>(R.layout.aapt_drawable)
22-
val imageView = view.findViewById<ImageView>(R.id.image)
22+
val imageView = view.findViewById<ImageView>(R.id.image)!!
2323
imageView.setImageResource(R.drawable.card_chip)
2424
paparazzi.snapshot(view)
2525
}
469 Bytes
Loading
83 Bytes
Loading
-1.42 KB
Loading

paparazzi/src/main/java/app/cash/paparazzi/accessibility/AccessibilityOverlayDrawable.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ internal class AccessibilityOverlayDrawable : Drawable() {
3737
}
3838

3939
override fun setAlpha(alpha: Int) = Unit
40-
override fun setColorFilter(p0: ColorFilter) = Unit
40+
override fun setColorFilter(colorFilter: ColorFilter?) = Unit
4141

4242
@Deprecated("Not used", ReplaceWith("255"))
4343
override fun getOpacity(): Int = PixelFormat.OPAQUE

paparazzi/src/main/java/app/cash/paparazzi/internal/Renderer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ internal class Renderer(
8484
val buildProp = File(layoutlibRuntimeRoot, "build.prop")
8585
val platformDataDir = File(layoutlibRuntimeRoot, "data")
8686
val fontLocation = File(platformDataDir, "fonts")
87-
val icuLocation = File(platformDataDir, "icu" + File.separator + "icudt72l.dat")
87+
val icuLocation = File(platformDataDir, "icu" + File.separator + "icudt75l.dat")
8888
val keyboardLocation = File(platformDataDir, "keyboards" + File.separator + "Generic.kcm")
8989
val nativeLibLocation = File(platformDataDir, getNativeLibDir())
9090
val attrs = File(layoutlibResDir, "values" + File.separator + "attrs.xml")

paparazzi/src/test/java/app/cash/paparazzi/InstantAnimationsRuleTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ class InstantAnimationsRuleTest {
5454
view.text = it.animatedFraction.toString()
5555
}
5656
animator.addListener(object : AnimatorListenerAdapter() {
57-
override fun onAnimationStart(animation: Animator?, isReverse: Boolean) {
57+
override fun onAnimationStart(animation: Animator, isReverse: Boolean) {
5858
log += "onAnimationStart"
5959
}
6060

61-
override fun onAnimationEnd(animation: Animator?) {
61+
override fun onAnimationEnd(animation: Animator) {
6262
log += "onAnimationEnd"
6363
}
6464
})

0 commit comments

Comments
 (0)