Skip to content
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

Jump to bottom

Apply game.project's values using the Mustache templates to gradle and pod file #7555

Merged
merged 1 commit into from Apr 6, 2023
Merged

Apply game.project's values using the Mustache templates to gradle and pod file #7555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion com.dynamo.cr/com.dynamo.cr.bob/src/com/dynamo/bob/bundle/BundleHelper.java
View file
Open in desktop
Expand Up @@ -218,7 +218,7 @@ public List<ExtenderResource> writeManifestFiles(Platform platform, File manifes
bundler.updateManifestProperties(project, platform, this.projectProperties, this.propertiesMap, properties);

// First, list all extension manifests
List<IResource> sourceManifests = ExtenderUtil.getExtensionPlatformManifests(project, platform, bundler.getMainManifestName(platform));
List<IResource> sourceManifests = ExtenderUtil.getExtensionPlatformManifests(project, platform);
// Put the main manifest in front
sourceManifests.add(0, mainManifest);

Expand Down
6 changes: 2 additions & 4 deletions com.dynamo.cr/com.dynamo.cr.bob/src/com/dynamo/bob/pipeline/ExtenderUtil.java
View file
Open in desktop
Expand Up @@ -603,7 +603,7 @@ public static void checkProjectForDuplicates(Project project) throws CompileExce

/** Get the platform manifests from the extensions
*/
public static List<IResource> getExtensionPlatformManifests(Project project, Platform platform, String name) throws CompileExceptionError {
public static List<IResource> getExtensionPlatformManifests(Project project, Platform platform) throws CompileExceptionError {
List<IResource> out = new ArrayList<>();

List<String> platformFolderAlternatives = new ArrayList<String>();
Expand All @@ -618,9 +618,7 @@ public static List<IResource> getExtensionPlatformManifests(Project project, Pla
if (!(r instanceof FSExtenderResource))
continue;
File f = new File(r.getAbsPath());
if (f.getName().equals(name)) {
out.add( ((FSExtenderResource)r).getResource() );
}
out.add( ((FSExtenderResource)r).getResource() );
}
}
}
Expand Down