yet another patcher-sourced fix, heh. Version-a-day!

This commit is contained in:
Reinier Zwitserloot committed 2014-03-01 02:55:46 +01:00
1 parent 1fa0114283
commit fbab1ca77c
9 files changed
+13 -41

No files matched your search

@@ -1,5 +1,5 @@
<ivy-module version="2.0">
<info organisation="org.projectlombok" module="lombok.patcher" revision="0.11" publication="20140301023500">
<info organisation="org.projectlombok" module="lombok.patcher" revision="0.12" publication="20140301023600">
<license name="MIT License" url="http://www.opensource.org/licenses/mit-license.php" />
<ivyauthor name="rzwitserloot" url="http://zwitserloot.com/" />
<ivyauthor name="rspilker" url="http://github.com/rspilker" />
@@ -9,6 +9,6 @@
<conf name="default" />
</configurations>
<publications>
<artifact conf="default" url="http://projectlombok.org/downloads/lombok.patcher-0.11.jar" />
<artifact conf="default" url="http://projectlombok.org/downloads/lombok.patcher-0.12.jar" />
</publications>
</ivy-module>
@@ -1,14 +0,0 @@
<ivy-module version="2.0">
<info organisation="org.projectlombok" module="lombok.patcher" revision="0.6" publication="20120109234200">
<license name="MIT License" url="http://www.opensource.org/licenses/mit-license.php" />
<ivyauthor name="rzwitserloot" url="http://zwitserloot.com/" />
<ivyauthor name="rspilker" url="http://github.com/rspilker" />
<description homepage="http://projectlombok.org/" />
</info>
<configurations>
<conf name="default" />
</configurations>
<publications>
<artifact conf="default" url="http://projectlombok.org/downloads/lombok.patcher-0.6.jar" />
</publications>
</ivy-module>
@@ -1,14 +0,0 @@
<ivy-module version="2.0">
<info organisation="org.projectlombok" module="lombok.patcher" revision="0.7" publication="20130708220900">
<license name="MIT License" url="http://www.opensource.org/licenses/mit-license.php" />
<ivyauthor name="rzwitserloot" url="http://zwitserloot.com/" />
<ivyauthor name="rspilker" url="http://github.com/rspilker" />
<description homepage="http://projectlombok.org/" />
</info>
<configurations>
<conf name="default" />
</configurations>
<publications>
<artifact conf="default" url="http://projectlombok.org/downloads/lombok.patcher-0.7.jar" />
</publications>
</ivy-module>
+1 -1
View File
@@ -14,7 +14,7 @@
<conf name="javac7" />
</configurations>
<dependencies>
<dependency org="org.projectlombok" name="lombok.patcher" rev="0.11" conf="buildBase->default; runtime->default" />
<dependency org="org.projectlombok" name="lombok.patcher" rev="0.12" conf="buildBase->default; runtime->default" />
<dependency org="zwitserloot.com" name="cmdreader" rev="1.2" conf="buildBase->runtime; runtime" />
<dependency org="junit" name="junit" rev="4.8.2" conf="test->default; contrib->sources" />
@@ -34,7 +34,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
import javax.tools.Diagnostic.Kind;
import lombok.patcher.HomeFinder;
import lombok.patcher.ClassRootFinder;
import lombok.patcher.Hook;
import lombok.patcher.MethodTarget;
import lombok.patcher.ScriptManager;
@@ -57,7 +57,7 @@ public class DisableCheckedExceptionsAgent extends AbstractProcessor {
procEnv.getMessager().printMessage(Kind.WARNING, "You aren't using a compiler based around javac v1.6, so disableCheckedExceptions will not work.\n" +
"Your processor class is: " + className);
} else {
new LiveInjector().inject(HomeFinder.findHomeOfClass(DisableCheckedExceptionsAgent.class));
new LiveInjector().inject(ClassRootFinder.findClassRootOfClass(DisableCheckedExceptionsAgent.class));
}
}
@@ -43,7 +43,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
import javax.tools.Diagnostic.Kind;
import lombok.patcher.HomeFinder;
import lombok.patcher.ClassRootFinder;
@SupportedAnnotationTypes("*")
public class AnnotationProcessor extends AbstractProcessor {
@@ -102,7 +102,7 @@ public class AnnotationProcessor extends AbstractProcessor {
if (environmentClassLoader != null && environmentClassLoader.getClass().getCanonicalName().equals("org.codehaus.plexus.compiler.javac.IsolatedClassLoader")) {
if (lombokAlreadyAddedTo.put(environmentClassLoader, true) == null) {
Method m = environmentClassLoader.getClass().getDeclaredMethod("addURL", URL.class);
URL selfUrl = new File(HomeFinder.findHomeOfClass(AnnotationProcessor.class)).toURI().toURL();
URL selfUrl = new File(ClassRootFinder.findClassRootOfClass(AnnotationProcessor.class)).toURI().toURL();
m.invoke(environmentClassLoader, selfUrl);
}
return environmentClassLoader;
@@ -35,7 +35,7 @@ import java.util.jar.JarOutputStream;
import java.util.zip.ZipEntry;
import lombok.Lombok;
import lombok.patcher.HomeFinder;
import lombok.patcher.ClassRootFinder;
import org.mangosdk.spi.ProviderFor;
@@ -79,7 +79,7 @@ public class PublicApiCreatorApp extends LombokApp {
* a jar that wasn't accessed via the file-system, or if its started via e.g. unpacking the jar.
*/
private static File findOurJar() {
return new File(HomeFinder.findHomeOfClass(PublicApiCreatorApp.class));
return new File(ClassRootFinder.findClassRootOfClass(PublicApiCreatorApp.class));
}
private int writeApiJar(File outFile) throws Exception {
@@ -26,7 +26,7 @@ import java.io.IOException;
import java.net.URL;
import lombok.installer.eclipse.EclipseFinder;
import lombok.patcher.HomeFinder;
import lombok.patcher.ClassRootFinder;
/**
* Represents a location that contains an IDE.
@@ -46,7 +46,7 @@ public abstract class IdeLocation {
* a jar that wasn't accessed via the file-system, or if its started via e.g. unpacking the jar.
*/
public static File findOurJar() {
return new File(HomeFinder.findHomeOfClass(IdeFinder.class));
return new File(ClassRootFinder.findClassRootOfClass(IdeFinder.class));
}
@Override public String toString() {
@@ -39,7 +39,7 @@ import lombok.core.LombokApp;
import lombok.core.SpiLoadUtil;
import lombok.core.Version;
import lombok.installer.IdeFinder.OS;
import lombok.patcher.HomeFinder;
import lombok.patcher.ClassRootFinder;
import org.mangosdk.spi.ProviderFor;
@@ -101,7 +101,7 @@ public class Installer {
}
public static boolean isSelf(String jar) {
String self = HomeFinder.findHomeOfClass(Installer.class);
String self = ClassRootFinder.findClassRootOfClass(Installer.class);
if (self == null) return false;
File a = new File(jar).getAbsoluteFile();
File b = new File(self).getAbsoluteFile();