improved PR #85

dts-generator/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

dts-generator/src/main/java/com/telerik/InputParameters.java

@@ -16,6 +16,7 @@ public class InputParameters {
     private boolean allGenericImplements;
     private boolean skipDeclarations;
     private boolean classMode;
+    private boolean perLibrary;
     private int ignoreObfuscatedNameLength;
 
     public InputParameters() {
@@ -25,6 +26,7 @@ public InputParameters() {
         this.allGenericImplements = false;
         this.skipDeclarations = false;
         this.classMode = false;
+        this.perLibrary = false;
         this.ignoreObfuscatedNameLength = 0;
     }
 
@@ -70,4 +72,11 @@ public boolean isAllGenericImplementsEnabled() {
 
     public void setIgnoreObfuscatedNameLength(int nameLength) { this.ignoreObfuscatedNameLength = nameLength; }
 
+    public boolean getPerLibrary() { 
+        return perLibrary; 
+    }
+
+    public void setPerLibrary(boolean perLibrary) { 
+        this.perLibrary = perLibrary; 
+    }
 }

dts-generator/src/main/java/com/telerik/Main.java

@@ -27,6 +27,9 @@ public class Main {
 	// the parameter defines the length of obfuscated names to detect
 	private static final String IGNORE_OBFUSCATED = "-ignore-obfuscated";
 
+	private static final String PER_LIBRARY = "-per-library";
+
+
 	private static final String HELP = "-help";
 
 	public static void main(String[] args) {
@@ -117,6 +120,10 @@ public static InputParameters parseCommand(String[] args) throws Exception {
 						inputParameters.getSuperJars().add(new File(currentArgument));
 					}
 				}
+
+				if (commandArg.equals(PER_LIBRARY)) {
+					inputParameters.setPerLibrary(true);
+				}
 			}
 
 			inputParameters.getOutputDir().mkdir();
@@ -138,6 +145,7 @@ private static void printHelpMessage() {
 		helpMessage.appendln("\t\t[-all-generic-implements]:\t\tAdd this flag to generate implements for all interfaces implemented by the generic types." +
 			" It is not enabled by default as when there are more than one implementation most probably one of them needs to be changed to extends, but this have to be made manually");
 		helpMessage.appendln("\t\t[-skip-declarations]:\t\tProvide this flag if you don't want android-declarations.d.ts file to be generated and referenced.");
+		helpMessage.appendln("\t\t[-per-library]:\t\tGenerate separate .android.d.ts file per input jar/aar library.");
 		helpMessage.appendln("\t\t[--class-mode]:\t\tPass this argument if you want folders to be processed as class folders.");
 		helpMessage.appendln("\t\t[-help]:\t\tPrints this help message.");
 

dts-generator/src/main/java/com/telerik/dts/ClassDirectrory.java

@@ -11,46 +11,48 @@
 import java.util.Map;
 
 public class ClassDirectrory implements ClassMapProvider {
-	private final String path;
-	private final Map<String, JavaClass> classMap;
-	private static final String CLASS_EXT = ".class";
-
-	private ClassDirectrory(String path) {
-		this.path = path;
-		this.classMap = new HashMap<String, JavaClass>();
-	}
-
-	public Map<String, JavaClass> getClassMap() {
-		return classMap;
-	}
-
-	public String getPath() {
-		return path;
-	}
-
-	public static ClassDirectrory readDirectory(String path) throws IOException {
-		ClassDirectrory dir = new ClassDirectrory(path);
-		readDirectory(dir, path);
-		return dir;
-	}
-
-	public static void readDirectory(ClassDirectrory dir, String path) throws IOException {
-		List<File> subDirs = new ArrayList<File>();
-		File currentDir = new File(path);
-		for (File file : currentDir.listFiles()) {
-			if (file.isFile()) {
-				String name = file.getName();
-				if (name.endsWith(CLASS_EXT)) {
-					ClassParser cp = new ClassParser(file.getAbsolutePath());
-					JavaClass clazz = cp.parse();
-					dir.classMap.put(clazz.getClassName(), clazz);
-				}
-			} else if (file.isDirectory()) {
-				subDirs.add(file);
-			}
-		}
-		for (File sd: subDirs) {
-			readDirectory(dir, sd.getAbsolutePath());
-		}
-	}
+    private Map<String, JavaClass> classes;
+    private String libraryName;
+    private static final String CLASS_EXT = ".class";
+
+    private ClassDirectrory() {
+        this.classes = new HashMap<String, JavaClass>();
+    }
+
+    public static ClassDirectrory readDirectory(String directoryPath) throws IOException {
+        ClassDirectrory dir = new ClassDirectrory();
+        readDirectory(dir, directoryPath);
+        return dir;
+    }
+
+    public static void readDirectory(ClassDirectrory dir, String path) throws IOException {
+        List<File> subDirs = new ArrayList<File>();
+        File currentDir = new File(path);
+        for (File file : currentDir.listFiles()) {
+            if (file.isFile()) {
+                String name = file.getName();
+                if (name.endsWith(CLASS_EXT)) {
+                    ClassParser cp = new ClassParser(file.getAbsolutePath());
+                    JavaClass clazz = cp.parse();
+                    dir.classes.put(clazz.getClassName(), clazz);
+                }
+            } else if (file.isDirectory()) {
+                subDirs.add(file);
+            }
+        }
+        for (File sd: subDirs) {
+            readDirectory(dir, sd.getAbsolutePath());
+        }
+        dir.libraryName = new File(path).getName();
+    }
+
+    @Override
+    public Map<String, JavaClass> getClassMap() {
+        return classes;
+    }
+
+    @Override
+    public String getLibraryName() {
+        return libraryName;
+    }
 }

dts-generator/src/main/java/com/telerik/dts/ClassMapProvider.java

@@ -7,5 +7,5 @@
 public interface ClassMapProvider {
 	Map<String, JavaClass> getClassMap();
 
-	String getPath();
+	String getLibraryName();
 }

dts-generator/src/main/java/com/telerik/dts/ClassRepo.java

@@ -119,4 +119,17 @@ private static boolean keepGoing(boolean first) {
 		boolean res = first ? !isNestedClass : isNestedClass;
 		return res;
 	}
+
+	public static List<ClassMapProvider> getCachedProviders() {
+		return new ArrayList<>(cachedProviders);
+	}
+
+	public static String getLibraryNameForClass(String className) {
+		for (ClassMapProvider provider : cachedProviders) {
+			if (provider.getClassMap().containsKey(className)) {
+				return provider.getLibraryName();
+			}
+		}
+		return null;
+	}
 }