Skip to content

Commit 9c9b271

Browse files
committed
U info.plist prettified after generation
1 parent 6383999 commit 9c9b271

File tree

5 files changed

+19
-21
lines changed

5 files changed

+19
-21
lines changed

build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ dependencies {
5555
implementation 'org.vafer:jdeb:1.9'
5656
implementation 'net.jsign:jsign-core:3.1'
5757
implementation 'org.redline-rpm:redline:1.2.10'
58-
implementation 'commons-configuration:commons-configuration:1.10'
59-
implementation 'commons-beanutils:commons-beanutils:1.9.4'
6058

6159
testImplementation 'junit:junit:4.12'
6260

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package io.github.fvarrui.javapackager.model;
2+
3+
public enum CFBundlePackageType {
4+
BNDL,
5+
APPL,
6+
FMWK
7+
}

src/main/java/io/github/fvarrui/javapackager/model/InfoPlist.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
public class InfoPlist {
44

55
private String additionalEntries = "";
6+
private CFBundlePackageType bundlePackageType = CFBundlePackageType.BNDL;
67

78
public String getAdditionalEntries() {
89
return additionalEntries;
@@ -12,9 +13,17 @@ public void setAdditionalEntries(String additionalEntries) {
1213
this.additionalEntries = additionalEntries;
1314
}
1415

16+
public CFBundlePackageType getBundlePackageType() {
17+
return bundlePackageType;
18+
}
19+
20+
public void setBundlePackageType(CFBundlePackageType bundlePackageType) {
21+
this.bundlePackageType = bundlePackageType;
22+
}
23+
1524
@Override
1625
public String toString() {
17-
return "InfoPlist [additionalEntries=" + additionalEntries + "]";
26+
return "InfoPlist [additionalEntries=" + additionalEntries + ", bundlePackageType=" + bundlePackageType + "]";
1827
}
1928

2029
}

src/main/java/io/github/fvarrui/javapackager/packagers/MacPackager.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@
77
import java.util.List;
88
import java.util.stream.Collectors;
99

10-
import org.apache.commons.configuration.ConfigurationException;
1110
import org.apache.commons.lang3.StringUtils;
1211
import org.codehaus.plexus.util.cli.CommandLineException;
1312

1413
import io.github.fvarrui.javapackager.model.Platform;
1514
import io.github.fvarrui.javapackager.utils.CommandUtils;
1615
import io.github.fvarrui.javapackager.utils.FileUtils;
17-
import io.github.fvarrui.javapackager.utils.InfoPlistUtils;
1816
import io.github.fvarrui.javapackager.utils.Logger;
1917
import io.github.fvarrui.javapackager.utils.VelocityUtils;
18+
import io.github.fvarrui.javapackager.utils.XMLUtils;
2019

2120
/**
2221
* Packager for Mac OS X
@@ -132,7 +131,7 @@ public File doCreateApp() throws Exception {
132131
// creates and write the Info.plist file
133132
File infoPlistFile = new File(contentsFolder, "Info.plist");
134133
VelocityUtils.render("mac/Info.plist.vtl", infoPlistFile, this);
135-
InfoPlistUtils.prettifyInfoPlist(infoPlistFile);
134+
XMLUtils.prettify(infoPlistFile);
136135
Logger.info("Info.plist file created in " + infoPlistFile.getAbsolutePath());
137136

138137
// codesigns app folder

src/main/java/io/github/fvarrui/javapackager/utils/InfoPlistUtils.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)