Skip to content

Commit 49e4d78

Browse files
committed
fix make xcframework error
1 parent 93df065 commit 49e4d78

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

.github/workflows/apple.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ jobs:
4545
./FFToolChain/main.sh install -p macos -l 'ass ffmpeg'
4646
./FFToolChain/main.sh install -p tvos -l 'ass ffmpeg'
4747
- name: Build iOS Framework
48-
run: cd examples/ios && ./build-framework.sh
48+
run: ./examples/ios/build-framework.sh
4949
- name: Build macOS Framework
50-
run: cd examples/macos && ./build-framework.sh
50+
run: ./examples/macos/build-framework.sh
5151
- name: Build tvOS Framework
52-
run: cd examples/tvos && ./build-framework.sh
52+
run: ./examples/tvos/build-framework.sh
5353
- name: Make xcframework
54-
run: cd examples/xcframewrok && ./make-xcframework.sh
54+
run: ./examples/xcframewrok/make-xcframework.sh
5555
- name: Make podspec
56-
run: cd examples/xcframewrok && ./make-podspec.sh "${{ env.TAG }}"
56+
run: ./examples/xcframewrok/make-podspec.sh "${{ env.TAG }}"
5757
- name: Make Distribution Resources
5858
run: |
5959
mkdir dist

examples/xcframewrok/make-xcframework.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ FMN="FSPlayer"
2323

2424
function get_inputs_with_path()
2525
{
26-
fmwk="${1}/$FMN/$FMN.framework"
26+
fmwk="${1}/$FMN.framework"
2727
inputs=""
2828
if [[ -d $fmwk ]]; then
2929
inputs="$inputs -framework $fmwk"
@@ -54,7 +54,6 @@ function get_inputs()
5454
function do_make_xcframework() {
5555
cd ..
5656
local XC_XCFRMK_DIR='xcframewrok'
57-
mkdir -p "$XC_XCFRMK_DIR"
5857
inputs="$(get_inputs)"
5958
output=$XC_XCFRMK_DIR/${FMN}.xcframework
6059
rm -rf "$output"

examples/xcframewrok/template.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"MattReach": "[email protected]"
1515
},
1616
"platforms": {
17-
"ios": "11.0",
17+
"ios": "12.0",
1818
"osx": "10.11",
1919
"tvos": "12.0"
2020
},

0 commit comments

Comments
 (0)