diff --git a/buildSrc/src/main/resources/com/uber/okbuck/core/util/manifest/manifest-merger-cli.jar b/buildSrc/src/main/resources/com/uber/okbuck/core/util/manifest/manifest-merger-cli.jar index ab5b4f080..18e528023 100644 Binary files a/buildSrc/src/main/resources/com/uber/okbuck/core/util/manifest/manifest-merger-cli.jar and b/buildSrc/src/main/resources/com/uber/okbuck/core/util/manifest/manifest-merger-cli.jar differ diff --git a/manifest-merger-cli/build.gradle b/manifest-merger-cli/build.gradle index 13a3b3dfe..71dffc817 100644 --- a/manifest-merger-cli/build.gradle +++ b/manifest-merger-cli/build.gradle @@ -4,7 +4,7 @@ evaluationDependsOn(pluginProjectPath) apply plugin: "application" group = "com.uber.okbuck.transform" -version = "1.0.0" +version = "1.0.1" tasks.withType(JavaCompile) { sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/manifest-merger-cli/src/main/java/com/uber/okbuck/manifmerger/ManifestMergerCli.java b/manifest-merger-cli/src/main/java/com/uber/okbuck/manifmerger/ManifestMergerCli.java index 2db25060e..353cb94b7 100644 --- a/manifest-merger-cli/src/main/java/com/uber/okbuck/manifmerger/ManifestMergerCli.java +++ b/manifest-merger-cli/src/main/java/com/uber/okbuck/manifmerger/ManifestMergerCli.java @@ -120,7 +120,7 @@ private static int process(String[] args) throws FileNotFoundException { "Invalid property name " + value.substring(0, value.indexOf('=')) + ", allowed properties are : " - + Joiner.on(',').join(ManifestSystemProperty.values())); + + Joiner.on(',').join(ManifestSystemProperty.getValues())); return 1; } } @@ -184,7 +184,7 @@ private static void usage() { System.out.println("\t--libs [path separated list of lib's manifests]"); System.out.println("\t--overlays [path separated list of overlay's manifests]"); System.out.println( - "\t--property [" + Joiner.on(" | ").join(ManifestSystemProperty.values()) + "=value]"); + "\t--property [" + Joiner.on(" | ").join(ManifestSystemProperty.getValues()) + "=value]"); System.out.println("\t--placeholder [name=value]"); System.out.println("\t--out [path of the output file]"); }