Handle non boolean values for requires arc option #263
Conversation
This file contains 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
Don't proceed to resolve dependencies if the project contains no Podfiles
britzl
commented
Mar 15, 2023
| @@ -10,8 +10,8 @@ build_artifact() { | |||
| echo "[build] Creating standalone extender server artifact at ${ARTIFACT_DIR}..." | |||
| rm -rf ${ARTIFACT_DIR} | |||
| mkdir -p ${ARTIFACT_DIR} | |||
| cp ${SERVER_DIR}/build/docker/extender-0.1.0.jar ${ARTIFACT_DIR}/extender.jar | |||
There was a problem hiding this comment.
We should use the path for standalone builds. The jar files are copied in build.gradle in task buildStandalone()
britzl
commented
Mar 15, 2023
| @@ -703,6 +703,9 @@ private void buildPods() throws IOException, InterruptedException, ExtenderExcep | |||
| // We use the same mechanism as when building the extension and create a | |||
| // manifest context for each pod | |||
| Map<String, Object> manifestContext = new HashMap<>(); | |||
| manifestContext = ExtenderUtil.mergeContexts(manifestContext, this.platformConfig.context); | |||
| manifestContext = ExtenderUtil.mergeContexts(manifestContext, this.platformVariantConfig.context); | |||
| manifestContext = ExtenderUtil.mergeContexts(manifestContext, this.platformAppConfig.context); | |||
There was a problem hiding this comment.
I think we want the platformAppConfig as well?
There was a problem hiding this comment.
I suggest we use the already merged mergedAppContext from loadManifests().
You can make a copy of that and then override your variables below.
britzl
commented
Mar 15, 2023
| @@ -578,14 +588,20 @@ public ResolvedPods resolveDependencies(File jobDirectory, String platform) thro | |||
| throw new ExtenderException("Unsupported platform " + platform); | |||
| } | |||
|
|
|||
| List<File> podFiles = ExtenderUtil.listFilesMatchingRecursive(jobDirectory, "Podfile"); | |||
There was a problem hiding this comment.
Exit the service early if the job doesn't contain any Podfiles
JCash
requested changes
Mar 15, 2023
| @@ -703,6 +703,9 @@ private void buildPods() throws IOException, InterruptedException, ExtenderExcep | |||
| // We use the same mechanism as when building the extension and create a | |||
| // manifest context for each pod | |||
| Map<String, Object> manifestContext = new HashMap<>(); | |||
| manifestContext = ExtenderUtil.mergeContexts(manifestContext, this.platformConfig.context); | |||
| manifestContext = ExtenderUtil.mergeContexts(manifestContext, this.platformVariantConfig.context); | |||
| manifestContext = ExtenderUtil.mergeContexts(manifestContext, this.platformAppConfig.context); | |||
There was a problem hiding this comment.
I suggest we use the already merged mergedAppContext from loadManifests().
You can make a copy of that and then override your variables below.
britzl
commented
Mar 16, 2023
| File armFrameworkDir = new File(frameworkDir, "ios-arm64_armv7"); | ||
| if (armFrameworkDir.exists()) { | ||
| Path from = new File(armFrameworkDir, frameworkName + ".framework").toPath(); | ||
| File arm64_armv7FrameworkDir = new File(frameworkDir, "ios-arm64_armv7"); |
There was a problem hiding this comment.
Make sure to look for multiple variations of folder names inside the frameworks
JCash
approved these changes
Mar 16, 2023
| @@ -618,7 +617,7 @@ public ResolvedPods resolveDependencies(File jobDirectory, String platform) thro | |||
| List<PodSpec> pods = installPods(workingDir); | |||
| copyPodFrameworks(pods, frameworksDir); | |||
|
|
|||
| dumpDir(jobDirectory, 0); | |||
| // dumpDir(jobDirectory, 0); | |||
There was a problem hiding this comment.
There is a DM_KEEP_JOB_FOLDER for debugging.
I suggest we piggyback on that?
britzl
deleted the
Issue-262-handle-non-boolean-values-for-requires-arc-option
branch
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.
This PR also includes a fix for missing
envin the context (this issue popped up after the big refactor @JCash did).Fixes #262