Skip to content

feat: allow dependencyConfig to override podspec name #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 20, 2019
Merged

feat: allow dependencyConfig to override podspec name #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a88f822
[ios][docs] document podspec param
Salakar May 17, 2019
d20cfaf
[ios] add podspec to dependencyConfig schema
Salakar May 17, 2019
4d0021c
[types] add podspec to config
Salakar May 17, 2019
cf9b4a5
[config] add podspec param override to config
Salakar May 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/dependencies.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ The following settings are available on iOS and Android:
```ts
type DependencyParamsIOST = {
project?: string,
podspec?: string,
sharedLibraries?: string[],
};

Expand All @@ -71,6 +72,10 @@ type DependencyParamsAndroidT = {

Custom path to `.xcodeproj`

#### platforms.ios.podspec

Custom `podspec` name to use when auto-linking (without the file extension). Your `podspec` file must be located in the root of the dependency package.

#### platforms.ios.sharedLibraries

An array of shared iOS libraries to link with the dependency. E.g. `libc++`. This is mostly a requirement of the native code that a dependency ships with.
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/tools/config/schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export const dependencyConfig = t
ios: t
.object({
project: t.string(),
podspec: t.string(),
sharedLibraries: t.array().items(t.string()),
libraryFolder: t.string(),
})
Expand Down
2 changes: 1 addition & 1 deletion packages/platform-ios/src/config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export function projectConfig(
folder,
pbxprojPath: path.join(projectPath, 'project.pbxproj'),
podfile: findPodfilePath(projectPath),
podspec: findPodspecName(folder),
podspec: userConfig.podspec || findPodspecName(folder),
projectPath,
projectName: path.basename(projectPath),
libraryFolder: userConfig.libraryFolder || 'Libraries',
Expand Down
3 changes: 2 additions & 1 deletion types/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ type ProjectParamsAndroidT = {
*/
type ProjectParamsIOST = {
project?: string,
podspec?: string,
sharedLibraries?: string[],
libraryFolder?: string,
plist: any[],
Expand Down Expand Up @@ -221,7 +222,7 @@ type ProjectConfigIOST = {
folder: string,
pbxprojPath: string,
podfile: null,
podspec: null,
podspec: null | string,
projectPath: string,
projectName: string,
libraryFolder: string,
Expand Down