Skip to content

Commit 4fe7e6d

Browse files
Remove unused code
1 parent 6c3541f commit 4fe7e6d

File tree

4 files changed

+5
-101
lines changed

4 files changed

+5
-101
lines changed

build.gradle.kts

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2021, TeamDev. All rights reserved.
2+
* Copyright 2025, TeamDev. All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Redistribution and use in source and/or binary forms, with or without
1111
* modification, must retain the above copyright notice and the following
@@ -24,16 +24,7 @@
2424
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2525
*/
2626

27-
import io.spine.dependency.build.CheckerFramework
2827
import io.spine.dependency.build.Dokka
29-
import io.spine.dependency.build.ErrorProne
30-
import io.spine.dependency.build.FindBugs
31-
import io.spine.dependency.lib.Grpc
32-
import io.spine.dependency.lib.Guava
33-
import io.spine.dependency.local.Base
34-
import io.spine.dependency.local.CoreJava
35-
import io.spine.dependency.local.Reflect
36-
import io.spine.dependency.local.TestLib
3728
import io.spine.gradle.publish.PublishingRepos
3829
import io.spine.gradle.publish.SpinePublishing
3930
import io.spine.gradle.publish.spinePublishing
@@ -48,10 +39,6 @@ buildscript {
4839
dependencies {
4940
classpath(io.spine.dependency.lib.Protobuf.GradlePlugin.lib)
5041
}
51-
configurations.all {
52-
resolutionStrategy {
53-
}
54-
}
5542
}
5643

5744
plugins {
@@ -82,18 +69,6 @@ allprojects {
8269
version = extra["bootstrapVersion"]!!
8370

8471
repositories.standardToSpineSdk()
85-
86-
configurations.all {
87-
resolutionStrategy {
88-
force(
89-
// Grpc.ProtocPlugin.artifact,
90-
// Reflect.lib,
91-
// Base.lib,
92-
// TestLib.lib,
93-
// CoreJava.server
94-
)
95-
}
96-
}
9772
}
9873

9974
PomGenerator.applyTo(project)

plugin/src/main/java/io/spine/tools/gradle/bootstrap/Extension.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,12 @@
5050
*/
5151
public final class Extension {
5252

53-
@SuppressWarnings("DuplicateStringLiteralInspection") // Used in tests and with other meanings.
5453
static final String NAME = "spine";
5554

5655
private final JavaExtension java;
5756
private final ModelExtension modelExtension;
5857
private final ArtifactSnapshot artifacts;
5958
private final Project project;
60-
private boolean javaEnabled;
6159
private boolean forceDependencies;
6260

6361
private Extension(Builder builder) {
@@ -200,7 +198,6 @@ void disableJavaGeneration() {
200198
}
201199

202200
private void toggleJavaTasks(boolean enabled) {
203-
this.javaEnabled = enabled;
204201
toggleCompileJavaTasks(enabled);
205202
}
206203

plugin/src/main/java/io/spine/tools/gradle/bootstrap/SpineBasedProject.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private SpineBasedProject(Dependant dependencies, Project project) {
6262
*/
6363
static SpineBasedProject from(Project project) {
6464
checkNotNull(project);
65-
DependantProject dependantProject = DependantProject.from(project);
65+
var dependantProject = DependantProject.from(project);
6666
return new SpineBasedProject(dependantProject, project);
6767
}
6868

plugin/src/test/java/io/spine/tools/gradle/bootstrap/ExtensionTest.java

Lines changed: 2 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,6 @@ void addBaseDependencyToJava() {
121121
.contains(baseDependency());
122122
}
123123

124-
@Test
125-
@DisplayName("add `base` dependency to a JS project")
126-
void addBaseDependencyToJs() {
127-
extension.enableJavaScript();
128-
assertThat(dependencyTarget.dependencies())
129-
.contains(baseDependency());
130-
}
131-
132124
@Test
133125
@DisplayName("add `base` dependency to a model-only project")
134126
void addBaseDependencyToModel() {
@@ -145,14 +137,6 @@ void addTimeDependencyToJava() {
145137
.contains(timeDependency());
146138
}
147139

148-
@Test
149-
@DisplayName("add `time` dependency to a JS project")
150-
void addTimeDependencyToJs() {
151-
extension.enableJavaScript();
152-
assertThat(dependencyTarget.dependencies())
153-
.contains(timeDependency());
154-
}
155-
156140
@Test
157141
@DisplayName("add `time` dependency to a model-only project")
158142
void addTimeDependencyToModel() {
@@ -193,27 +177,11 @@ void addTestUtilTimeDependecy() {
193177
.contains(testUtilTimeDependency());
194178
}
195179

196-
@Test
197-
@DisplayName("add `web` dependencies to a Java project")
198-
void addWebDependency() {
199-
extension.enableJava(JavaExtension::webServer);
200-
assertThat(dependencyTarget.dependencies())
201-
.contains(webDependency());
202-
}
203-
204-
@Test
205-
@DisplayName("add `firebase-web` dependencies to a Java project")
206-
void addFirebaseWebDependency() {
207-
extension.enableJava(JavaExtension::firebaseWebServer);
208-
assertThat(dependencyTarget.dependencies())
209-
.contains(firebaseWebDependency());
210-
}
211-
212180
@Test
213181
@DisplayName("add `gcloud` dependency to a Java project")
214182
void addGCloudDependency() {
215183
extension.enableJava(JavaExtension::withDatastore);
216-
IterableSubject assertDependencies = assertThat(dependencyTarget.dependencies());
184+
var assertDependencies = assertThat(dependencyTarget.dependencies());
217185
assertDependencies
218186
.contains(datastoreDependency());
219187
}
@@ -236,42 +204,6 @@ void notApplyJavaIfJavaLib() {
236204
extension.enableJava();
237205
}
238206

239-
@Test
240-
@DisplayName("not add a `testlib` dependency to a JS project")
241-
void noTestLibForJs() {
242-
extension.enableJavaScript();
243-
244-
assertThat(dependencyTarget.dependencies())
245-
.doesNotContain(testlibDependency());
246-
}
247-
248-
@Test
249-
@DisplayName("not add a `testutil-time` dependency to a JS project")
250-
void noTestUtilTimeForJs() {
251-
extension.enableJavaScript();
252-
253-
assertThat(dependencyTarget.dependencies())
254-
.doesNotContain(testUtilTimeDependency());
255-
}
256-
257-
@Test
258-
@DisplayName("apply `com.google.protobuf` plugin to a JS project")
259-
void applyProtoForJs() {
260-
extension.enableJavaScript();
261-
262-
assertApplied(ProtobufPlugin.class);
263-
}
264-
265-
@Test
266-
@DisplayName("apply both Model Compiler and Proto JS plugin to a complex project")
267-
void combine() {
268-
extension.enableJavaScript();
269-
extension.enableJava();
270-
271-
assertApplied(JavaPlugin.class);
272-
assertApplied(McPlugin.class);
273-
}
274-
275207
@Test
276208
@DisplayName("add server dependencies if required")
277209
void server() {
@@ -318,7 +250,7 @@ void testUtilServer() {
318250
extension.enableJava()
319251
.client();
320252

321-
IterableSubject assertDependencies = assertThat(dependencyTarget.dependencies());
253+
var assertDependencies = assertThat(dependencyTarget.dependencies());
322254
assertDependencies.contains(testUtilClientDependency());
323255
assertDependencies.doesNotContain(testUtilServerDependency());
324256
}

0 commit comments

Comments
 (0)