Skip to content

Commit f4db230

Browse files
wcandillonwcandillon
authored
fix(💚): add missing xcframeworks files and remove duplicated headers (#2671)
1 parent bf416d8 commit f4db230

17 files changed

+54
-72
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ jobs:
232232
env:
233233
JAVA_OPTS: "-XX:MaxHeapSize=6g"
234234
run: |
235-
yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --force --concurrency 1
235+
yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --concurrency 1
236236
237237
- name: Cache apk
238238
if: env.turbo_cache_hit != 1

‎apps/paper/ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1935,7 +1935,7 @@ SPEC CHECKSUMS:
19351935
React-Mapbuffer: 1c08607305558666fd16678b85ef135e455d5c96
19361936
React-microtasksnativemodule: 87b8de96f937faefece8afd2cb3a518321b2ef99
19371937
react-native-safe-area-context: ab8f4a3d8180913bd78ae75dd599c94cce3d5e9a
1938-
react-native-skia: b1f33ae82bb728aee1d1602a6adfaee52af43f61
1938+
react-native-skia: 89e0ec26e70ca4f34a7a1f7425bc955baf77c566
19391939
react-native-slider: 97ce0bd921f40de79cead9754546d5e4e7ba44f8
19401940
react-native-wgpu: fb9d60b0f4c63a03fb60bd986d758aeffca6ee13
19411941
React-nativeconfig: 57781b79e11d5af7573e6f77cbf1143b71802a6d

‎packages/skia/android/cpp/rnskia-android/GrAHardwareBufferUtils.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
#define GL_GLEXT_PROTOTYPES
1212
#define EGL_EGLEXT_PROTOTYPES
1313

14-
#include "include/gpu/GrBackendSurface.h"
15-
#include "include/gpu/GrDirectContext.h"
14+
#include "include/gpu/ganesh/GrBackendSurface.h"
15+
#include "include/gpu/ganesh/GrDirectContext.h"
1616
#include "include/gpu/ganesh/gl/GrGLBackendSurface.h"
17-
#include "include/gpu/gl/GrGLTypes.h"
17+
#include "include/gpu/ganesh/gl/GrGLTypes.h"
1818
#include "src/gpu/ganesh/gl/GrGLDefines.h"
1919
// #include "src/gpu/ganesh/GrDirectContextPriv.h"
2020
// #include "src/gpu/ganesh/gl/GrGLUtil.h"

‎packages/skia/android/cpp/rnskia-android/GrAHardwareBufferUtils.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
#if __ANDROID_API__ >= 26
88

9-
#include "include/gpu/GrBackendSurface.h"
10-
#include "include/gpu/GrTypes.h"
9+
#include "include/gpu/ganesh/GrBackendSurface.h"
10+
#include "include/gpu/ganesh/GrTypes.h"
1111

1212
class GrDirectContext;
1313

‎packages/skia/android/cpp/rnskia-android/SkiaOpenGLHelper.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#include "include/core/SkCanvas.h"
1616
#include "include/core/SkColorSpace.h"
1717
#include "include/core/SkSurface.h"
18-
#include "include/gpu/GrDirectContext.h"
18+
#include "include/gpu/ganesh/GrDirectContext.h"
1919
#include "include/gpu/ganesh/gl/GrGLDirectContext.h"
20-
#include "include/gpu/gl/GrGLInterface.h"
20+
#include "include/gpu/ganesh/gl/GrGLInterface.h"
2121

2222
#pragma clang diagnostic pop
2323

‎packages/skia/android/cpp/rnskia-android/SkiaOpenGLSurfaceFactory.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
#include "include/core/SkCanvas.h"
2323
#include "include/core/SkColorSpace.h"
2424
#include "include/core/SkSurface.h"
25-
#include "include/gpu/GrBackendSurface.h"
26-
#include "include/gpu/GrDirectContext.h"
25+
#include "include/gpu/ganesh/GrBackendSurface.h"
26+
#include "include/gpu/ganesh/GrDirectContext.h"
2727
#include "include/gpu/ganesh/SkSurfaceGanesh.h"
28-
#include "include/gpu/gl/GrGLInterface.h"
28+
#include "include/gpu/ganesh/gl/GrGLInterface.h"
2929

3030
#pragma clang diagnostic pop
3131

‎packages/skia/cpp/api/JsiSkSurface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#pragma clang diagnostic ignored "-Wdocumentation"
1515

1616
#include "include/core/SkSurface.h"
17-
#include "include/gpu/GrDirectContext.h"
17+
#include "include/gpu/ganesh/GrDirectContext.h"
1818

1919
#pragma clang diagnostic pop
2020

‎packages/skia/ios/RNSkia-iOS/RNSkMetalCanvasProvider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#pragma clang diagnostic push
1010
#pragma clang diagnostic ignored "-Wdocumentation"
1111

12-
#import <include/gpu/GrDirectContext.h>
12+
#import <include/gpu/ganesh/GrDirectContext.h>
1313

1414
#pragma clang diagnostic pop
1515

‎packages/skia/ios/RNSkia-iOS/RNSkMetalCanvasProvider.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#import "include/core/SkColorSpace.h"
1010
#import "include/core/SkSurface.h"
1111

12-
#import <include/gpu/GrBackendSurface.h>
13-
#import <include/gpu/GrDirectContext.h>
12+
#import <include/gpu/ganesh/GrBackendSurface.h>
13+
#import <include/gpu/ganesh/GrDirectContext.h>
1414
#import <include/gpu/ganesh/SkSurfaceGanesh.h>
1515

1616
#pragma clang diagnostic pop

‎packages/skia/ios/RNSkia-iOS/SkiaCVPixelBufferUtils.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#pragma clang diagnostic ignored "-Wdocumentation"
1818
#import "include/core/SkColorSpace.h"
1919
#import "include/core/SkImage.h"
20-
#import "include/gpu/GrBackendSurface.h"
21-
#import "include/gpu/GrYUVABackendTextures.h"
20+
#import "include/gpu/ganesh/GrBackendSurface.h"
21+
#import "include/gpu/ganesh/GrYUVABackendTextures.h"
2222
#pragma clang diagnostic pop
2323

2424
/**

‎packages/skia/ios/RNSkia-iOS/SkiaCVPixelBufferUtils.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#pragma clang diagnostic push
1212
#pragma clang diagnostic ignored "-Wdocumentation"
1313
#import "include/core/SkColorSpace.h"
14-
#import <include/gpu/GrBackendSurface.h>
14+
#import <include/gpu/ganesh/GrBackendSurface.h>
1515
#import <include/gpu/ganesh/SkImageGanesh.h>
1616
#import <include/gpu/ganesh/mtl/GrMtlBackendContext.h>
1717
#import <include/gpu/ganesh/mtl/GrMtlBackendSurface.h>

‎packages/skia/ios/RNSkia-iOS/SkiaMetalSurfaceFactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#import "include/core/SkCanvas.h"
1212
#import <CoreMedia/CMSampleBuffer.h>
1313
#import <CoreVideo/CVMetalTextureCache.h>
14-
#import <include/gpu/GrDirectContext.h>
14+
#import <include/gpu/ganesh/GrDirectContext.h>
1515

1616
#pragma clang diagnostic pop
1717

‎packages/skia/ios/RNSkia-iOS/SkiaMetalSurfaceFactory.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#import "include/core/SkColorSpace.h"
1111
#import "include/core/SkSurface.h"
1212

13-
#import <include/gpu/GrBackendSurface.h>
14-
#import <include/gpu/GrDirectContext.h>
13+
#import <include/gpu/ganesh/GrBackendSurface.h>
14+
#import <include/gpu/ganesh/GrDirectContext.h>
1515
#import <include/gpu/ganesh/SkImageGanesh.h>
1616
#import <include/gpu/ganesh/SkSurfaceGanesh.h>
1717
#import <include/gpu/ganesh/mtl/GrMtlBackendContext.h>

‎packages/skia/package.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,7 @@
2929
"jestEnv.mjs",
3030
"cpp/**/*.{h,cpp}",
3131
"ios/**",
32-
"libs/ios/libskia.xcframework/**",
33-
"libs/ios/libskshaper.xcframework/**",
34-
"libs/ios/libsvg.xcframework/**",
35-
"libs/ios/libskottie.xcframework/**",
36-
"libs/ios/libsksg.xcframework/**",
37-
"libs/ios/libskparagraph.xcframework/**",
38-
"libs/ios/libskunicode.xcframework/**",
32+
"libs/ios/*.xcframework/**",
3933
"react-native-skia.podspec",
4034
"scripts/setup-canvaskit.js",
4135
"dist/**"

‎packages/skia/react-native-skia.podspec

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ Pod::Spec.new do |s|
1212
@shopify/react-native-skia
1313
DESC
1414
s.homepage = "https://github.com/shopify/react-native-skia"
15-
# brief license entry:
1615
s.license = "MIT"
17-
# optional - use expanded license entry instead:
18-
# s.license = { :type => "MIT", :file => "LICENSE" }
19-
s.authors = { "Your Name" => "[email protected]" }
16+
s.license = { :type => "MIT", :file => "LICENSE.md" }
17+
s.authors = {
18+
"Christian Falch" => "[email protected]",
19+
"William Candillon" => "[email protected]"
20+
}
2021
s.platforms = { :ios => "13.0" }
2122
s.source = { :git => "https://github.com/shopify/react-native-skia/react-native-skia.git", :tag => "#{s.version}" }
2223

‎packages/skia/scripts/copy-skia-module-headers.ts

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,29 @@ const copyModule = (module: string) => [
3838
"mkdir -p ./cpp/skia/modules/skunicode/include/",
3939
"cp -a ../../externals/skia/modules/skunicode/include/SkUnicode.h ./cpp/skia/modules/skunicode/include/.",
4040

41-
"mkdir -p ./cpp/skia/include/gpu/graphite",
41+
// Remove migrated headers
42+
//grep -R "Delete this after migrating clients" cpp
43+
"rm -rf ./cpp/skia/include/gpu/GrContextThreadSafeProxy.h",
44+
"rm -rf ./cpp/skia/include/gpu/GrDirectContext.h",
45+
"rm -rf ./cpp/skia/include/gpu/GrBackendSemaphore.h",
46+
"rm -rf ./cpp/skia/include/gpu/mock/GrMockTypes.h",
47+
"rm -rf ./cpp/skia/include/gpu/GrDriverBugWorkaroundsAutogen.h",
48+
"rm -rf ./cpp/skia/include/gpu/GrTypes.h",
49+
"rm -rf ./cpp/skia/include/gpu/vk/GrVkTypes.h",
50+
"rm -rf ./cpp/skia/include/gpu/GrDriverBugWorkarounds.h",
51+
"rm -rf ./cpp/skia/include/gpu/GrContextOptions.h",
52+
"rm -rf ./cpp/skia/include/gpu/gl/GrGLExtensions.h",
53+
"rm -rf ./cpp/skia/include/gpu/gl/GrGLAssembleInterface.h",
54+
"rm -rf ./cpp/skia/include/gpu/gl/GrGLTypes.h",
55+
"rm -rf ./cpp/skia/include/gpu/gl/GrGLConfig.h",
56+
"rm -rf ./cpp/skia/include/gpu/gl/GrGLFunctions.h",
57+
"rm -rf ./cpp/skia/include/gpu/gl/GrGLAssembleHelpers.h",
58+
"rm -rf ./cpp/skia/include/gpu/gl/GrGLInterface.h",
59+
"rm -rf ./cpp/skia/include/gpu/GrYUVABackendTextures.h",
60+
"rm -rf ./cpp/skia/include/gpu/GrRecordingContext.h",
61+
"rm -rf ./cpp/skia/include/gpu/GrBackendSurface.h",
62+
"rm -rf ./cpp/skia/include/gpu/d3d/GrD3DBackendContext.h",
63+
"rm -rf ./cpp/skia/include/gpu/d3d/GrD3DTypes.h",
4264
].map((cmd) => {
4365
console.log(cmd);
4466
executeCmdSync(cmd);

‎turbo.json

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,13 @@
22
"$schema": "https://turbo.build/schema.json",
33
"tasks": {
44
"build:android": {
5-
"env": ["JAVA_HOME", "ANDROID_NDK", "ANDROID_SDK", "ANDROID_HOME"],
6-
"inputs": [
7-
"packages/*/package.json",
8-
"packages/app/package.json",
9-
"packages/*/src/*.{ts,tsx}",
10-
"apps/*/src/*.{ts,tsx}",
11-
"apps/*/cpp/*.{cpp,h}",
12-
"packages/*/android",
13-
"!packages/*/android/build",
14-
"apps/*/src/android",
15-
"!apps/*/src/.gradle",
16-
"!apps/*/src/build",
17-
"!apps/*/src/app/build"
18-
],
19-
"outputs": [
20-
"apps/*/android/**"
21-
]
5+
"env": ["JAVA_HOME", "ANDROID_NDK", "ANDROID_SDK", "ANDROID_HOME"]
226
},
237
"build:ios": {
24-
"dependsOn": ["pod:install"],
25-
"outputs": [
26-
"apps/*/ios/build/**",
27-
"!apps/*/ios/.ios.xcode.env.local"
28-
],
29-
"inputs": [
30-
"packages/*/package.json",
31-
"packages/app/package.json",
32-
"packages/*/src/*.{ts,tsx}",
33-
"apps/*/src/*.{ts,tsx}",
34-
"apps/*/cpp/*.{cpp,h}",
35-
"packages/*/*.podspec",
36-
"packages/*/ios",
37-
"apps/*/ios",
38-
"!apps/*/ios/.ios.xcode.env.local",
39-
"!apps/*/ios/build",
40-
"!apps/*/ios/Pods"
41-
]
8+
"dependsOn": ["pod:install"]
429
},
4310
"pod:install": {
44-
"cache": false,
45-
"inputs": ["**/ios/Podfile", "**/ios/Podfile.lock"],
46-
"outputs": ["**/ios/Pods/**"]
11+
"cache": false
4712
},
4813
"lint": {},
4914
"tsc": {},

0 commit comments

Comments
 (0)