Revert changes moved to the gradle branch

The features added in the commits after 3cfc4b2 were moved to the `gradle` branch. As such, this commit resets the branch at the point of the 1.3.0 release.

Author: frengor

bukkit/src/main/java/net/byteflux/libby/BukkitLibraryManager.java

@@ -4,7 +4,6 @@
 import net.byteflux.libby.logging.adapters.JDKLogAdapter;
 import org.bukkit.plugin.Plugin;
 
-import java.io.InputStream;
 import java.net.URLClassLoader;
 import java.nio.file.Path;
 
@@ -18,7 +17,6 @@ public class BukkitLibraryManager extends LibraryManager {
      * Plugin classpath helper
      */
     private final URLClassLoaderHelper classLoader;
-    private final Plugin plugin;
 
     /**
      * Creates a new Bukkit library manager.
@@ -38,7 +36,6 @@ public BukkitLibraryManager(Plugin plugin) {
     public BukkitLibraryManager(Plugin plugin, String directoryName) {
         super(new JDKLogAdapter(requireNonNull(plugin, "plugin").getLogger()), plugin.getDataFolder().toPath(), directoryName);
         classLoader = new URLClassLoaderHelper((URLClassLoader) plugin.getClass().getClassLoader(), this);
-        this.plugin = plugin;
     }
 
     /**
@@ -50,9 +47,4 @@ public BukkitLibraryManager(Plugin plugin, String directoryName) {
     protected void addToClasspath(Path file) {
         classLoader.addToClasspath(file);
     }
-
-    @Override
-    protected InputStream getPluginResourceAsInputStream(String path) {
-        return plugin.getResource(path);
-    }
 }

bungee/src/main/java/net/byteflux/libby/BungeeLibraryManager.java

@@ -4,7 +4,6 @@
 import net.byteflux.libby.logging.adapters.JDKLogAdapter;
 import net.md_5.bungee.api.plugin.Plugin;
 
-import java.io.InputStream;
 import java.net.URLClassLoader;
 import java.nio.file.Path;
 
@@ -19,8 +18,6 @@ public class BungeeLibraryManager extends LibraryManager {
      */
     private final URLClassLoaderHelper classLoader;
 
-    private final Plugin plugin;
-
     /**
      * Creates a new Bungee library manager.
      *
@@ -39,12 +36,6 @@ public BungeeLibraryManager(Plugin plugin) {
     public BungeeLibraryManager(Plugin plugin, String directoryName) {
         super(new JDKLogAdapter(requireNonNull(plugin, "plugin").getLogger()), plugin.getDataFolder().toPath(), directoryName);
         classLoader = new URLClassLoaderHelper((URLClassLoader) plugin.getClass().getClassLoader(), this);
-        this.plugin = plugin;
-    }
-
-    @Override
-    protected InputStream getPluginResourceAsInputStream(String path) throws UnsupportedOperationException {
-        return plugin.getResourceAsStream(path);
     }
 
     /**

core/pom.xml

@@ -12,26 +12,6 @@
 
     <artifactId>libby-core</artifactId>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven.resolver</groupId>
-            <artifactId>maven-resolver-supplier</artifactId>
-            <version>1.9.15</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-resolver-provider</artifactId>
-            <version>3.9.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.grack</groupId>
-            <artifactId>nanojson</artifactId>
-            <version>1.7</version>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -60,27 +40,6 @@
                     </archive>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.0</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <relocations>
-                                <relocation>
-                                    <pattern>com.grack.nanojson</pattern>
-                                    <shadedPattern>net.byteflux.libby.nanojson</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
-</project>
+</project>

core/src/main/java/net/byteflux/libby/Library.java

@@ -1,7 +1,6 @@
 package net.byteflux.libby;
 
 import net.byteflux.libby.relocation.Relocation;
-import net.byteflux.libby.transitive.ExcludedDependency;
 
 import java.util.Base64;
 import java.util.Collection;
@@ -83,16 +82,6 @@ public class Library {
      */
     private final boolean isolatedLoad;
 
-    /**
-     * Should transitive dependencies be resolved for this library?
-     */
-    private final boolean resolveTransitiveDependencies;
-
-    /**
-     * Transitive dependencies that would be excluded on transitive resolvement
-     */
-    private final Collection<ExcludedDependency> excludedTransitiveDependencies;
-
     /**
      * Creates a new library.
      *
@@ -105,8 +94,6 @@ public class Library {
      * @param checksum     binary SHA-256 checksum or null
      * @param relocations  jar relocations or null
      * @param isolatedLoad isolated load for this library
-     * @param resolveTransitiveDependencies transitive dependencies resolvement for this library
-     * @param excludedTransitiveDependencies excluded transitive dependencies or null
      */
     private Library(Collection<String> urls,
                     String id,
@@ -116,11 +103,9 @@ private Library(Collection<String> urls,
                     String classifier,
                     byte[] checksum,
                     Collection<Relocation> relocations,
-                    boolean isolatedLoad,
-                    boolean resolveTransitiveDependencies,
-                    Collection<ExcludedDependency> excludedTransitiveDependencies) {
+                    boolean isolatedLoad) {
 
-        this(urls, null, id, groupId, artifactId, version, classifier, checksum, relocations, isolatedLoad, resolveTransitiveDependencies, excludedTransitiveDependencies);
+        this(urls, null, id, groupId, artifactId, version, classifier, checksum, relocations, isolatedLoad);
     }
 
     /**
@@ -136,8 +121,6 @@ private Library(Collection<String> urls,
      * @param checksum     binary SHA-256 checksum or null
      * @param relocations  jar relocations or null
      * @param isolatedLoad isolated load for this library
-     * @param resolveTransitiveDependencies transitive dependencies resolvement for this library
-     * @param excludedTransitiveDependencies excluded transitive dependencies or null
      */
     private Library(Collection<String> urls,
                     Collection<String> repositories,
@@ -148,9 +131,7 @@ private Library(Collection<String> urls,
                     String classifier,
                     byte[] checksum,
                     Collection<Relocation> relocations,
-                    boolean isolatedLoad,
-                    boolean resolveTransitiveDependencies,
-                    Collection<ExcludedDependency> excludedTransitiveDependencies) {
+                    boolean isolatedLoad) {
 
         this.urls = urls != null ? Collections.unmodifiableList(new LinkedList<>(urls)) : Collections.emptyList();
         this.id = id != null ? id : UUID.randomUUID().toString();
@@ -172,8 +153,6 @@ private Library(Collection<String> urls,
         this.repositories = repositories != null ? Collections.unmodifiableList(new LinkedList<>(repositories)) : Collections.emptyList();
         relocatedPath = hasRelocations() ? path + "-relocated.jar" : null;
         this.isolatedLoad = isolatedLoad;
-        this.resolveTransitiveDependencies = resolveTransitiveDependencies;
-        this.excludedTransitiveDependencies = excludedTransitiveDependencies != null ? Collections.unmodifiableList(new LinkedList<>(excludedTransitiveDependencies)) : Collections.emptyList();
     }
 
     /**
@@ -329,19 +308,6 @@ public boolean isSnapshot() {
         return version.endsWith("-SNAPSHOT");
     }
 
-    /**
-     * Should transitive dependencies of this resolved
-     *
-     * @return true if the transitive dependencies of this library would be resolved
-     */
-    public boolean resolveTransitiveDependencies() {
-        return resolveTransitiveDependencies;
-    }
-
-    public Collection<ExcludedDependency> getExcludedTransitiveDependencies() {
-        return excludedTransitiveDependencies;
-    }
-
     /**
      * Gets a concise, human-readable string representation of this library.
      *
@@ -422,16 +388,6 @@ public static class Builder {
          */
         private final Collection<Relocation> relocations = new LinkedList<>();
 
-        /**
-         * Resolve transitive dependencies
-         */
-        private boolean resolveTransitiveDependencies;
-
-        /**
-         * Resolve transitive dependencies exclusions
-         */
-        private final Collection<ExcludedDependency> excludedTransitiveDependencies = new LinkedList<>();
-
         /**
          * Adds a direct download URL for this library.
          *
@@ -565,49 +521,13 @@ public Builder relocate(String pattern, String relocatedPattern) {
             return relocate(new Relocation(pattern, relocatedPattern));
         }
 
-        /**
-         * Sets the transitive dependency resolvement for this library.
-         *
-         * @param resolveTransitiveDependencies the transitive dependency resolvement
-         * @return this builder
-         * @see #excludeTransitiveDependency(ExcludedDependency)
-         */
-        public Builder resolveTransitiveDependencies(boolean resolveTransitiveDependencies) {
-            this.resolveTransitiveDependencies = resolveTransitiveDependencies;
-            return this;
-        }
-
-        /**
-         * Excludes transitive dependency for this library.
-         *
-         * @param excludedDependency Excluded transitive dependency
-         * @return this builder
-         * @see #resolveTransitiveDependencies(boolean)
-         */
-        public Builder excludeTransitiveDependency(ExcludedDependency excludedDependency) {
-            excludedTransitiveDependencies.add(excludedDependency);
-            return this;
-        }
-
-        /**
-         * Excludes transitive dependency for this library.
-         *
-         * @param groupId Excluded transitive dependency group ID
-         * @param artifactId Excluded transitive dependency artifact ID
-         * @return this builder
-         * @see #excludeTransitiveDependency(ExcludedDependency)
-         */
-        public Builder excludeTransitiveDependency(String groupId, String artifactId) {
-            return excludeTransitiveDependency(new ExcludedDependency(groupId, artifactId));
-        }
-
         /**
          * Creates a new library using this builder's configuration.
          *
          * @return new library
          */
         public Library build() {
-            return new Library(urls, repositories, id, groupId, artifactId, version, classifier, checksum, relocations, isolatedLoad, resolveTransitiveDependencies, excludedTransitiveDependencies);
+            return new Library(urls, repositories, id, groupId, artifactId, version, classifier, checksum, relocations, isolatedLoad);
         }
     }
 }