Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2024-12-27 17:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to DependencyDownload 2.0.0-SNAPSHOT

Browse Source
This commit is contained in:
Vankka 2024-12-14 00:04:36 +02:00
parent fd47e8ba7e
commit 312159e9ec
No known key found for this signature in database
GPG Key ID: 62E48025ED4E7EBB
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/main/java/com/discordsrv/common/core/dependency/DependencyLoader.java
View File

@ -22,8 +22,10 @@ import com.discordsrv.common.DiscordSRV;
import dev.vankka.dependencydownload.DependencyManager; import dev.vankka.dependencydownload.DependencyManager;
import dev.vankka.dependencydownload.classloader.IsolatedClassLoader; import dev.vankka.dependencydownload.classloader.IsolatedClassLoader;
import dev.vankka.dependencydownload.classpath.ClasspathAppender; import dev.vankka.dependencydownload.classpath.ClasspathAppender;
import dev.vankka.dependencydownload.path.DependencyPathProvider;
import dev.vankka.dependencydownload.repository.MavenRepository;
import dev.vankka.dependencydownload.repository.Repository; import dev.vankka.dependencydownload.repository.Repository;
import dev.vankka.dependencydownload.repository.StandardRepository; import dev.vankka.dependencydownload.resource.DependencyDownloadResource;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
@ -37,10 +39,10 @@ public class DependencyLoader {
private static final List<Repository> REPOSITORIES = Arrays.asList( private static final List<Repository> REPOSITORIES = Arrays.asList(
// TODO // TODO
new StandardRepository("https://repo1.maven.org/maven2"), new MavenRepository("https://repo1.maven.org/maven2"),
new StandardRepository("https://oss.sonatype.org/content/repositories/snapshots"), new MavenRepository("https://oss.sonatype.org/content/repositories/snapshots"),
new StandardRepository("https://s01.oss.sonatype.org/content/repositories/snapshots"), new MavenRepository("https://s01.oss.sonatype.org/content/repositories/snapshots"),
new StandardRepository("https://nexus.scarsz.me/content/groups/public") new MavenRepository("https://nexus.scarsz.me/content/groups/public")
); );
public static Path resolvePath(Path dataDirectory) { public static Path resolvePath(Path dataDirectory) {
@ -48,13 +50,13 @@ public class DependencyLoader {
} }
public static DependencyManager fromPaths(Path dataDirectory, String[] resources) throws IOException { public static DependencyManager fromPaths(Path dataDirectory, String[] resources) throws IOException {
DependencyManager dependencyManager = new DependencyManager(resolvePath(dataDirectory)); DependencyManager dependencyManager = new DependencyManager(DependencyPathProvider.directory(resolvePath(dataDirectory)));
for (String dependencyResource : resources) { for (String dependencyResource : resources) {
URL resource = DependencyLoader.class.getClassLoader().getResource(dependencyResource); URL resource = DependencyLoader.class.getClassLoader().getResource(dependencyResource);
if (resource == null) { if (resource == null) {
throw new IllegalArgumentException("Could not find resource with: " + dependencyResource); throw new IllegalArgumentException("Could not find resource with: " + dependencyResource);
} }
dependencyManager.loadFromResource(resource); dependencyManager.loadResource(DependencyDownloadResource.parse(resource));
} }
return dependencyManager; return dependencyManager;

3
common/src/main/java/com/discordsrv/common/core/dependency/DiscordSRVDependencyManager.java
View File

@ -21,6 +21,7 @@ package com.discordsrv.common.core.dependency;
import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.DiscordSRV;
import dev.vankka.dependencydownload.ApplicationDependencyManager; import dev.vankka.dependencydownload.ApplicationDependencyManager;
import dev.vankka.dependencydownload.DependencyManager; import dev.vankka.dependencydownload.DependencyManager;
import dev.vankka.dependencydownload.path.DependencyPathProvider;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;
@ -33,7 +34,7 @@ public class DiscordSRVDependencyManager {
public DiscordSRVDependencyManager(DiscordSRV discordSRV, DependencyLoader initialLoader) { public DiscordSRVDependencyManager(DiscordSRV discordSRV, DependencyLoader initialLoader) {
this.discordSRV = discordSRV; this.discordSRV = discordSRV;
Path cacheDirectory = DependencyLoader.resolvePath(discordSRV.dataDirectory()); Path cacheDirectory = DependencyLoader.resolvePath(discordSRV.dataDirectory());
this.dependencyManager = new ApplicationDependencyManager(cacheDirectory); this.dependencyManager = new ApplicationDependencyManager(DependencyPathProvider.directory(cacheDirectory));
if (initialLoader != null) { if (initialLoader != null) {
dependencyManager.include(initialLoader.getDependencyManager()); dependencyManager.include(initialLoader.getDependencyManager());

2
settings.gradle
View File

@ -41,7 +41,7 @@ dependencyResolutionManagement {
library('velocity', 'com.velocitypowered', 'velocity-api').version('3.3.0-SNAPSHOT') library('velocity', 'com.velocitypowered', 'velocity-api').version('3.3.0-SNAPSHOT')
// DependencyDownload // DependencyDownload
version('dependencydownload', '1.3.1') version('dependencydownload', '2.0.0-SNAPSHOT')
plugin('dependencydownload-plugin', 'dev.vankka.dependencydownload.plugin').versionRef('dependencydownload') plugin('dependencydownload-plugin', 'dev.vankka.dependencydownload.plugin').versionRef('dependencydownload')
library('dependencydownload-runtime', 'dev.vankka', 'dependencydownload-runtime').versionRef('dependencydownload') library('dependencydownload-runtime', 'dev.vankka', 'dependencydownload-runtime').versionRef('dependencydownload')
library('dependencydownload-jarinjar-bootstrap', 'dev.vankka', 'dependencydownload-jarinjar-bootstrap').versionRef('dependencydownload') library('dependencydownload-jarinjar-bootstrap', 'dev.vankka', 'dependencydownload-jarinjar-bootstrap').versionRef('dependencydownload')