Native source code and a Podfile without a plugin #4282
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lib/services/cocoapods-service.ts
Outdated
| if (!this.$fs.exists(pluginPodFilePath)) { | ||
| public async applyPodfileToProject(moduleName: string, podfilePath: string, projectData: IProjectData, nativeProjectPath: string): Promise<void> { | ||
| if (!this.$fs.exists(podfilePath)) { | ||
| if (podfilePath === projectData.podfilePath) { |
There was a problem hiding this comment.
Why do we need this check?
lib/services/ios-project-service.ts
Outdated
| @@ -771,20 +771,27 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f | |||
| this.$logger.trace(`Images to remove from xcode project: ${imagesToRemove.join(", ")}`); | |||
| _.each(imagesToRemove, image => project.removeResourceFile(path.join(this.getAppResourcesDestinationDirectoryPath(projectData), image))); | |||
|
|
|||
| await this.prepareNativeSourceCode("src", path.join(projectData.appDirectoryPath, constants.APP_RESOURCES_FOLDER_NAME, this.getPlatformData(projectData).normalizedPlatformName, "src"), projectData); | |||
There was a problem hiding this comment.
We could extract some "src" constants.
jibon57
added a commit
to jibon57/nativescript-braintree
that referenced
this pull request
Jan 11, 2019
New feature no longer need it: NativeScript/nativescript-cli#4282
Fatme
reviewed
Jan 14, 2019
lib/definitions/project.d.ts
Outdated
| @@ -409,7 +410,7 @@ interface IPlatformProjectService extends NodeJS.EventEmitter, IPlatformProjectS | |||
| getAppResourcesDestinationDirectoryPath(projectData: IProjectData): string; | |||
|
|
|||
| cleanDeviceTempFolder(deviceIdentifier: string, projectData: IProjectData): Promise<void>; | |||
| processConfigurationFilesFromAppResources(release: boolean, projectData: IProjectData): Promise<void>; | |||
| processConfigurationFilesFromAppResources(release: boolean, projectData: IProjectData, installPods: boolean): Promise<void>; | |||
There was a problem hiding this comment.
processConfigurationFilesFromAppResources(projectData: IProjectData, opts: { release: boolean, installPods: boolean }): Promise<void>;
lib/services/cocoapods-service.ts
Outdated
|
|
||
| if (this.$fs.exists(pluginPodfilePath) && this.$fs.exists(this.getProjectPodfilePath(projectRoot))) { | ||
| if ((this.$fs.exists(podfilePath) || podfilePath === projectData.podfilePath) && this.$fs.exists(this.getProjectPodfilePath(projectRoot))) { |
There was a problem hiding this comment.
Should'n we unify the behavior for plugin's pod file and pod file from App_Resources?
lib/services/ios-project-service.ts
Outdated
| @@ -771,20 +771,27 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f | |||
| this.$logger.trace(`Images to remove from xcode project: ${imagesToRemove.join(", ")}`); | |||
| _.each(imagesToRemove, image => project.removeResourceFile(path.join(this.getAppResourcesDestinationDirectoryPath(projectData), image))); | |||
|
|
|||
| await this.prepareNativeSourceCode("src", path.join(projectData.appDirectoryPath, constants.APP_RESOURCES_FOLDER_NAME, this.getPlatformData(projectData).normalizedPlatformName, "src"), projectData); | |||
There was a problem hiding this comment.
In case when the project has .nsconfig file, this code will not be correct
path.join(projectData.appDirectoryPath, constants.APP_RESOURCES_FOLDER_NAME)
You should use projectData.getAppResourcesDirectoryPath()
| @@ -0,0 +1,98 @@ | |||
| { | |||
There was a problem hiding this comment.
you should not commit this file
|
run ci |
|
would this work for modules too? i mean i would love to be able to drop sources directly in my module folder (platforms/ios/src for example) and have them being picked up during module build without the need to have a XCode project or a android studio project. |
|
@farfromrefug Yes, it works. |
|
@tdermendjiev awesome will try asap |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Checklist
What is the current behavior?
Native source code files are included to the XCode project only when they are in plugins. Podfiles as well.
What is the new behavior?
Podfile and source files added in App_Resources/iOS will be included as well.
Implements #3807 .