Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Load module dependency first by URL to inline behaviors with jup… #1259

Merged
merged 3 commits into from
Jul 3, 2023
Merged

fix: Load module dependency first by URL to inline behaviors with jup… #1259

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9a5cca
fix: Load module dependency first by URL to inline behaviors with jup…
RobotHanzo Jun 18, 2023
e995001
Merge branch 'nightly' into fix-module-dependencies-loading-order
RobotHanzo Jun 20, 2023
23bc98d
Merge branch 'nightly' into fix-module-dependencies-loading-order
RobotHanzo Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions driver/src/main/java/eu/cloudnetservice/driver/module/DefaultModuleProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,13 @@ public void notifyPostModuleLifecycleChange(@NonNull ModuleWrapper wrapper, @Non
}
// ensure that the required properties are set
dependency.assertDefaultPropertiesSet();
// decide which way to go (by url or repository). In this case we start with the more common repository way
// decide which way to go (by url or repository). In this case we start with the developer defined url if there's one
if (dependency.url() != null) {
loadedDependencies.add(this.doLoadDependency(dependency, configuration, handler,
() -> this.moduleDependencyLoader.loadModuleDependencyByUrl(configuration, dependency)));
continue;
}
// check if the repository defined a repository for us to use
if (dependency.repo() != null) {
var repoUrl = Preconditions.checkNotNull(
repos.get(dependency.repo()),
Expand All @@ -468,12 +474,6 @@ public void notifyPostModuleLifecycleChange(@NonNull ModuleWrapper wrapper, @Non
() -> this.moduleDependencyLoader.loadModuleDependencyByRepository(configuration, dependency, repoUrl)));
continue;
}
// check if the repository defined a fixed download url for us to use
if (dependency.url() != null) {
loadedDependencies.add(this.doLoadDependency(dependency, configuration, handler,
() -> this.moduleDependencyLoader.loadModuleDependencyByUrl(configuration, dependency)));
continue;
}
// the dependency might be a dependency for a module, save this
pendingModuleDependencies.add(dependency);
}
Expand Down