Skip to content

Commit 32f33ff

Browse files
committed
Merge branch 'main' into feat/windows
2 parents b2a6cb5 + c1b7378 commit 32f33ff

2 files changed

Lines changed: 13 additions & 11 deletions

File tree

.github/workflows/npm_release_cli.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ jobs:
7373
7474
- name: Bump version for dev release
7575
if: ${{ !contains(github.ref, 'refs/tags/') && (github.event_name != 'workflow_dispatch' || inputs.release_type == 'dev') }}
76+
env:
77+
NPM_TAG: ${{ github.event_name == 'workflow_dispatch' && inputs.release_type == 'dev' && 'dev' || 'next' }}
7678
run: |
7779
NPM_VERSION=$(node ./scripts/get-next-version.js)
7880
echo NPM_VERSION=$NPM_VERSION >> $GITHUB_ENV

lib/services/ios-project-service.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -500,12 +500,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
500500
}
501501

502502
private async isDynamicFramework(frameworkPath: string): Promise<boolean> {
503-
const isDynamicFrameworkBundle = async (
504-
bundlePath: string,
505-
frameworkName: string,
506-
) => {
507-
const frameworkBinaryPath = path.join(bundlePath, frameworkName);
508-
503+
const isDynamicFrameworkBundle = async (frameworkBinaryPath: string) => {
509504
const fileResult = (
510505
await this.$childProcess.spawnFromEvent(
511506
"file",
@@ -533,10 +528,15 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
533528
singlePlatformFramework,
534529
path.extname(singlePlatformFramework),
535530
);
536-
isDynamic = await isDynamicFrameworkBundle(
537-
singlePlatformFramework,
538-
frameworkName,
539-
);
531+
let frameworkBinaryPath = path.join(singlePlatformFramework, frameworkName)
532+
if (library.BinaryPath) {
533+
frameworkBinaryPath = path.join(
534+
frameworkPath,
535+
library.LibraryIdentifier,
536+
library.BinaryPath,
537+
);
538+
}
539+
isDynamic = await isDynamicFrameworkBundle(frameworkBinaryPath);
540540
break;
541541
}
542542
}
@@ -546,7 +546,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
546546
frameworkPath,
547547
path.extname(frameworkPath),
548548
);
549-
return await isDynamicFrameworkBundle(frameworkPath, frameworkName);
549+
return await isDynamicFrameworkBundle(path.join(frameworkPath, frameworkName));
550550
}
551551
}
552552

0 commit comments

Comments
 (0)