Use fallbackRepository for Libby runtime deps

Author: frengor

core/src/main/java/com/alessiodp/libby/LibraryManager.java

@@ -340,7 +340,7 @@ public Collection<String> resolveLibrary(@NotNull Library library) {
      * @param library the library to resolve repositories for
      * @return the resolved repositories
      */
-    protected Collection<String> resolveRepositories(@NotNull Library library) {
+    public Collection<String> resolveRepositories(@NotNull Library library) {
         switch (getRepositoryResolutionMode()) {
             case GLOBAL_FIRST:
                 return Stream.of(

core/src/main/java/com/alessiodp/libby/classloader/ClassLoaderHelper.java

@@ -304,7 +304,7 @@ protected Instrumentation initInstrumentation(LibraryManager libraryManager) thr
                             .artifactId("byte-buddy-agent")
                             .version("1.12.1")
                             .checksumFromBase64("mcCtBT9cljUEniB5ESpPDYZMfVxEs1JRPllOiWTP+bM=")
-                            .repository(Repositories.MAVEN_CENTRAL)
+                            .fallbackRepository(Repositories.MAVEN_CENTRAL)
                             .build()
             ));
 

core/src/main/java/com/alessiodp/libby/configuration/ConfigurationFetcher.java

@@ -105,7 +105,7 @@ public ConfigurationFetcher(@NotNull LibraryManager libraryManager) {
                         .artifactId("nanojson")
                         .version("1.8")
                         .checksumFromBase64("qyhAVZM8LYvqhGQrbmW2aHV4hRzn+2flPCV98wAimJo=")
-                        .repository(Repositories.MAVEN_CENTRAL)
+                        .fallbackRepository(Repositories.MAVEN_CENTRAL)
                         .build()
         ));
 

core/src/main/java/com/alessiodp/libby/relocation/RelocationHelper.java

@@ -67,7 +67,7 @@ public RelocationHelper(@NotNull LibraryManager libraryManager) {
                    .artifactId("asm-commons")
                    .version("9.2")
                    .checksumFromBase64("vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=")
-                   .repository(Repositories.MAVEN_CENTRAL)
+                   .fallbackRepository(Repositories.MAVEN_CENTRAL)
                    .build()
         ));
 
@@ -78,7 +78,7 @@ public RelocationHelper(@NotNull LibraryManager libraryManager) {
                    .artifactId("asm")
                    .version("9.2")
                    .checksumFromBase64("udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=")
-                   .repository(Repositories.MAVEN_CENTRAL)
+                   .fallbackRepository(Repositories.MAVEN_CENTRAL)
                    .build()
         ));
 
@@ -89,7 +89,7 @@ public RelocationHelper(@NotNull LibraryManager libraryManager) {
                    .artifactId("jar-relocator")
                    .version("1.7")
                    .checksumFromBase64("b30RhOF6kHiHl+O5suNLh/+eAr1iOFEFLXhwkHHDu4I=")
-                   .repository(Repositories.MAVEN_CENTRAL)
+                   .fallbackRepository(Repositories.MAVEN_CENTRAL)
                    .build()
         ));
 

core/src/main/java/com/alessiodp/libby/transitive/TransitiveDependencyHelper.java

@@ -79,8 +79,8 @@ public TransitiveDependencyHelper(@NotNull LibraryManager libraryManager, @NotNu
                 .artifactId("libby-maven-resolver")
                 .version("1.0.1")
                 .checksumFromBase64("EmsSUwjtqSeYTt8WEw7LPI/5Yz8bWSxf23XcdLEM7dk=")
-                .repository(Repositories.MAVEN_CENTRAL)
-                .repository("https://repo.alessiodp.com/releases")
+                .fallbackRepository(Repositories.MAVEN_CENTRAL)
+                .fallbackRepository("https://repo.alessiodp.com/releases")
                 .build()
         ));
 
@@ -134,11 +134,12 @@ public Collection<Library> findTransitiveLibraries(@NotNull Library library) {
 
         Collection<String> globalRepositories = libraryManager.getRepositories();
         Collection<String> libraryRepositories = library.getRepositories();
-        if (globalRepositories.isEmpty() && libraryRepositories.isEmpty()) {
+        Collection<String> libraryFallbackRepositories = library.getFallbackRepositories();
+        if (globalRepositories.isEmpty() && libraryRepositories.isEmpty() && libraryFallbackRepositories.isEmpty()) {
             throw new IllegalArgumentException("No repositories have been added before resolving transitive dependencies");
         }
 
-        Stream<String> repositories = Stream.of(globalRepositories, libraryRepositories).flatMap(Collection::stream);
+        Stream<String> repositories = libraryManager.resolveRepositories(library).stream();
         try {
             Collection<?> resolvedArtifacts = (Collection<?>) resolveTransitiveDependenciesMethod.invoke(transitiveDependencyCollectorObject,
                 library.getGroupId(),
@@ -186,7 +187,7 @@ public Collection<Library> findTransitiveLibraries(@NotNull Library library) {
                     // TODO Uncomment the line below once LibraryManager#resolveLibrary stops resolving snapshots
                     //      for every repository before trying direct URLs
                     // Make sure the repository is added as fallback if the dependency isn't found at the constructed URL
-                    // libraryBuilder.repository(repository);
+                    // libraryBuilder.fallbackRepository(repository);
 
                     // For snapshots, getVersion() returns version-timestamp-buildNumber instead of version-SNAPSHOT
                     String version = (String) artifactGetVersionMethod.invoke(artifact);
@@ -197,6 +198,7 @@ public Collection<Library> findTransitiveLibraries(@NotNull Library library) {
                     libraryBuilder.url(repository + path);
                 } else {
                     library.getRepositories().forEach(libraryBuilder::repository);
+                    library.getFallbackRepositories().forEach(libraryBuilder::fallbackRepository);
                 }
 
                 transitiveLibraries.add(libraryBuilder.build());