Skip to content

Commit 79c00ed

Browse files
fix: Apply dependencies
1 parent b837ff3 commit 79c00ed

3 files changed

Lines changed: 33 additions & 12 deletions

File tree

src/main/java/studio/o7/remora/RemoraPlugin.java

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
import org.gradle.api.artifacts.dsl.DependencyHandler;
88
import org.gradle.api.artifacts.dsl.RepositoryHandler;
99
import org.gradle.api.logging.Logger;
10-
import org.gradle.api.plugins.ExtensionContainer;
1110
import org.gradle.api.plugins.JavaLibraryPlugin;
1211
import org.gradle.api.plugins.JavaPluginExtension;
1312
import org.gradle.api.plugins.PluginManager;
14-
import org.gradle.api.provider.Property;
1513
import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
1614
import org.gradle.plugins.signing.SigningPlugin;
1715
import studio.o7.remora.extensions.RemoraExtension;
16+
import studio.o7.remora.extensions.framework.FastUtilsExtension;
17+
import studio.o7.remora.extensions.framework.FrameworkExtension;
18+
import studio.o7.remora.extensions.framework.LombokExtension;
1819

1920
public class RemoraPlugin implements Plugin<Project> {
2021

@@ -30,7 +31,7 @@ public void apply(Project project) {
3031
applyNecessaryProjectConfiguration(logger, project, extension);
3132
applyJavaPluginConfiguration(logger, project, extension);
3233

33-
//applyDependencies(logger, project, extension);
34+
applyDependencies(logger, project, extension);
3435

3536
// todo
3637
// applyPlaceholderConfiguration(logger, project, extension);
@@ -75,25 +76,26 @@ public static void applyNecessaryRepositories(@NonNull Logger logger, @NonNull P
7576
public static void applyDependencies(@NonNull Logger logger, @NonNull Project project, @NonNull RemoraExtension extension) {
7677
DependencyHandler dependencies = project.getDependencies();
7778

78-
/*
79-
FrameworkExtension framework = null;
79+
FrameworkExtension framework = extension.getFramework();
8080

81-
logger.info("Adding dependency `lombok`");
81+
LombokExtension lombok = framework.getLombok();
82+
if (lombok.isEnabled()) {
83+
logger.info("Adding dependency `lombok`");
8284

83-
String lombokId = "org.projectlombok:lombok:1.18.36";
85+
String id = "org.projectlombok:lombok:" + lombok.getVersion();
8486

85-
dependencies.add("compileOnly", lombokId);
86-
dependencies.add("annotationProcessor", lombokId);
87+
dependencies.add("compileOnly", id);
88+
dependencies.add("annotationProcessor", id);
89+
}
8790

88-
FrameworkExtension.FastUtils fastUtils = framework.getFastUtils();
91+
FastUtilsExtension fastUtils = framework.getFastUtils();
8992
if (fastUtils.isEnabled()) {
9093
logger.info("Adding dependency `fastUtils`");
9194

9295
String id = "it.unimi.dsi:fastutil:" + fastUtils.getVersion();
9396

9497
dependencies.add(fastUtils.getScope().getConfigurationName(), id);
9598
}
96-
*/
9799
}
98100

99101
public static void applyPlaceholderConfiguration(@NonNull Logger logger, @NonNull Project project, @NonNull RemoraExtension extension) {
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package studio.o7.remora.extensions.framework;
2+
3+
import lombok.Getter;
4+
import lombok.Setter;
5+
import studio.o7.remora.enums.Scope;
6+
7+
@Getter
8+
@Setter
9+
public class FastUtilsExtension {
10+
private boolean enabled = false;
11+
private String version = "8.5.15";
12+
private Scope scope = Scope.COMPILE;
13+
}

src/main/java/studio/o7/remora/extensions/framework/FrameworkExtension.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,19 @@
1111
@Setter
1212
public class FrameworkExtension {
1313
private LombokExtension lombok;
14+
private FastUtilsExtension fastUtils;
1415

1516
@Inject
1617
public FrameworkExtension(ObjectFactory factory) {
17-
lombok = factory.newInstance(LombokExtension.class);
18+
this.lombok = factory.newInstance(LombokExtension.class);
19+
this.fastUtils = factory.newInstance(FastUtilsExtension.class);
1820
}
1921

2022
public void lombok(Action<? super LombokExtension> action) {
2123
action.execute(this.lombok);
2224
}
25+
26+
public void fastUtils(Action<? super FastUtilsExtension> action) {
27+
action.execute(this.fastUtils);
28+
}
2329
}

0 commit comments

Comments
 (0)