Brian O'Connor
Committed by Gerrit Code Review

Updating BUCK plugin to latest buck-api

Change-Id: I7e40808946d8999bb60ddf958665b9a610abcf8d
......@@ -2,8 +2,8 @@
remote_jar (
name = 'buck-api',
out = 'buck.jar',
url = 'https://github.com/bocon13/buck/releases/download/v2016.09.13.01/buck.jar',
sha1 = 'd5415b4326e5316675532a8cd48001a8456e8c9e',
url = 'https://oss.sonatype.org/content/repositories/snapshots/org/onosproject/buck-api/0.1-SNAPSHOT/buck-api-0.1-20161012.212306-4.jar',
sha1 = 'c9cca7ae74ad77dbcbd8e58fc2c6f8ed2b435305',
visibility = [],
)
......
......@@ -74,6 +74,7 @@ public class OnosJar extends DefaultJavaLibrary
ImmutableSet<Path> additionalClasspathEntries,
CompileToJarStepFactory compileStepFactory,
Optional<Path> resourcesRoot,
Optional<SourcePath> manifestFile,
Optional<String> mavenCoords,
ImmutableSortedSet<BuildTarget> tests,
ImmutableSet<Pattern> classesToRemoveFromJar,
......@@ -85,8 +86,8 @@ public class OnosJar extends DefaultJavaLibrary
super(params, resolver, srcs, resources, generatedSourceFolder,
proguardConfig, postprocessClassesCommands, exportedDeps,
providedDeps, abiJar, trackClassUsage, additionalClasspathEntries,
compileStepFactory, resourcesRoot, mavenCoords, tests,
classesToRemoveFromJar);
compileStepFactory, resourcesRoot, manifestFile, mavenCoords,
tests, classesToRemoveFromJar);
this.webContext = webContext;
this.apiTitle = apiTitle;
this.apiVersion = apiVersion;
......@@ -120,4 +121,10 @@ public class OnosJar extends DefaultJavaLibrary
//FIXME this is not supported at the moment
return ImmutableList.of();
}
@Override
public Optional<Path> getPomTemplate() {
//FIXME we should consider supporting this
return Optional.absent();
}
}
......
......@@ -138,7 +138,8 @@ public class OnosJarDescription implements Description<OnosJarDescription.Arg>,
Preconditions.checkNotNull(paramsWithMavenFlavor),
pathResolver,
args.srcs.get(),
args.mavenCoords);
args.mavenCoords,
Optional.absent()); //FIXME
}
}
......@@ -180,7 +181,8 @@ public class OnosJarDescription implements Description<OnosJarDescription.Arg>,
args.srcs.get(),
javadocFiles.build(),
javadocArgs.build(),
args.mavenCoords);
args.mavenCoords,
Optional.absent()); //FIXME
}
}
......@@ -232,6 +234,7 @@ public class OnosJarDescription implements Description<OnosJarDescription.Arg>,
args.bundleLicense, args.bundleDescription, args.importPackages,
args.exportPackages, args.includeResources, args.dynamicimportPackages),
args.resourcesRoot,
args.manifestFile,
args.mavenCoords,
args.tests.get(),
javacOptions.getClassesToRemoveFromJar(),
......@@ -270,6 +273,7 @@ public class OnosJarDescription implements Description<OnosJarDescription.Arg>,
/* additionalClasspathEntries */ ImmutableSet.<Path>of(),
new JavacToJarStepFactory(javacOptions, JavacOptionsAmender.IDENTITY),
args.resourcesRoot,
args.manifestFile,
args.mavenCoords,
args.tests.get(),
javacOptions.getClassesToRemoveFromJar()));
......