diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.11.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.12.xml
similarity index 87%
rename from buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.11.xml
rename to buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.12.xml
index 0cb3bb89..f402dcc9 100644
--- a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.11.xml
+++ b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.12.xml
@@ -1,5 +1,5 @@
-
+
@@ -9,6 +9,6 @@
-
+
diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.6.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.6.xml
deleted file mode 100644
index e952ce9d..00000000
--- a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.6.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.7.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.7.xml
deleted file mode 100644
index ca41f64c..00000000
--- a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.7.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index 84baef80..32f8d790 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -14,7 +14,7 @@
-
+
diff --git a/experimental/src/lombok/javac/disableCheckedExceptions/DisableCheckedExceptionsAgent.java b/experimental/src/lombok/javac/disableCheckedExceptions/DisableCheckedExceptionsAgent.java
index f9598be5..d023a399 100644
--- a/experimental/src/lombok/javac/disableCheckedExceptions/DisableCheckedExceptionsAgent.java
+++ b/experimental/src/lombok/javac/disableCheckedExceptions/DisableCheckedExceptionsAgent.java
@@ -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));
}
}
diff --git a/src/core/lombok/core/AnnotationProcessor.java b/src/core/lombok/core/AnnotationProcessor.java
index 6c61fef2..734150cd 100644
--- a/src/core/lombok/core/AnnotationProcessor.java
+++ b/src/core/lombok/core/AnnotationProcessor.java
@@ -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;
diff --git a/src/core/lombok/core/PublicApiCreatorApp.java b/src/core/lombok/core/PublicApiCreatorApp.java
index b776bf8f..178a45e8 100644
--- a/src/core/lombok/core/PublicApiCreatorApp.java
+++ b/src/core/lombok/core/PublicApiCreatorApp.java
@@ -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 {
diff --git a/src/installer/lombok/installer/IdeLocation.java b/src/installer/lombok/installer/IdeLocation.java
index ea1f470f..4e3a7e41 100644
--- a/src/installer/lombok/installer/IdeLocation.java
+++ b/src/installer/lombok/installer/IdeLocation.java
@@ -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() {
diff --git a/src/installer/lombok/installer/Installer.java b/src/installer/lombok/installer/Installer.java
index 4050ad95..b9faeebd 100644
--- a/src/installer/lombok/installer/Installer.java
+++ b/src/installer/lombok/installer/Installer.java
@@ -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();