From a88f8224c35d67caa069f3375ec0e0e737e00684 Mon Sep 17 00:00:00 2001 From: Mike Diarmid Date: Fri, 17 May 2019 20:46:24 +0100 Subject: [PATCH 1/4] [ios][docs] document podspec param --- docs/dependencies.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/dependencies.md b/docs/dependencies.md index bfd20cbdb..afdc4f198 100644 --- a/docs/dependencies.md +++ b/docs/dependencies.md @@ -56,6 +56,7 @@ The following settings are available on iOS and Android: ```ts type DependencyParamsIOST = { project?: string, + podspec?: string, sharedLibraries?: string[], }; @@ -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. From d20cfaf0d28e2182a6d17dcf556682b3998dd1a9 Mon Sep 17 00:00:00 2001 From: Mike Diarmid Date: Fri, 17 May 2019 20:52:26 +0100 Subject: [PATCH 2/4] [ios] add podspec to dependencyConfig schema --- packages/cli/src/tools/config/schema.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cli/src/tools/config/schema.js b/packages/cli/src/tools/config/schema.js index f5575fce5..548a0f242 100644 --- a/packages/cli/src/tools/config/schema.js +++ b/packages/cli/src/tools/config/schema.js @@ -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(), }) From 4d0021c6b255cf3d38584d9c11de9964796f8d20 Mon Sep 17 00:00:00 2001 From: Mike Diarmid Date: Fri, 17 May 2019 21:11:07 +0100 Subject: [PATCH 3/4] [types] add podspec to config --- types/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/types/index.js b/types/index.js index b0fa6d58f..313d0e5ed 100644 --- a/types/index.js +++ b/types/index.js @@ -66,6 +66,7 @@ type ProjectParamsAndroidT = { */ type ProjectParamsIOST = { project?: string, + podspec?: string, sharedLibraries?: string[], libraryFolder?: string, plist: any[], @@ -221,7 +222,7 @@ type ProjectConfigIOST = { folder: string, pbxprojPath: string, podfile: null, - podspec: null, + podspec: null | string, projectPath: string, projectName: string, libraryFolder: string, From cf9b4a55b7785800bf4c47f6514bb8179ac8e023 Mon Sep 17 00:00:00 2001 From: Mike Diarmid Date: Fri, 17 May 2019 21:12:31 +0100 Subject: [PATCH 4/4] [config] add podspec param override to config --- packages/platform-ios/src/config/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/platform-ios/src/config/index.js b/packages/platform-ios/src/config/index.js index fd3e3a6b3..258d4afb1 100644 --- a/packages/platform-ios/src/config/index.js +++ b/packages/platform-ios/src/config/index.js @@ -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',