diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-02-20 18:29:31 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-02-20 18:29:31 +0800 |
| commit | ce4a1cb2a37293d5704745df31b48d8fdae37da0 (patch) | |
| tree | 1f229ed54b87bf39ba3820f188abb2f71caae521 /src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java | |
| parent | e8800ec6ac843289e666464a31a21878f797f261 (diff) | |
| parent | 57c9a8f3209121f22e84b8b01b64f1093256f1d3 (diff) | |
| download | architectury-loom-ce4a1cb2a37293d5704745df31b48d8fdae37da0.tar.gz architectury-loom-ce4a1cb2a37293d5704745df31b48d8fdae37da0.tar.bz2 architectury-loom-ce4a1cb2a37293d5704745df31b48d8fdae37da0.zip | |
Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.6-forge
# Conflicts:
# .github/workflows/test-push.yml
# build.gradle
# src/main/java/net/fabricmc/loom/util/Constants.java
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java index 9e11cb3a..0f3aef82 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java @@ -126,9 +126,9 @@ public class LaunchProvider extends DependencyProvider { writeLog4jConfig(); FileUtils.writeStringToFile(getExtension().getDevLauncherConfig(), launchConfig.asString(), StandardCharsets.UTF_8); - addDependency(Constants.Dependencies.DEV_LAUNCH_INJECTOR + Constants.Dependencies.Versions.DEV_LAUNCH_INJECTOR, JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME); - addDependency(Constants.Dependencies.TERMINAL_CONSOLE_APPENDER + Constants.Dependencies.Versions.TERMINAL_CONSOLE_APPENDER, JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME); - annotationDependency = addDependency(Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS, "compileOnly"); + addDependency(Constants.Dependencies.DEV_LAUNCH_INJECTOR + Constants.Dependencies.Versions.DEV_LAUNCH_INJECTOR, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES); + addDependency(Constants.Dependencies.TERMINAL_CONSOLE_APPENDER + Constants.Dependencies.Versions.TERMINAL_CONSOLE_APPENDER, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES); + annotationDependency = addDependency(Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS, JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME); if (getExtension().isForge()) { addDependency(Constants.Dependencies.JAVAX_ANNOTATIONS + Constants.Dependencies.Versions.JAVAX_ANNOTATIONS, "compileOnly"); |