From e3ad4b77287d07891dc3edd1bd6680a6435ee3d1 Mon Sep 17 00:00:00 2001 From: Csaba Kozak Date: Fri, 10 Apr 2020 12:41:45 +0200 Subject: [PATCH] Fix finding project folder on Windows --- .../internal/helper/FileHelper.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) 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 index a1e4ca8254..7068ab8ff9 100644 --- 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 {