Skip to content

Commit a811666

Browse files
wcandillonwcandillon
authored
Make root package private (#2594)
1 parent 00ea5da commit a811666

23 files changed

+264
-495
lines changed

‎.github/workflows/android-ubuntu.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
- uses: actions/setup-node@v3
2626
with:
2727
cache: 'yarn'
28+
cache-dependency-path: package/yarn.lock
2829

2930
- name: Set up JDK 11
3031
uses: actions/setup-java@v1
@@ -40,30 +41,29 @@ jobs:
4041
- name: Set ANDROID_NDK
4142
run: echo "ANDROID_NDK=$ANDROID_HOME/ndk-bundle" >> $GITHUB_ENV
4243

43-
- name: Install root node dependencies
44+
- name: Install Package
45+
working-directory: package
4446
run: yarn
4547

4648
- name: Download Skia Binary Artifacts
4749
uses: dawidd6/action-download-artifact@v2
4850
with:
4951
workflow: "build-skia.yml"
5052
repo: shopify/react-native-skia
51-
path: artifacts
53+
path: package/artifacts
5254
branch: main
5355

5456
- name: Copy Artifacts to libs folder
57+
working-directory: package
5558
run: yarn workflow-copy-libs
5659

5760
- name: Copy Skia Headers
61+
working-directory: package
5862
run: yarn copy-skia-headers
5963

6064
- name: SDKs - accept licenses
6165
run: yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses
6266

63-
- name: Install Package
64-
working-directory: package
65-
run: yarn install
66-
6767
# Install node dependencies in specified directories using matrix
6868
- name: Install app node dependencies
6969
working-directory: ${{ matrix.directory }}

‎.github/workflows/android.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
- uses: actions/setup-node@v3
2626
with:
2727
node-version: 16
28+
cache-dependency-path: package/yarn.lock
2829
cache: 'yarn'
2930

3031
- name: Set up JDK 11
@@ -41,30 +42,29 @@ jobs:
4142
- name: Set ANDROID_NDK
4243
run: echo "ANDROID_NDK=$ANDROID_HOME/ndk-bundle" >> $GITHUB_ENV
4344

44-
- name: Install root node dependencies
45-
run: yarn
45+
- name: Install Package
46+
working-directory: package
47+
run: yarn install
4648

4749
- name: Download Skia Binary Artifacts
4850
uses: dawidd6/action-download-artifact@v2
4951
with:
5052
workflow: "build-skia.yml"
5153
repo: shopify/react-native-skia
52-
path: artifacts
54+
path: package/artifacts
5355
branch: main
5456

5557
- name: Copy Artifacts to libs folder
58+
working-directory: package
5659
run: yarn workflow-copy-libs
5760

5861
- name: Copy Skia Headers
62+
working-directory: package
5963
run: yarn copy-skia-headers
6064

6165
- name: SDKs - accept licenses
6266
run: y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses
6367

64-
- name: Install Package
65-
working-directory: package
66-
run: yarn install
67-
6868
- name: Install example app node dependencies
6969
working-directory: ${{ matrix.working-directory }}
7070
run: yarn
@@ -114,9 +114,11 @@ jobs:
114114
- uses: actions/setup-node@v3
115115
with:
116116
node-version: 16
117+
cache-dependency-path: package/yarn.lock
117118
cache: 'yarn'
118119

119120
- name: Install root dependencies
121+
working-directory: package
120122
run: yarn bootstrap
121123

122124
- name: Restore APK

‎.github/workflows/build-npm.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@ jobs:
1818
- uses: actions/setup-node@v3
1919
with:
2020
node-version: "lts/*"
21+
cache-dependency-path: package/yarn.lock
2122
cache: 'yarn'
22-
cache-dependency-path: 'package/yarn.lock'
23-
24-
- name: Install root node dependencies
25-
run: yarn
2623

2724
- name: Install package dependencies
2825
working-directory: package
@@ -32,13 +29,15 @@ jobs:
3229
uses: dawidd6/action-download-artifact@v2
3330
with:
3431
workflow: "build-skia.yml"
35-
path: artifacts
32+
path: package/artifacts
3633
branch: main
3734

3835
- name: Copy Artifacts to libs folder
36+
working-directory: package
3937
run: yarn workflow-copy-libs
4038

4139
- name: Copy Skia Headers
40+
working-directory: package
4241
run: yarn copy-skia-headers
4342

4443
- name: Build NPM Package

‎.github/workflows/build-skia.yml

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
build:
55
runs-on: macos-latest
66
env:
7-
WORKING_DIRECTORY: ./
7+
WORKING_DIRECTORY: ./package
88
steps:
99
- name: checkout
1010
uses: actions/checkout@v2
@@ -23,13 +23,15 @@ jobs:
2323
- name: Setup Nodejs and npm
2424
uses: actions/setup-node@v3
2525
with:
26+
cache-dependency-path: package/yarn.lock
2627
cache: yarn
2728

2829
- name: Install root node dependencies
30+
working-directory: ${{ env.WORKING_DIRECTORY }}
2931
run: yarn
3032

3133
- name: Build Skia
32-
working-directory: ${{ env.WORKING_DIRECTORY }}/
34+
working-directory: ${{ env.WORKING_DIRECTORY }}
3335
env:
3436
ANDROID_NDK: ${{ steps.setup-ndk.outputs.ndk-path }}
3537
run: yarn build-skia
@@ -40,66 +42,66 @@ jobs:
4042
with:
4143
name: skia-android-arm
4244
path: |
43-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm/libskia.a
44-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm/libskshaper.a
45-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm/libsvg.a
46-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm/libskottie.a
47-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm/libsksg.a
48-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm/libskparagraph.a
49-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm/libskunicode.a
45+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm/libskia.a
46+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm/libskshaper.a
47+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm/libsvg.a
48+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm/libskottie.a
49+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm/libsksg.a
50+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm/libskparagraph.a
51+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm/libskunicode.a
5052
5153
- name: Upload artifacts - Android arm64
5254
if: github.ref == 'refs/heads/main'
5355
uses: actions/upload-artifact@v2
5456
with:
5557
name: skia-android-arm-64
5658
path: |
57-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm64/libskia.a
58-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm64/libskshaper.a
59-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm64/libsvg.a
60-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm64/libskottie.a
61-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm64/libsksg.a
62-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm64/libskparagraph.a
63-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm64/libskunicode.a
59+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm64/libskia.a
60+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm64/libskshaper.a
61+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm64/libsvg.a
62+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm64/libskottie.a
63+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm64/libsksg.a
64+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm64/libskparagraph.a
65+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm64/libskunicode.a
6466
6567
- name: Upload artifacts - Android x86
6668
if: github.ref == 'refs/heads/main'
6769
uses: actions/upload-artifact@v2
6870
with:
6971
name: skia-android-arm-x86
7072
path: |
71-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x86/libskia.a
72-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x86/libskshaper.a
73-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x86/libsvg.a
74-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x86/libskottie.a
75-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x86/libsksg.a
76-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x86/libskparagraph.a
77-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x86/libskunicode.a
73+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x86/libskia.a
74+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x86/libskshaper.a
75+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x86/libsvg.a
76+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x86/libskottie.a
77+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x86/libsksg.a
78+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x86/libskparagraph.a
79+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x86/libskunicode.a
7880
7981
- name: Upload artifacts - Android x64
8082
if: github.ref == 'refs/heads/main'
8183
uses: actions/upload-artifact@v2
8284
with:
8385
name: skia-android-arm-x64
8486
path: |
85-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x64/libskia.a
86-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x64/libskshaper.a
87-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x64/libsvg.a
88-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x64/libskottie.a
89-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x64/libsksg.a
90-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x64/libskparagraph.a
91-
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x64/libskunicode.a
87+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x64/libskia.a
88+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x64/libskshaper.a
89+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x64/libsvg.a
90+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x64/libskottie.a
91+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x64/libsksg.a
92+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x64/libskparagraph.a
93+
${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x64/libskunicode.a
9294
9395
- name: Upload artifacts - iOS xcframeworks
9496
if: github.ref == 'refs/heads/main'
9597
uses: actions/upload-artifact@v2
9698
with:
9799
name: skia-ios-xcframeworks
98100
path: |
99-
${{ env.WORKING_DIRECTORY }}/package/libs/ios/libskia.xcframework
100-
${{ env.WORKING_DIRECTORY }}/package/libs/ios/libskshaper.xcframework
101-
${{ env.WORKING_DIRECTORY }}/package/libs/ios/libsvg.xcframework
102-
${{ env.WORKING_DIRECTORY }}/package/libs/ios/libskottie.xcframework
103-
${{ env.WORKING_DIRECTORY }}/package/libs/ios/libsksg.xcframework
104-
${{ env.WORKING_DIRECTORY }}/package/libs/ios/libskparagraph.xcframework
105-
${{ env.WORKING_DIRECTORY }}/package/libs/ios/libskunicode.xcframework
101+
${{ env.WORKING_DIRECTORY }}/../package/libs/ios/libskia.xcframework
102+
${{ env.WORKING_DIRECTORY }}/../package/libs/ios/libskshaper.xcframework
103+
${{ env.WORKING_DIRECTORY }}/../package/libs/ios/libsvg.xcframework
104+
${{ env.WORKING_DIRECTORY }}/../package/libs/ios/libskottie.xcframework
105+
${{ env.WORKING_DIRECTORY }}/../package/libs/ios/libsksg.xcframework
106+
${{ env.WORKING_DIRECTORY }}/../package/libs/ios/libskparagraph.xcframework
107+
${{ env.WORKING_DIRECTORY }}/../package/libs/ios/libskunicode.xcframework

‎.github/workflows/docs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
cache: yarn
2323

2424
- name: Install dependencies
25+
working-directory: package
2526
run: yarn bootstrap
2627

2728
- name: Build Documentation

‎.github/workflows/ios-build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,28 +27,28 @@ jobs:
2727

2828
- uses: actions/setup-node@v3
2929
with:
30+
cache-dependency-path: package/yarn.lock
3031
cache: 'yarn'
3132

32-
- name: Install root node dependencies
33-
run: yarn
33+
- name: Install Package
34+
working-directory: package
35+
run: yarn install --frozen-lockfile
3436

3537
- name: Download Skia Binary Artifacts
3638
uses: dawidd6/action-download-artifact@v2
3739
with:
3840
workflow: "build-skia.yml"
3941
repo: shopify/react-native-skia
40-
path: artifacts
42+
path: package/artifacts
4143
branch: main
4244

4345
- name: Copy Artifacts to libs folder
46+
working-directory: package
4447
run: yarn workflow-copy-libs
4548

4649
- name: Copy Skia Headers
47-
run: yarn copy-skia-headers
48-
49-
- name: Install Package
5050
working-directory: package
51-
run: yarn install --frozen-lockfile
51+
run: yarn copy-skia-headers
5252

5353
- name: Install app node_modules
5454
working-directory: ${{ matrix.working-directory }}

‎.github/workflows/tests.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,35 +27,45 @@ jobs:
2727
run: sudo apt-get install -y clang-format
2828

2929
- name: Run clang-format-ios
30+
working-directory: package
3031
run: yarn clang-format-ios --dry-run --Werror
3132

3233
- name: Run clang-format-android
34+
working-directory: package
3335
run: yarn clang-format-android --dry-run --Werror
3436

3537
- name: Run clang-format-common
38+
working-directory: package
3639
run: yarn clang-format-common --dry-run --Werror
3740

3841
- uses: actions/setup-node@v3
3942
with:
43+
cache-dependency-path: package/yarn.lock
4044
cache: 'yarn'
4145

4246
- name: Install root node dependencies
47+
working-directory: package
4348
run: yarn install --frozen-lockfile
4449

4550
- name: Typecheck the build scripts
51+
working-directory: package
4652
run: yarn tsc
4753

4854
- name: Install Package
49-
run: cd package; yarn install --frozen-lockfile
55+
working-directory: package
56+
run: yarn install --frozen-lockfile
5057

5158
- name: Lint Package
52-
run: cd package; yarn lint;
59+
working-directory: package
60+
run: yarn lint;
5361

5462
- name: TypeScript Package
55-
run: cd package; yarn tsc;
63+
working-directory: package
64+
run: yarn tsc;
5665

5766
- name: Run Package Unit tests
58-
run: cd package; yarn test;
67+
working-directory: package
68+
run: yarn test;
5969

6070
- name: Install Example/Fabric Example
6171
run: cd ${{ matrix.directory }}; yarn install --frozen-lockfile

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ And then the _SDK Location_ section. It will show you the NDK path, or the optio
4343

4444
### Building
4545

46+
- Go to the package folder `cd package`
4647
- Install dependencies `yarn bootstrap`
4748
- Build the Skia libraries with `yarn build-skia` (this can take a while)
4849
- Copy Skia headers `yarn copy-skia-headers`

‎package.json

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,7 @@
11
{
22
"name": "react-native-skia-dev-tools",
33
"version": "1.0.0",
4-
"description": "## Getting started",
5-
"main": "index.js",
6-
"directories": {
7-
"example": "example"
8-
},
9-
"devDependencies": {
10-
"@types/node": "16.11.7",
11-
"clang-format": "1.6.0",
12-
"rimraf": "3.0.2",
13-
"ts-node": "10.4.0",
14-
"typescript": "5.3.3"
15-
},
16-
"scripts": {
17-
"build-skia-ios-framework": "ts-node ./scripts/build-skia-ios-framework.ts",
18-
"build-skia-ios": "ts-node ./scripts/build-skia-ios.ts && yarn build-skia-ios-framework",
19-
"build-skia-android": "ts-node ./scripts/build-skia-android.ts",
20-
"build-skia": "yarn build-skia-ios && yarn build-skia-android",
21-
"clean-skia": "yarn rimraf ./package/libs && yarn rimraf ./externals/skia/out",
22-
"copy-skia-include-headers": "yarn rimraf ./package/cpp/skia/include/ && cp -a ./externals/skia/include/. ./package/cpp/skia/include",
23-
"copy-skia-module-headers": "ts-node ./scripts/copy-skia-module-headers.ts",
24-
"copy-skia-headers": "yarn copy-skia-include-headers && yarn copy-skia-module-headers",
25-
"build": "yarn build-skia && yarn copy-skia-headers",
26-
"clang-format": "yarn clang-format-ios && yarn clang-format-android && yarn clang-format-common",
27-
"clang-format-ios": "find package/ios/ -iname *.h -o -iname *.mm -o -iname *.cpp | xargs clang-format -i",
28-
"clang-format-android": "find package/android/cpp/ -iname *.h -o -iname *.m -o -iname *.cpp | xargs clang-format -i",
29-
"clang-format-common": "find package/cpp/ -iname *.h -o -iname *.m -o -iname *.cpp | xargs clang-format -i",
30-
"workflow-copy-libs": "yarn ts-node ./scripts/workflow-copy-libs.ts",
31-
"bootstrap": "yarn && cd ./package && yarn && cd .. && cd ./example && yarn && cd .. && cd ./fabricexample && yarn && cd ..",
32-
"cpplint": "cpplint --linelength=230 --filter=-legal/copyright,-whitespace/indent,-whitespace/comments,-whitespace/ending_newline,-build/include_order,-runtime/references,-readability/todo,-whitespace/blank_line,-whitespace/todo,-runtime/int,-build/c++11,-whitespace/parens --exclude=package/cpp/skia --exclude=package/ios --exclude=package/android/build --exclude=package/node_modules --recursive package"
33-
},
4+
"private": true,
345
"license": "MIT",
356
"licenseFilename": "LICENSE.md",
367
"readmeFilename": "README.md",

0 commit comments

Comments
 (0)