Merge pull request androidannotations#2269 from WonderCsabo/2267-windows-manifest-finder

dodgex · web-flow · commit d6048e1a09e7 · 2020-04-10T12:49:54.000+02:00
Fix finding project folder on Windows
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/FileHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/FileHelper.java
@@ -58,8 +58,11 @@ public static FileHolder findRootProjectHolder(ProcessingEnvironment processingE
 		} catch (IOException ignored) {
 			throw new FileNotFoundException();
 		}
-		String dummySourceFilePath = dummySourceFile.toUri().toString();
 
+		return createFileHolder(dummySourceFile.toUri().toString());
+	}
+
+	private static FileHolder createFileHolder(String dummySourceFilePath) throws FileNotFoundException {
 		if (dummySourceFilePath.startsWith("file:")) {
 			if (!dummySourceFilePath.startsWith("file://")) {
 				dummySourceFilePath = "file://" + dummySourceFilePath.substring("file:".length());
@@ -89,19 +92,10 @@ private static FileHolder findKaptRootProjectHolder(ProcessingEnvironment proces
 			return null;
 		}
 
-		File kaptFolder = new File(kaptFolderOption.replace("kaptKotlin", "kapt"));
-		File dummySourceFile = new File(kaptFolder, "dummy");
+		String dummySourceFile = kaptFolderOption.replace("kaptKotlin", "kapt") + File.separator + "dummy";
+		String dummySourceFilePath = new File(dummySourceFile).toURI().toString();
 
-		String dummySourceFilePath;
-		try {
-			dummySourceFilePath = new URI("file://" + dummySourceFile.getAbsolutePath()).toString();
-		} catch (URISyntaxException e) {
-			throw new FileNotFoundException();
-		}
-
-		File sourcesGenerationFolder = kaptFolder;
-		File projectRoot = kaptFolder.getParentFile();
-		return new FileHolder(dummySourceFilePath, sourcesGenerationFolder, projectRoot);
+		return createFileHolder(dummySourceFilePath);
 	}
 
 	public static File resolveOutputDirectory(ProcessingEnvironment processingEnv) throws FileNotFoundException {
