From 11b3b841145722dd94b1c458abc35be189672a8b Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Fri, 5 Feb 2021 12:24:46 -0800 Subject: [PATCH] chore: release prep --- apps/automated/package.json | 2 +- apps/toolbox/package.json | 2 +- apps/ui/package.json | 2 +- package.json | 2 +- packages/core/package.json | 2 +- packages/core/platforms/ios/Podfile | 12 ++++++-- .../ios/TNSWidgets.xcframework/Info.plist | 28 +++++++++--------- .../ios-arm64/TNSWidgets.framework/TNSWidgets | Bin 202536 -> 202536 bytes .../Contents/Resources/DWARF/TNSWidgets | Bin 1029449 -> 1029449 bytes .../TNSWidgets.framework/TNSWidgets | Bin 188064 -> 188064 bytes .../Contents/Resources/DWARF/TNSWidgets | Bin 2073874 -> 2073876 bytes .../core/ui/styling/background.android.ts | 3 +- tools/assets/App_Resources/iOS/build.xcconfig | 1 + 13 files changed, 31 insertions(+), 23 deletions(-) diff --git a/apps/automated/package.json b/apps/automated/package.json index 67a19b86e..9198b309f 100644 --- a/apps/automated/package.json +++ b/apps/automated/package.json @@ -15,7 +15,7 @@ }, "devDependencies": { "@nativescript/android": "7.0.1", - "@nativescript/ios": "7.1.0", + "@nativescript/ios": "7.2.0", "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz", "typescript": "file:../../node_modules/typescript" }, diff --git a/apps/toolbox/package.json b/apps/toolbox/package.json index 4bca9f519..b48c530fa 100644 --- a/apps/toolbox/package.json +++ b/apps/toolbox/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "@nativescript/android": "7.0.1", - "@nativescript/ios": "7.1.0", + "@nativescript/ios": "7.2.0", "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz", "typescript": "file:../../node_modules/typescript" } diff --git a/apps/ui/package.json b/apps/ui/package.json index 600d2fd41..a28bb6f74 100644 --- a/apps/ui/package.json +++ b/apps/ui/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "@nativescript/android": "7.0.1", - "@nativescript/ios": "7.1.0", + "@nativescript/ios": "7.2.0", "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz", "typescript": "file:../../node_modules/typescript" }, diff --git a/package.json b/package.json index 716575868..af5fa1226 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "mocha": "^8.0.1", "mocha-typescript": "^1.1.17", "module-alias": "^2.2.2", - "nativescript": "~7.1.0", + "nativescript": "~7.2.0", "node-sass": "~4.14.1", "parse-css": "git+https://github.com/tabatkins/parse-css.git", "parserlib": "^1.1.1", diff --git a/packages/core/package.json b/packages/core/package.json index 44b6c3108..63407ee0e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,7 +3,7 @@ "main": "index", "types": "index.d.ts", "description": "NativeScript Core Modules", - "version": "7.1.4", + "version": "7.2.0", "homepage": "https://nativescript.org", "repository": { "type": "git", diff --git a/packages/core/platforms/ios/Podfile b/packages/core/platforms/ios/Podfile index 7ba729baa..4a935d972 100644 --- a/packages/core/platforms/ios/Podfile +++ b/packages/core/platforms/ios/Podfile @@ -1,4 +1,12 @@ -platform :ios, '9.0' +platform :ios, '12.0' use_frameworks! -pod 'MaterialComponents/Tabs', '~> 94.5' \ No newline at end of file +pod 'MaterialComponents/Tabs', '~> 94.5' + +post_install do |installer| + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET' + end + end +end \ No newline at end of file diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/Info.plist b/packages/core/platforms/ios/TNSWidgets.xcframework/Info.plist index 83ff73fcd..953413568 100644 --- a/packages/core/platforms/ios/TNSWidgets.xcframework/Info.plist +++ b/packages/core/platforms/ios/TNSWidgets.xcframework/Info.plist @@ -4,6 +4,20 @@ AvailableLibraries + + DebugSymbolsPath + dSYMs + LibraryIdentifier + ios-arm64 + LibraryPath + TNSWidgets.framework + SupportedArchitectures + + arm64 + + SupportedPlatform + ios + DebugSymbolsPath dSYMs @@ -21,20 +35,6 @@ SupportedPlatformVariant simulator - - DebugSymbolsPath - dSYMs - LibraryIdentifier - ios-arm64 - LibraryPath - TNSWidgets.framework - SupportedArchitectures - - arm64 - - SupportedPlatform - ios - CFBundlePackageType XFWK diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/TNSWidgets index 7c2885ee5e940b54c32879a578f326508b77fd9d..6078a39439652b82859536817d08031089fd6b06 100755 GIT binary patch delta 1389 zcmV-z1(N!xt_-NI46q=;e_e0eHWY^M`zs9J%i@PfiiP5?-Oz1lu?|RzT?YJ&xk#2F z$!)x0|9zw^$4;WSw(LtIa76Nu=RM|mbVS?PyN4nleKS?<%K6n8PQZ9%=Bm_ges?wg zdh;<#$M2?ZvIkL3-;A<)DRrqv>&xw26y|FDS&zMGl;v)IAC-&7e>cCr%HYA3bv*WW+6W@o?Je()`i^Ye3AnO`fhm^rn({ky{hy?!j0b1lNVeCBs+ zc-8Z=u7WAN)*_P+lWr$}yrPtUtI7Kx%zr)h-ne^W&f;y}f3jNNcNlbc(au1yZ|;Yw z`*NMdkG)`;Ic=hPRmd{0r!b43^uq*EshMkxYL=CmimISV7C#valOELrvs+~!NL#c* zvuQ7*OjV|RCsE@HGerQw2%rd%8wB10`j&Y2Pp7ntW=7rD%VJbFtK65rdM4nwL*3fi zG}CaetXu79f9?JW&V2x((eBsAN87V5HzTL7#=LW*axuSao4#G>Y4pXD7aH3kEvoNs zzECd=Q6nl}DJL=Y}>bkytGJ zdS4Smy$pGH9*KVx609GN$gZMc?=p4O(nc99ra@Y zkwQdh$RLzNaF!~lQYaIE6Pa3Ml?GC3!LsPsvR$520TmP6m z7q^_D{^M<{aRj#-YGW{jN*khq|A@~te^t`@&rD1Us}dnOO|d$G+rt%3;TG-Z7GAg= z%q=J9`XUVV*4nkeF|{@Y2Bk)^6l-RM23T<*u<vp1f9nG5i8Kn6ewO20ndz!wVu0000KgBHby z7R3R#7R3Sr2m@NB9hV!;0$l@Mr5(3>%>qpV16-vYm&?xry#rpQ9k+|n0&N5XT%{eC v`_uy616-vYx7*bM-2ww#r5(4s*aD3L174*aw@cdsT>}GNr5(4c-U59%mVBcn delta 1389 zcmV-z1(N!xt_-NI46q=;e_L?De7%YHNhMMB&9np67?xDy>-%M4za(*?26EGf`xhl1r-(8Kr z-h7PM_}%nP_8_Y1n^9ITr7qQIeYu^B!d#6%>#;YDvfRz@qjJ%Be@Ar~7-j3uG}1=s z+q$XTB8$7RUHeaYDYU6>7owTPA1m+lds*Gry>p`~%<6Yz9*kNxLgwaFS1_62egm3- zUV|%N5n1G-v1L`DcE+W0ko!m8L@pEFbc1{P6Z%zNb{^ir3?{9wlFTP&Y zjVa>KPFA8??W8vT`uiu>?Ce+D55DDbets@1^J^s*GpBa9e|LDG*N^3Lu0?p4&-`u; zuX~EgV0;Z-U9F7>6CWS%&7Z%S&ZstmHYBn&jcKIs9Rf` zW*Y95b*mk%f89U9xep*T+Wp%2XnWS>X5{qMn0IbeF6MV_)3*yfjlOvDLSs9mMfKgy z7wUx}YDDF0MI@wq&EyjjZ3_N6MbGAGSBD}R<@vWFT8O$fFJ(;On#l9@+|Xtv5{rdj z?`vYHmmv?&Bk_-d+-!$^>+wCe`w=y(g_(YEjeipPe|g)Xc82FqbnbF9ziVb5H3o?X za@|{-HjlAQqC!wkwb_hI)r6gBe0Ga*+%4#m1_1(?Jjr2~#7}pYn#C_YbrLP$-_D@$!cn*NkGq+*I~?{pi?^E{ zo-0$Hf5q*!r8mrYN-n#QJD6O?Fgg>t-V;cA!Ci|S0d7JK=bR>-aALKhhIp=EN~I<` zO$o)GFe5}V9NfbdP63zg2bW&J9SkmJfSn0k!ZGi!xNDIkzy$;)7FbG&R4Ek-at@_V zB{!)71c;PEVtsua4({O!r+`cMgG(;p4nHg4e{dQ*3%F?t=qpDBynEz309-@>N~IN+ zE9o(kOhZdjlV}W-r75D4vIJT+9NfbdP63zf2RFTdI}}_7__@xw3E>R%al6(y0$U5X zP(orRAxA7tQjnxVKt}yP!IZFC0%6Dr_4aUuQ?O0j04ojzHl8NoY0}tO#ktZa)Y^j;PGJ`IFzY9U zUqQ0C{bl!m00030{{sN`K~xbqpeJlr;8-&`G~tU2ydbki_zqpV1DA;um&?xry#tqt6t|1e0&N5Xmx&aY v`_uy61DA;ux7*bM-2wxbi4?cH*aD3L1DA;uw@cdsT>}G`i4?c1-U59%jt-%! diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets index 2ab572afa95e699a4b7d08247c2fff0f2446762a..28407f0a9b8dfc55e54f58f158088fd7c813e780 100644 GIT binary patch delta 372 zcmV-)0gL|0>ORTpK7fP)v;t-O2opO)IB~M5aEERC0=I4Z17m~;d5vl9CeSYQx7dFK zjs*yQ=0O>-4y<99ZiNJr2sxz998+52+_wmZ1f2p1jY}Q97}f7Jx2=c-$pr|8{q&cB zMkUOb;qe6)x0H?qohu0S;k0!9UcAb;Il2TFA_$(fI>FavOTf2S+yqt$2o~!}_KASp z&bPMZ1i70CJ1tx2#Kq8Hw|9XBQWgl5n^pqUPXz6^(U%2W1PH4>pcnR31pT))oCOvI z2zruiR=((z8n;uS1!+JCdrEThGjOJPx5VKEM+^ucAsy!T?L0!a6Yd551PGcCCFmFb zuDZ7v^92SI2-qEQS3K2*?6)Qc1`|sNFABORTpK7fP)v;t-O2vo+yA6*811cz<=0=I4Z17m~;FU(WGSQG1Gx7dFK zjs*w-4AVZiNJr2r8yekRUSIKeq^m1f2p18@;j9UEWykx2=c-$pr{4b|*sf zn2Q{j;qe6)x0H?qoht}3zxNpUeX2OOIl2TFA_!q%hxL@Qm-@F@+yqt$2z0j^!;mYa zMz^-*1i70Cr-MgixW_E6w|9XBQWgj>;W8X#2tPKr(U%2W1PEoH?#{f_@$t7coCOvI z2v|Q$6(dZ`1-Db71!+JCks+OWM=O7vx5VKEM+^uXRIUazSw%Uw6Yd551PDgpj67w?R<`v=a!W7aR8~mB075{bUAZ z0|;P@A2F%=zY(`;Xa?yB2r&15%_v96J%?Ly28Ua52Zvj62!~s735Q#83Wr;93x`{A S42N5B4ToEC4!2uz5AH+G$(V8g diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/TNSWidgets index 8a874044613bda558f272770a039fad655cf834b..3c467383efb9c88cbd11c4799b8d43e58a00dcbd 100755 GIT binary patch delta 320 zcmZ3mmwUlp?hOuSnFE)~PIf*U%N(*)cJt!1zD&$PK!MNa_cDh91vX#EWdRE)U%d;W zH#1+m3s$lD@r_<4u#)22vCLq`<$I#m4(GK~wRMi(I?a0IjnmKUNcW!JzjN+w+c)pO z^Q`yvwc3nFqwb5z)XwT#&-XFJ?3W%7Q{}_=g@rTZ4%uqIxTIw}qg_Laal3{T(*+}t z!>0fCVTuJAzCGHP$rfz!^x6JQdqIxf9v#5s3wGS})ger0L9W|g9m=#9tZKV;1XC{9 zecM+@0gV7_;ErR;wRCXOEB~VS^m3n^k=L)?JLSHa?%S$ty-se8{&l6z@3=lNl*DJ{ p&Pv!Zi#NuRN$H;0G|z|SRtGw6?fQEt_}y-mp#R%dsWudSAuId7IU_$zqc&- zJw>MfM*gIeOD@@-Red<6_;ZonQRRpITfK@yzEoMQI+LK-t|7&^T|G1EAVT0~}#k9kHm#?I+zEQX9`-RqiMa!3W%hN8Fad#)5K6GF gGs@TRUXyfxRaaPY*ZMC$3~OE<3f#V9I@1d`06e0N_W%F@ diff --git a/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets b/packages/core/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets index 206c42de96aea95a011cbb664e1b29b1492a845c..3124a33650bd4f719852f3b4c26f1de2791e552b 100644 GIT binary patch delta 1147 zcmZ9Je@q)y9Khd|JNnwST(7-rw=x)AFhLnEsB@B;UH6X+$#f8=Giwmcj9L9b8kr_e zaqVQ6X#=#kcr!9&`(qm!#>uZYXT=yY+%URaQk6ulgG9psAw@^R2AyB-l|S^7PhQ?9 z-@LqgpZHkI$+4CWkCZ_OaSTE>SP|l<{D@B^Ki?9yFd6j=i_GZilBH76UxpF*d=`_j z>S~Qu78aUwjNP*%tg$YrXTVlHhK=1lyRo1uH4S$66V$$XKefBnUF&3Fu!-8E^msI= z#=ve1QQJXB(KdAg?A5IO&`R}HwcI8P2i~T$)iKV{2h=dwbM`!AcbWbcI;ZMj>%G(# zXV0xyeRf%hWNlyv{kMo30-M_BFs6#AM5+F7>@WRlZh?!kXioEuIwb98$`OrEu%@jK zYE6?4@3FaQWp0`QOh6960vwr}&VBMLCP*qSn7gcuOvd}n*D;ev&VFg0H#6f(e8dc3 zzyer-b$|`919>Dq!uJ*v{}f+hWs=&V1zu)ajVi4d>9cJ&(@VA*RT6!)iocsyNoX~H z^Rlp9OCM@2%d&Q6Ro`u(`i(OBD0j8=st&bLy%r{2;rzne`H z)+Ru^(8p8{pP+5fj9Jy~1!}jgNEj}rExNOXhPCi*IH|t;e~C1GRY$V=p^9uH&9?}8 zAo$-%10=M_58lMrV2VZajGBH=G%EG)on;v4q}&*H00Ox&?yPlUtMmLyZr9<<+Vfma ziBdD;BsDXx*fAVngJtX;+j=tnn%Kr+esjFMj;w6djy8*N929<9y7*b?6!9JwPn)pm zk#93wyqrwFep9^8;r+iq{A1bTCkIK#J7Rw+E@|majGk)0MXGy5&t@#urG8i*3w%m~ z--*vyaPPs7CiDo~NUkNtXeUO;lcX*Gxl$4cNwsd=x3pY%rSs|6$&exiSbXTOBTJ*( z|9pUWqY}^I4VRiv>i5mGlJb~T;>Vp`-3foi`&Fb-mnv($4osSZ= z&i!HzR(#Q9;pFU*q5bY#7^h#ze=7HM`z9sb;3nw?PpOaTBLxx9PL4UQ1QZXj9@qeQ RfqY;iPyiH?fU;?*;9n2eV`~5a delta 1130 zcmZ9JZA?>F7=Z6Btv&s+Exoth7+4C#Z{vU^YH+qLrv1S*3Vsng!Zx;!ZH_f#!zC)k zVs4lSv=?`x8xAu}G$WZ7^(Z0>sj^WrSqWK&VHqrOQR`BXNmf(EmwU<&y~&f4^W@FR zx#ww%91KPdwp#ck!!Qb#VYIL^jQ);;(f5v=U)iK$lj0SXogEevDwlEiBN&0trjkkP zu((ZaH$JFIlXknpa%p`ao&xJyi=^GGPFfh3I0e?}q;~HzYMtUnjosK?O|6d}&vc6c zu!UY~Tj?lMC{BV6r|j2is>5Qw)^04@PiKn*3Q3oV^_%V8x{K()`9v?+@f`+fDw|4Xyt`lL8CULyi^`e%*fwC`#c$$G!N~=)@T74iQ-pKOhiUeGTU=?T#yjt*L+2XC9!+l`M) z=p)T1d5llZ=|lz9U#y}JlE71Qy1JR_`6$(RbE|sMYPl7f* zJwbI}Bkl6^o>GkJvcwK;wy`&lcIZge>BaSr;3Rkc3wdyKPWw{2U|p&Yw#|SJefWH! z5b@6FFHW!n-M)B&6>`Q5fRW^krL*a%|DDRfR0DS#zpY4HDwM|3NomX!@S}&N*+GxD zri$GEglkqH=Rc#LYF+t__)rZOM3eQGR^jjaf+X{Eu3d%>dj_|b96h^|^w)BO3iMrB zp7WR5Bg^os0&gZ~4sh)&P=R%#>vZL&5ZQc|v*e(euAJ9KJ&DiA$3xss6*^Jie6yi$ z%U%*0<(j@li+^glv0kV?K+3&*i5dM^*&N$yI&zd;7I?QDttnfwe)h{hsz_!NuUDYo zt`=dfVfDYHFu*T$p!dHzysI&}_BMGp%Dc44dUvQ+^TtgL3H`}Gk)z|9q2#aavOR?S z&CjNzTE zd$tb~*>3Y)geI&Rr#Cly_X*P#W-?u2Sz%+(5$hq#1_j$7lnWN%CE#Ts19%0<1hRld Kq+GCG%6bMG{#>g7 diff --git a/packages/core/ui/styling/background.android.ts b/packages/core/ui/styling/background.android.ts index 7d1856f4f..65459fdb9 100644 --- a/packages/core/ui/styling/background.android.ts +++ b/packages/core/ui/styling/background.android.ts @@ -45,9 +45,8 @@ export namespace ad { androidView._cachedDrawable = constantState || drawable; } const isBorderDrawable = drawable instanceof org.nativescript.widgets.BorderDrawable; - const isColorDrawable = drawable instanceof android.graphics.drawable.ColorDrawable; const onlyColor = !background.hasBorderWidth() && !background.hasBorderRadius() && !background.clipPath && !background.image && !!background.color; - if (!isBorderDrawable && isColorDrawable && onlyColor) { + if (!isBorderDrawable && drawable instanceof android.graphics.drawable.ColorDrawable && onlyColor) { drawable.setColor(background.color.android); drawable.invalidateSelf(); } else if (isSetColorFilterOnlyWidget(nativeView) && drawable && onlyColor) { diff --git a/tools/assets/App_Resources/iOS/build.xcconfig b/tools/assets/App_Resources/iOS/build.xcconfig index e77e78db9..f8e9da181 100644 --- a/tools/assets/App_Resources/iOS/build.xcconfig +++ b/tools/assets/App_Resources/iOS/build.xcconfig @@ -4,3 +4,4 @@ // To build for device with Xcode 8 you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html // DEVELOPMENT_TEAM = YOUR_TEAM_ID; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; +IPHONEOS_DEPLOYMENT_TARGET = 12.0;