From 260046cdaf60b2ecc0f81dd380797bd275fd8054 Mon Sep 17 00:00:00 2001 From: John Rodriguez Date: Fri, 2 Oct 2020 12:54:27 -0400 Subject: [PATCH] Update to a version of layoutlib that runs with JDK 11 --- .github/workflows/build.yml | 2 +- .java-version | 2 +- .travis.yml | 2 +- build.gradle | 6 +++--- libs/layoutlib/build.gradle | 12 ++++++------ .../src/test/resources/arrow_missing.png | Bin 5706 -> 6811 bytes .../test/resources/launch_without_fonts.png | Bin 12870 -> 15581 bytes .../main/java/app/cash/paparazzi/Paparazzi.kt | 1 + .../app/cash/paparazzi/internal/Renderer.kt | 1 + 9 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 979826c88d..3dab0d24a7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: java-version: - - 1.8 + - 11 steps: - name: (Temp) Remove Platforms 30 diff --git a/.java-version b/.java-version index 6259340971..b4de394767 100644 --- a/.java-version +++ b/.java-version @@ -1 +1 @@ -1.8 +11 diff --git a/.travis.yml b/.travis.yml index 095b39c48c..01480e6856 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: android dist: trusty jdk: - - openjdk8 + - openjdk11 android: components: diff --git a/build.gradle b/build.gradle index 8d8bd4ddca..3e3f0dced4 100644 --- a/build.gradle +++ b/build.gradle @@ -4,8 +4,8 @@ buildscript { ext.versions = [ kotlin: '1.4.10', agp: '3.6.1', - layoutlib: '4.0.0-alpha01-1a8ff9c', // "should" be similar to versions.agp - androidTools: '26.5.0', // agp + 23.0.0 = androidTools + layoutlib: '4.0.0-alpha02-b169460', // "should" be similar to versions.agp + androidTools: '26.6.0', // agp + 23.0.0 = androidTools jcodec: '0.2.5', moshi: '1.10.0', bytebuddy: '1.10.14', @@ -36,7 +36,7 @@ buildscript { androidx: [ annotations: 'androidx.annotation:annotation:1.1.0' ], - layoutlib: "app.cash.paparazzi:layoutlib:${versions.layoutlib}", + layoutlib: "app.cash.paparazzi:layoutlib-jdk11:${versions.layoutlib}", okio: 'com.squareup.okio:okio:2.8.0', moshi: [ core: "com.squareup.moshi:moshi:${versions.moshi}", diff --git a/libs/layoutlib/build.gradle b/libs/layoutlib/build.gradle index 3b073e33d6..76ca2ba2a8 100644 --- a/libs/layoutlib/build.gradle +++ b/libs/layoutlib/build.gradle @@ -26,13 +26,13 @@ task cloneLayoutlib() { dir = repoDir } repo.checkout { - // maps to this commit: https://android.googlesource.com/platform/prebuilts/studio/layoutlib/+/1a8ff9cfb0310892adc44d7c0d9e143a286c9aa0 - // which is based on Android Q and puts us closer to the version released in Android Studio 4.0 - branch = '1a8ff9c' + // maps to this commit: https://android.googlesource.com/platform/prebuilts/studio/layoutlib/+/b169460c8473a1e87aafa01da881556682fa4f86 + // which runs on JDK 11 + branch = 'b169460' } } - ext.layoutlibJar = new File("$repoDir/data/layoutlib.jar") + ext.layoutlibJar = new File("$repoDir/data/layoutlib-jdk11.jar") } task sourcesJar(type: Jar) { @@ -51,8 +51,8 @@ publishing { publications { mavenJava(MavenPublication) { groupId = 'app.cash.paparazzi' - artifactId = 'layoutlib' - version = '4.0.0-alpha01-1a8ff9c' + artifactId = 'layoutlib-jdk11' + version = '4.0.0-alpha02-b169460' pom { name = "layoutlib" diff --git a/paparazzi-gradle-plugin/src/test/projects/appcompat-missing/src/test/resources/arrow_missing.png b/paparazzi-gradle-plugin/src/test/projects/appcompat-missing/src/test/resources/arrow_missing.png index a999003d90a81bbb5671039d65e874907d6006ce..203b0ed73a5ec4b9565807f34ae2e9a680dcda5a 100644 GIT binary patch literal 6811 zcmeHM`B#%?8vSrXMZpn;!3va8v{fXMv<(PNL~Jd^A~RMIl^qinLntZ407(j>h+9ym zAOr{=wX~x(U?dR|h!kZpo7N&rR>6ExS%L%-LP9cMv@`#}oHJ*B$gkgdmwTS~KKI_| zd}Yy5dseU9uo3`()e&Fq{yP9Hf&;+fm&=zyUmkd^yAA*wk|TD9eS0E)LLPDEIC1EH zl4iyElr^2pKlt0@<(F@q`7*rtY|Z;yKK!d=^wE#n&g|d0J?OaXmvapx>*T@P9{l(h z-%ZYG8^gb?)qK3neS~dR6hEDrAoR;RDe%MD{zbsfhZzn)L-K#UEbsp3T9Rb{MxJNh6ZlO>4bi%hj#Zuc z)h#HDP)=1X_P*DuAI?N77bb~Fjv{{y{5=vDhjZk@ zNr;vwI+tJ`5p9isbJmwQbgT-ev8qOMKDxP7eAO?}%W$s;htfCGa4s`~Flr!LX|)&< zQ*DdJ?+(VRa0-8ncN(S;|E9WmUl3O>O& zSvi&rdT1@!MwSGNHVuKbt{ikK#lThK6h<*I3!8`09hYk<2B}%cu&#se$!xhFcqO6O zF;wM1AL!7x(D~K{ZGi);wv41LP;xK)sGeynPZ|)KKcButlbIp9DCtTgVPtf2i7<@7 zz@l{3jpLd6&uK}|f+HNm!8mRHz$MX(5+UC*3-ck|J?OOYs>kE93Xtrlp^iMR)P#0-PNUZ2xE(ukVLo&Y<8SjX(Dg z_8INO1K*3Oo3P$4)VVH>sg^8B;hE%G)Mav4((>xs{zavCOZs?|XziE7)V9J!psh>5 zW*T`sFU=}dt@Oxy!dul=(p`!+KliQc85(dz&vmv(*APGTlr0ml_o-kVR;|IT@zyt$ z;-LCTYIEE$vhR94=^98a=q9M`iJ6HIrc`k935_!Iv9_sTlE5%|OFr`I9v=&qki?23 zcQnmlpeS^6SnrElZb9LQ8J+&AaShimw6dIJk}4_PjVjv-W#`o_7)IQZ@OuyyE+-RJp`ZG!hmT(_D~sXJ_ZPU|l2lcD z_4tcXd_%hy=bhp;_9>Heq5S#ox3$0~E}Pneo_`XbEo|A&EL3mhbmb2|U-x!DlJ|Ud zfe%8NO3tQVgPY=affw+F*Z#9Jts@+BnoNpFN5Q}Y%=~`+;wfiD1N5eF0uq~AiBDy) zHuVIaGf8@dDI$;R(Gwfz5=!=pGl~$OFm})XiYI4kJ>3O}M@-7>O{wH;@KZd}hP#@( zFwiT^_3z2OAcX65hX`TK)tV3AflWJ|9aRKzlc_Y1W6{!cv=uc*I1j4wHK{gchrCo- zcdA#X9x_twD@b2uTyY`^+r0-h zed)mUK3&#hfDbakJC|ym)V9Xwp6Wt$whc=!*(ZV+m z={Bh^z+>Zt!y5-7mS$k4VkP;{^rK7llF7oSrU&!#6*Z6(k)=`v+kJP6I66N6)eT6> zh;8Muirjp5iLm()q|}v3lvj}n`Cs4iXN2h>d&wt2LI8E&@51K?V&Ym15qt#0RjrG< z=H4-N$~sG^0NFMTk>aY#8DwF{?T+~jgg9!@8;)RbloS*A6FqCV&?rbiWwID$c|L^e zkZSlMc)C-UArmjqJHL#)C*;!gR{zvNKi&Au*{!z+#h|6?^rk4vT$gti%JPPWSIqo` z#Kr6HRN+KQEG|oGZBG@DnY`(*-3@mT7&j(&vaMb6>EVD~=#?hg7*U=(02Vt1WFJQt z*j!cp{pkMs>3>XAUs-T8J~W47vz--h4HdG=yT(T`9e3)a!Cz@zreo>Y`V{L>m0u!e z0;J;=lU+r%aR}{}_6fF>tqZ}fq74hJtC6y)1W95J2g(}`f-$Df-|(Jtt~>tmdB~nO zJI{s-twwdK9%Q9 nS%A{J|AUzJXXyKl?{F#4v-(VYdkXZ^35fV2YWMA3iN*f{Ll|ye literal 5706 zcmeHLX;f2Z8jfSNSfGdkAwB#}!mfL-oA}=* z`TJa|nmjj<=SY+l^T*}?G|At=_vS$CS%BsrQL_NeS^k48KyywB=0ST7|8EG|oS?iR zXmf7f?bN#0Jaz(`3pDNOhor6RYb<-KJaFZB(p-!tO7Tk zBMlA^)nY$3%xWbc%&wJ1O`a7ke?D+}u(_Z^YR+uyA&9dgf@MkHK?Z_PdU|@|`!oHTCz>1uCrV38 znbHdK1r%*r#`uT2YxwDt$-;Flgzh={R6!->yWqjW9DoT*X%en$NTbzp$d3W2GO zs?=}N?h`9^MME)Q$CZwqJf7L3dUq!d1zXn~LVKB3MWuo_uoV4`*)28GU4duSGi!TdWHX4raES)rBQJcD{bRtqfC>#YzU7^j<&-G%}>yGhtZgnW5sc zfLj~;01BxvrR7^w&*sWg14BsGA(M15_1ME7e9Ox5>`y-iZYME}`jc4!QRcPNk`^?u ztWxD*7HjX1VqI_wpwN_Xydk64cE`TN_KdY z4-{oz(#p0D{>--^2Lpun>cg})k8PQm>I?}K+8~^xcwE;+v4w>nw`9MUnSB?1k4Yiv z$<4#t=qy|e$CxOC;9^jM4yj8HV_jkB5;_KEI$Ut8iOPiZ{AZEVt28$r~q(F5eW zKM38))p7aBM|P)!M28Qq!7Ybpa(>|v6)*j#NBPX#&nHbbA;#Hj?hM`s=en)NvHi`^ zS(ZhkIA#iB=KA3V#TZ>{*!@P-)9)|l$P!6g*|K!n2V!wwx)0et-p2YtsA&L!KnT6l z+-Us>8N13)4~xa*$)x;nLBW?-ovm;v7To#Ls=a2ns>cVDZMrsgX~Wer6~1Lw2v(@# zu0fIAL8C z3DcJSuRIt?LZAEd7-YOnmsHvjSjHdMsaB0HD=ulg3kc(isG{0f8d{lgxJR{jb>W1v zWy-+q`;*;n6sPFLtt4QNu0Jk_wnvxg!F%=K4Qb}Zxi^ipEJorf`VE_-Wf5W{F{U9M z3WTeHVo)J5oFdP{A?}69UoQX?e#TSJd$LLU*(I2oDm}P(?QkBxY)=>n9@tu<%ue-v zoFAKU2&!eueCdmc5;J?2MpRgAxu8+W#BqX-P za6c1zzj0|93F1P5LFuv=A{v^0Q7fc9_pHzeMd85ZLT+uVEpjO&b?XC0>et27>82?P zV+XvYm6a9$1V9~hvihWH9&tA!(A0V?Il9%u7Q9jfiyX&!n?aNpWNUalf&K-b&%ZOF zasP9RpN{iq(syXXd+pN7h%=MlEKwho4z^K}hTsDHusPOH*|+-8lrT;POi58!)v|`p zuN8hqx?6;ayz9y)1+p2s_)sL_jO?e|w|QP1hCWg9&}Fy>k>-Gx9D8j&skJqzx)7b8 zcWITa2Q}x8j!&W{l>`}p$=b0gx)s3dm-rFQ1jY<)Sysf(>Z!-xKBa{9dpWzfc@CYM zOd3e0Wp*{5NN2XBn7&gTxS=HR%D9nbXGI7)b^Xp2aGZTK(0t!+YD-9Dm-hjG%kWVi zttP}HN>o&s_Zen?Y*eJ6;5E4c;V^`X*p#H!QkWl&uk*Fl9#Q$tc2pB@sZR#mv^pFs zudXVZsZ9r2a&dzS}%RlRt)EV&L z+gp~D0nm+G&?EO4Z7RhvqsQj(7+)3CT{8Tf6~fWC-j}3k%(fAX=L)ppdqs;Ftj$v= zwTux5)U!@ZJ=+V$mm5~VG-*oRJFVn4UtSu4@|a%GHz2N2b+mFIuQ(TqJ@`-Tbr;U& z7td}n&z}Pab8~FNPcw~?>xX^vBKlD%W?en)LoFkevW`~GCn=rnpVq}c8yOk#ZzCUM zrj}5vsuBw6E;)6tM3qK`tnJksc3{rv!e7cycwU)A`hY5I!1Oj^ligzF;`q+}>&;&~ g|9O9t(i|6E4l~TuUv8tL{6`FM-R|y0Mjra+U-_z%n*aa+ diff --git a/paparazzi-gradle-plugin/src/test/projects/verify-snapshot/src/test/resources/launch_without_fonts.png b/paparazzi-gradle-plugin/src/test/projects/verify-snapshot/src/test/resources/launch_without_fonts.png index 52dc7435d3182a49ec2893eed399e9b194c3c199..2c9c69fd067cd1a407f375be67fcadedce0ae3b0 100644 GIT binary patch literal 15581 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 diff --git a/paparazzi/src/main/java/app/cash/paparazzi/Paparazzi.kt b/paparazzi/src/main/java/app/cash/paparazzi/Paparazzi.kt index 279d229c30..e13306ddff 100644 --- a/paparazzi/src/main/java/app/cash/paparazzi/Paparazzi.kt +++ b/paparazzi/src/main/java/app/cash/paparazzi/Paparazzi.kt @@ -297,6 +297,7 @@ class Paparazzi( versionClass .getDeclaredField("SDK_INT") .apply { + isAccessible = true modifiersField.setInt(this, modifiers and Modifier.FINAL.inv()) setInt(null, compileSdkVersion) } diff --git a/paparazzi/src/main/java/app/cash/paparazzi/internal/Renderer.kt b/paparazzi/src/main/java/app/cash/paparazzi/internal/Renderer.kt index cb991ecb06..291bbc03e3 100644 --- a/paparazzi/src/main/java/app/cash/paparazzi/internal/Renderer.kt +++ b/paparazzi/src/main/java/app/cash/paparazzi/internal/Renderer.kt @@ -74,6 +74,7 @@ internal class Renderer( DeviceConfig.loadProperties(buildProp), fontLocation, null, + null, DeviceConfig.getEnumMap(attrs), logger )