Skip to content

Commit 28c91ed

Browse files
wcandillonwcandillon
authored
chore(💚): fix CI (#3217)
1 parent aabf93b commit 28c91ed

File tree

12 files changed

+152
-73
lines changed

12 files changed

+152
-73
lines changed

‎.github/workflows/build-skia-graphite.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ jobs:
6868
./externals/skia/out/android/arm/libskparagraph.a
6969
./externals/skia/out/android/arm/libskunicode_core.a
7070
./externals/skia/out/android/arm/libskunicode_icu.a
71+
./externals/skia/out/android/arm/libpathops.a
72+
./externals/skia/out/android/arm/libjsonreader.a
7173
7274
- name: Upload artifacts - Android arm64 (Graphite)
7375
if: github.ref == 'refs/heads/main'
@@ -83,6 +85,8 @@ jobs:
8385
./externals/skia/out/android/arm64/libskparagraph.a
8486
./externals/skia/out/android/arm64/libskunicode_core.a
8587
./externals/skia/out/android/arm64/libskunicode_icu.a
88+
./externals/skia/out/android/arm64/libpathops.a
89+
./externals/skia/out/android/arm64/libjsonreader.a
8690
8791
- name: Upload artifacts - Android x86 (Graphite)
8892
if: github.ref == 'refs/heads/main'
@@ -98,6 +102,8 @@ jobs:
98102
./externals/skia/out/android/x86/libskparagraph.a
99103
./externals/skia/out/android/x86/libskunicode_core.a
100104
./externals/skia/out/android/x86/libskunicode_icu.a
105+
./externals/skia/out/android/x86/libpathops.a
106+
./externals/skia/out/android/x86/libjsonreader.a
101107
102108
- name: Upload artifacts - Android x64 (Graphite)
103109
if: github.ref == 'refs/heads/main'
@@ -113,6 +119,8 @@ jobs:
113119
./externals/skia/out/android/x64/libskparagraph.a
114120
./externals/skia/out/android/x64/libskunicode_core.a
115121
./externals/skia/out/android/x64/libskunicode_icu.a
122+
./externals/skia/out/android/x64/libpathops.a
123+
./externals/skia/out/android/x64/libjsonreader.a
116124
117125
- name: Upload artifacts - Apple xcframeworks (Graphite)
118126
if: github.ref == 'refs/heads/main'

‎.github/workflows/build-skia.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
./externals/skia/out/android/arm/libskunicode_core.a
5252
./externals/skia/out/android/arm/libskunicode_icu.a
5353
./externals/skia/out/android/arm/libpathops.a
54+
./externals/skia/out/android/arm/libjsonreader.a
5455
5556
- name: Upload artifacts - Android arm64
5657
if: github.ref == 'refs/heads/main'
@@ -67,6 +68,7 @@ jobs:
6768
./externals/skia/out/android/arm64/libskunicode_core.a
6869
./externals/skia/out/android/arm64/libskunicode_icu.a
6970
./externals/skia/out/android/arm64/libpathops.a
71+
./externals/skia/out/android/arm64/libjsonreader.a
7072
- name: Upload artifacts - Android x86
7173
if: github.ref == 'refs/heads/main'
7274
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -82,6 +84,7 @@ jobs:
8284
./externals/skia/out/android/x86/libskunicode_core.a
8385
./externals/skia/out/android/x86/libskunicode_icu.a
8486
./externals/skia/out/android/x86/libpathops.a
87+
./externals/skia/out/android/x86/libjsonreader.a
8588
- name: Upload artifacts - Android x64
8689
if: github.ref == 'refs/heads/main'
8790
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -97,6 +100,7 @@ jobs:
97100
./externals/skia/out/android/x64/libskunicode_core.a
98101
./externals/skia/out/android/x64/libskunicode_icu.a
99102
./externals/skia/out/android/x64/libpathops.a
103+
./externals/skia/out/android/x64/libjsonreader.a
100104
- name: Upload artifacts - Apple xcframeworks
101105
if: github.ref == 'refs/heads/main'
102106
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

‎apps/example/ios/Podfile.lock

Lines changed: 103 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,6 +1327,49 @@ PODS:
13271327
- ReactCommon/turbomodule/bridging
13281328
- ReactCommon/turbomodule/core
13291329
- Yoga
1330+
- react-native-slider (4.5.7):
1331+
- DoubleConversion
1332+
- glog
1333+
- hermes-engine
1334+
- RCT-Folly (= 2024.11.18.00)
1335+
- RCTRequired
1336+
- RCTTypeSafety
1337+
- React-Core
1338+
- React-debug
1339+
- React-Fabric
1340+
- React-featureflags
1341+
- React-graphics
1342+
- React-ImageManager
1343+
- react-native-slider/common (= 4.5.7)
1344+
- React-NativeModulesApple
1345+
- React-RCTFabric
1346+
- React-rendererdebug
1347+
- React-utils
1348+
- ReactCodegen
1349+
- ReactCommon/turbomodule/bridging
1350+
- ReactCommon/turbomodule/core
1351+
- Yoga
1352+
- react-native-slider/common (4.5.7):
1353+
- DoubleConversion
1354+
- glog
1355+
- hermes-engine
1356+
- RCT-Folly (= 2024.11.18.00)
1357+
- RCTRequired
1358+
- RCTTypeSafety
1359+
- React-Core
1360+
- React-debug
1361+
- React-Fabric
1362+
- React-featureflags
1363+
- React-graphics
1364+
- React-ImageManager
1365+
- React-NativeModulesApple
1366+
- React-RCTFabric
1367+
- React-rendererdebug
1368+
- React-utils
1369+
- ReactCodegen
1370+
- ReactCommon/turbomodule/bridging
1371+
- ReactCommon/turbomodule/core
1372+
- Yoga
13301373
- React-NativeModulesApple (0.78.0):
13311374
- glog
13321375
- hermes-engine
@@ -1914,6 +1957,7 @@ DEPENDENCIES:
19141957
- React-microtasksnativemodule (from `../../../node_modules/react-native/ReactCommon/react/nativemodule/microtasks`)
19151958
- react-native-safe-area-context (from `../../../node_modules/react-native-safe-area-context`)
19161959
- "react-native-skia (from `../../../node_modules/@shopify/react-native-skia`)"
1960+
- "react-native-slider (from `../../../node_modules/@react-native-community/slider`)"
19171961
- React-NativeModulesApple (from `../../../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
19181962
- React-perflogger (from `../../../node_modules/react-native/ReactCommon/reactperflogger`)
19191963
- React-performancetimeline (from `../../../node_modules/react-native/ReactCommon/react/performance/timeline`)
@@ -2035,6 +2079,8 @@ EXTERNAL SOURCES:
20352079
:path: "../../../node_modules/react-native-safe-area-context"
20362080
react-native-skia:
20372081
:path: "../../../node_modules/@shopify/react-native-skia"
2082+
react-native-slider:
2083+
:path: "../../../node_modules/@react-native-community/slider"
20382084
React-NativeModulesApple:
20392085
:path: "../../../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios"
20402086
React-perflogger:
@@ -2116,76 +2162,77 @@ SPEC CHECKSUMS:
21162162
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
21172163
glog: eb93e2f488219332457c3c4eafd2738ddc7e80b8
21182164
hermes-engine: b417d2b2aee3b89b58e63e23a51e02be91dc876d
2119-
RCT-Folly: e78785aa9ba2ed998ea4151e314036f6c49e6d82
2165+
RCT-Folly: 36fe2295e44b10d831836cc0d1daec5f8abcf809
21202166
RCTDeprecation: b2eecf2d60216df56bc5e6be5f063826d3c1ee35
21212167
RCTRequired: 78522de7dc73b81f3ed7890d145fa341f5bb32ea
21222168
RCTTypeSafety: c135dd2bf50402d87fd12884cbad5d5e64850edd
21232169
React: b229c49ed5898dab46d60f61ed5a0bfa2ee2fadb
21242170
React-callinvoker: 2ac508e92c8bd9cf834cc7d7787d94352e4af58f
2125-
React-Core: 325b4f6d9162ae8b9a6ff42fe78e260eb124180d
2126-
React-CoreModules: 558041e5258f70cd1092f82778d07b8b2ff01897
2127-
React-cxxreact: 8fff17cbe76e6a8f9991b59552e1235429f9c74b
2171+
React-Core: 13cdd1558d0b3f6d9d5a22e14d89150280e79f02
2172+
React-CoreModules: b07a6744f48305405e67c845ebf481b6551b712a
2173+
React-cxxreact: 1055a86c66ac35b4e80bd5fb766aed5f494dfff4
21282174
React-debug: 0a5fcdbacc6becba0521e910c1bcfdb20f32a3f6
2129-
React-defaultsnativemodule: 618dc50a0fad41b489997c3eb7aba3a74479fd14
2130-
React-domnativemodule: 7ba599afb6c2a7ec3eb6450153e2efe0b8747e9a
2131-
React-Fabric: 252112089d2c63308f4cbfade4010b6606db67d1
2132-
React-FabricComponents: 3c0f75321680d14d124438ab279c64ec2a3d13c4
2133-
React-FabricImage: 728b8061cdec2857ca885fd605ee03ad43ffca98
2175+
React-defaultsnativemodule: 4bb28fc97fee5be63a9ebf8f7a435cfe8ba69459
2176+
React-domnativemodule: b36a11c2597243d7563985028c51ece988d8ae33
2177+
React-Fabric: afc561718f25b2cd800b709d934101afe376a12c
2178+
React-FabricComponents: f4e0a4e18a27bf6d39cbf2a0b42f37a92fa4e37f
2179+
React-FabricImage: 37d8e8b672eda68a19d71143eb65148084efb325
21342180
React-featureflags: 19682e02ef5861d96b992af16a19109c3dfc1200
2135-
React-featureflagsnativemodule: 23528c7e7d50782b7ef0804168ba40bbaf1e86ab
2136-
React-graphics: fefe48f71bfe6f48fd037f59e8277b12e91b6be1
2137-
React-hermes: a9a0c8377627b5506ef9a7b6f60a805c306e3f51
2138-
React-idlecallbacksnativemodule: 7e2b6a3b70e042f89cd91dbd73c479bb39a72a7e
2139-
React-ImageManager: e3300996ac2e2914bf821f71e2f2c92ae6e62ae2
2140-
React-jserrorhandler: fa75876c662e5d7e79d6efc763fc9f4c88e26986
2141-
React-jsi: f3f51595cc4c089037b536368f016d4742bf9cf7
2142-
React-jsiexecutor: cca6c232db461e2fd213a11e9364cfa6fdaa20eb
2143-
React-jsinspector: 2bd4c9fddf189d6ec2abf4948461060502582bef
2144-
React-jsinspectortracing: a417d8a0ad481edaa415734b4dac81e3e5ee7dc6
2145-
React-jsitracing: 1ff7172c5b0522cbf6c98d82bdbb160e49b5804e
2146-
React-logger: 018826bfd51b9f18e87f67db1590bc510ad20664
2147-
React-Mapbuffer: 3c11cee7737609275c7b66bd0b1de475f094cedf
2148-
React-microtasksnativemodule: 843f352b32aacbe13a9c750190d34df44c3e6c2c
2149-
react-native-safe-area-context: 0f14bce545abcdfbff79ce2e3c78c109f0be283e
2150-
react-native-skia: 4c46da1d88de9287c05a5c6a99725995a69e56f5
2151-
React-NativeModulesApple: 88433b6946778bea9c153e27b671de15411bf225
2152-
React-perflogger: 9e8d3c0dc0194eb932162812a168aa5dc662f418
2153-
React-performancetimeline: 5a2d6efef52bdcefac079c7baa30934978acd023
2181+
React-featureflagsnativemodule: d7cddf6d907b4e5ab84f9e744b7e88461656e48c
2182+
React-graphics: b0f78580cdaf5800d25437e3d41cc6c3d83b7aea
2183+
React-hermes: 71186f872c932e4574d5feb3ed754dda63a0b3bd
2184+
React-idlecallbacksnativemodule: dd2af19cdd3bc55149d17a2409ed72b694dfbe9c
2185+
React-ImageManager: a77dde8d5aa6a2b6962c702bf3a47695ef0aa32b
2186+
React-jserrorhandler: 9c14e89f12d5904257a79aaf84a70cd2e5ac07ba
2187+
React-jsi: 0775a66820496769ad83e629f0f5cce621a57fc7
2188+
React-jsiexecutor: 2cf5ba481386803f3c88b85c63fa102cba5d769e
2189+
React-jsinspector: 8052d532bb7a98b6e021755674659802fb140cc5
2190+
React-jsinspectortracing: bdd8fd0adcb4813663562e7874c5842449df6d8a
2191+
React-jsitracing: 2bab3bf55de3d04baf205def375fa6643c47c794
2192+
React-logger: 795cd5055782db394f187f9db0477d4b25b44291
2193+
React-Mapbuffer: 0502faf46cab8fb89cfc7bf3e6c6109b6ef9b5de
2194+
React-microtasksnativemodule: 663bc64e3a96c5fc91081923ae7481adc1359a78
2195+
react-native-safe-area-context: 286b3e7b5589795bb85ffc38faf4c0706c48a092
2196+
react-native-skia: 75c085ab6e64dec94731a7ab93cc30880ebe4eed
2197+
react-native-slider: 27263d134d55db948a4706f1e47d0ec88fb354dd
2198+
React-NativeModulesApple: 16fbd5b040ff6c492dacc361d49e63cba7a6a7a1
2199+
React-perflogger: ab51b7592532a0ea45bf6eed7e6cae14a368b678
2200+
React-performancetimeline: bc2e48198ec814d578ac8401f65d78a574358203
21542201
React-RCTActionSheet: 592674cf61142497e0e820688f5a696e41bf16dd
2155-
React-RCTAnimation: e6d669872f9b3b4ab9527aab283b7c49283236b7
2156-
React-RCTAppDelegate: de2343fe08be4c945d57e0ecce44afcc7dd8fc03
2157-
React-RCTBlob: 3e2dce94c56218becc4b32b627fc2293149f798d
2158-
React-RCTFabric: cac2c033381d79a5956e08550b0220cb2d78ea93
2159-
React-RCTFBReactNativeSpec: d10ca5e0ccbfeac8c047361fedf8e4ac653887b6
2160-
React-RCTImage: dc04b176c022d12a8f55ae7a7279b1e091066ae0
2161-
React-RCTLinking: 88f5e37fe4f26fbc80791aa2a5f01baf9b9a3fd5
2162-
React-RCTNetwork: f213693565efbd698b8e9c18d700a514b49c0c8e
2163-
React-RCTSettings: a2d32a90c45a3575568cad850abc45924999b8a5
2164-
React-RCTText: 54cdcd1cbf6f6a91dc6317f5d2c2b7fc3f6bf7a0
2165-
React-RCTVibration: 11dae0e7f577b5807bb7d31e2e881eb46f854fd4
2202+
React-RCTAnimation: 8fbb8dba757b49c78f4db403133ab6399a4ce952
2203+
React-RCTAppDelegate: 7f88baa8cb4e5d6c38bb4d84339925c70c9ac864
2204+
React-RCTBlob: f89b162d0fe6b570a18e755eb16cbe356d3c6d17
2205+
React-RCTFabric: 8ad6d875abe6e87312cef90e4b15ef7f6bed72e6
2206+
React-RCTFBReactNativeSpec: 8c29630c2f379c729300e4c1e540f3d1b78d1936
2207+
React-RCTImage: ccac9969940f170503857733f9a5f63578e106e1
2208+
React-RCTLinking: d82427bbf18415a3732105383dff119131cadd90
2209+
React-RCTNetwork: 12ad4d0fbde939e00251ca5ca890da2e6825cc3c
2210+
React-RCTSettings: e7865bf9f455abf427da349c855f8644b5c39afa
2211+
React-RCTText: 2cdfd88745059ec3202a0842ea75a956c7d6f27d
2212+
React-RCTVibration: a3a1458e6230dfd64b3768ebc0a4aac430d9d508
21662213
React-rendererconsistency: 64e897e00d2568fd8dfe31e2496f80e85c0aaad1
2167-
React-rendererdebug: 41ce452460c44bba715d9e41d5493a96de277764
2214+
React-rendererdebug: a3f6d3ae7d2fa0035885026756281c07ee32479e
21682215
React-rncore: 58748c2aa445f56b99e5118dad0aedb51c40ce9f
2169-
React-RuntimeApple: 7785ed0d8ae54da65a88736bb63ca97608a6d933
2170-
React-RuntimeCore: 6029ea70bc77f98cfd43ebe69217f14e93ba1f12
2216+
React-RuntimeApple: f0fda7bacabd32daa099cfda8f07466c30acd149
2217+
React-RuntimeCore: 683ee0b6a76d4b4bf6fbf83a541895b4887cc636
21712218
React-runtimeexecutor: a188df372373baf5066e6e229177836488799f80
2172-
React-RuntimeHermes: a264609c28b796edfffc8ae4cb8fad1773ab948b
2173-
React-runtimescheduler: 23ec3a1e0fb1ec752d1a9c1fb15258c30bfc7222
2219+
React-RuntimeHermes: 907c8e9bec13ea6466b94828c088c24590d4d0b6
2220+
React-runtimescheduler: a2e2a39125dd6426b5d8b773f689d660cd7c5f60
21742221
React-timing: bb220a53a795ed57976a4855c521f3de2f298fe5
2175-
React-utils: 3b054aaebe658fc710a8d239d0e4b9fd3e0b78f9
2176-
ReactAppDependencyProvider: a1fb08dfdc7ebc387b2e54cfc9decd283ed821d8
2177-
ReactCodegen: e232f8db3a40721044ec81b9388f95a7afaad36a
2178-
ReactCommon: 0c097b53f03d6bf166edbcd0915da32f3015dd90
2179-
ReactNativeHost: f9584a700dc379cfa223203d0d51e492df84a7a8
2180-
ReactTestApp-DevSupport: 16672810b0675a3bab6be3b3e85f1ce4b93144da
2222+
React-utils: 300d8bbb6555dcffaca71e7a0663201b5c7edbbc
2223+
ReactAppDependencyProvider: f2e81d80afd71a8058589e19d8a134243fa53f17
2224+
ReactCodegen: 50b6e45bbbef9b39d9798820cdbe87bfc7922e22
2225+
ReactCommon: 3d39389f8e2a2157d5c999f8fba57bd1c8f226f0
2226+
ReactNativeHost: f2ecc49200441384efb6c6e8bffe62ba29ee16ae
2227+
ReactTestApp-DevSupport: 15d2ef4884e8f5fd30ded3dec59b010f76384f37
21812228
ReactTestApp-Resources: 1bd9ff10e4c24f2ad87101a32023721ae923bccf
2182-
RNGestureHandler: dcb1b1db024f3744b03af56d132f4f72c4c27195
2183-
RNReanimated: 3b2312c84f8c747ab1e9d9c3ce879e93a5ba96f3
2184-
RNScreens: 790123c4a28783d80a342ce42e8c7381bed62db1
2185-
RNSVG: 8126581b369adf6a0004b6a6cab1a55e3002d5b0
2229+
RNGestureHandler: 66e593addd8952725107cfaa4f5e3378e946b541
2230+
RNReanimated: b292a2aee945230a9c5e01889043ba088b5fb9b8
2231+
RNScreens: 0f01bbed9bd8045a8d58e4b46993c28c7f498f3c
2232+
RNSVG: 8588ee1ca9b2e6fd2c99466e35b3db0e9f81bb40
21862233
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2187-
Yoga: afd04ff05ebe0121a00c468a8a3c8080221cb14c
2234+
Yoga: 9b7fb56e7b08cde60e2153344fa6afbd88e5d99f
21882235

21892236
PODFILE CHECKSUM: 87506345285a0371afb28b9c3e6daaa999c214f3
21902237

2191-
COCOAPODS: 1.16.2
2238+
COCOAPODS: 1.15.2

‎apps/example/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
},
1717
"dependencies": {
1818
"@callstack/react-native-visionos": "^0.75.0",
19+
"@react-native-community/slider": "^4.5.7",
1920
"@react-navigation/bottom-tabs": "^7.2.1",
2021
"@react-navigation/elements": "^2.2.6",
2122
"@react-navigation/native": "^7.0.15",

‎externals/depot_tools

Submodule depot_tools updated from 838762e to 5cc29c7

‎packages/skia/android/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ set (SKIA_SKUNICODE_ICU_LIB "skunicode_icu")
6161
set (SKIA_SKOTTIE_LIB "skottie")
6262
set (SKIA_SKSG_LIB "sksg")
6363
set (SKIA_PATHOPS_LIB "pathops")
64+
set (SKIA_JSONREADER_LIB "jsonreader")
6465

6566

6667
# Clear some variables
@@ -123,6 +124,7 @@ add_library(
123124

124125
"${PROJECT_SOURCE_DIR}/../cpp/api/third_party/CSSColorParser.cpp"
125126
"${PROJECT_SOURCE_DIR}/../cpp/api/third_party/base64.cpp"
127+
"${PROJECT_SOURCE_DIR}/../cpp/api/third_party/SkottieUtils.cpp"
126128
${BACKEND_SOURCES}
127129
)
128130

@@ -181,6 +183,9 @@ set_property(TARGET skunicode_icu PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/
181183
add_library(pathops STATIC IMPORTED)
182184
set_property(TARGET pathops PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libpathops.a")
183185

186+
add_library(jsonreader STATIC IMPORTED)
187+
set_property(TARGET jsonreader PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libjsonreader.a")
188+
184189
find_library(
185190
LOG_LIB
186191
log
@@ -310,6 +315,7 @@ if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
310315
${SKIA_SKOTTIE_LIB}
311316
${SKIA_SKSG_LIB}
312317
${SKIA_PATHOPS_LIB}
318+
${SKIA_JSONREADER_LIB}
313319
${SKIA_LIB}
314320
-ljnigraphics
315321
-lGLESv2
@@ -333,6 +339,7 @@ else()
333339
${SKIA_SKOTTIE_LIB}
334340
${SKIA_SKSG_LIB}
335341
${SKIA_PATHOPS_LIB}
342+
${SKIA_JSONREADER_LIB}
336343
${SKIA_LIB}
337344
-ljnigraphics
338345
-lGLESv2

‎packages/skia/apple/SkiaCVPixelBufferUtils.mm

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,16 @@
3030
#include <TargetConditionals.h>
3131
#if TARGET_RT_BIG_ENDIAN
3232
#define FourCC2Str(fourcc) \
33-
(const char[]){*((char *)&fourcc), *(((char *)&fourcc) + 1), \
34-
*(((char *)&fourcc) + 2), *(((char *)&fourcc) + 3), 0}
33+
(const char[]) { \
34+
*((char *)&fourcc), *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 2), \
35+
*(((char *)&fourcc) + 3), 0 \
36+
}
3537
#else
3638
#define FourCC2Str(fourcc) \
37-
(const char[]){*(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2), \
38-
*(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0}
39+
(const char[]) { \
40+
*(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2), \
41+
*(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0 \
42+
}
3943
#endif
4044

4145
// pragma MARK: TextureHolder

‎packages/skia/cpp/api/recorder/Convertor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,9 +434,9 @@ sk_sp<SkSVGDOM> getPropertyValue(jsi::Runtime &runtime,
434434
"Expected SkSvgDom object or null for the svg property.");
435435
}
436436

437-
template<>
437+
template <>
438438
sk_sp<skottie::Animation> getPropertyValue(jsi::Runtime &runtime,
439-
const jsi::Value &value) {
439+
const jsi::Value &value) {
440440
if (value.isObject() && value.asObject(runtime).isHostObject(runtime)) {
441441
auto ptr = std::dynamic_pointer_cast<JsiSkSkottie>(
442442
value.asObject(runtime).asHostObject(runtime));

‎packages/skia/cpp/api/third_party/SkottieUtils.h

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
* found in the LICENSE file.
66
*/
77

8-
#ifndef SkottieUtils_DEFINED
9-
#define SkottieUtils_DEFINED
8+
#pragma once
109

1110
#include "include/core/SkRefCnt.h"
1211
#include "include/core/SkString.h"
@@ -22,20 +21,20 @@
2221
struct SkSize;
2322

2423
namespace skottie {
25-
class MarkerObserver;
24+
class MarkerObserver;
2625

27-
void PropertyObserver::onColorProperty(
26+
inline void PropertyObserver::onColorProperty(
2827
const char node_name[], const LazyHandle<ColorPropertyHandle> &) {}
2928

30-
void PropertyObserver::onOpacityProperty(
29+
inline void PropertyObserver::onOpacityProperty(
3130
const char node_name[], const LazyHandle<OpacityPropertyHandle> &) {}
32-
void PropertyObserver::onTextProperty(const char node_name[],
31+
inline void PropertyObserver::onTextProperty(const char node_name[],
3332
const LazyHandle<TextPropertyHandle> &) {}
34-
void PropertyObserver::onTransformProperty(
33+
inline void PropertyObserver::onTransformProperty(
3534
const char node_name[], const LazyHandle<TransformPropertyHandle> &) {}
36-
void PropertyObserver::onEnterNode(const char node_name[], NodeType node_type) {
35+
inline void PropertyObserver::onEnterNode(const char node_name[], NodeType node_type) {
3736
}
38-
void PropertyObserver::onLeavingNode(const char node_name[],
37+
inline void PropertyObserver::onLeavingNode(const char node_name[],
3938
NodeType node_type) {}
4039

4140
} // namespace skottie
@@ -171,4 +170,3 @@ class ExternalAnimationPrecompInterceptor final
171170

172171
} // namespace RNSkia
173172

174-
#endif // SkottieUtils_DEFINED

0 commit comments

Comments
 (0)