Skip to content

Commit 105b454

Browse files
alllexalllex
committed
Annotate Project-scoped services with scope
1 parent 4f9e669 commit 105b454

File tree

42 files changed

+118
-24
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+118
-24
lines changed

‎platforms/core-configuration/file-operations/src/main/java/org/gradle/api/internal/file/DefaultProjectLayout.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,12 @@
3333
import org.gradle.api.provider.Provider;
3434
import org.gradle.api.tasks.util.PatternSet;
3535
import org.gradle.internal.Factory;
36+
import org.gradle.internal.service.scopes.Scope;
37+
import org.gradle.internal.service.scopes.ServiceScope;
3638

3739
import java.io.File;
3840

41+
@ServiceScope(Scope.Project.class)
3942
public class DefaultProjectLayout implements ProjectLayout, TaskFileVarFactory {
4043

4144
private final Directory settingsDir;

‎platforms/core-configuration/file-operations/src/main/java/org/gradle/api/internal/file/TaskFileVarFactory.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
import org.gradle.api.file.ConfigurableFileCollection;
2121
import org.gradle.api.file.FileCollection;
2222
import org.gradle.api.internal.file.collections.MinimalFileSet;
23+
import org.gradle.internal.service.scopes.Scope;
24+
import org.gradle.internal.service.scopes.ServiceScope;
2325

26+
@ServiceScope(Scope.Project.class)
2427
public interface TaskFileVarFactory {
2528
/**
2629
* Creates a {@link ConfigurableFileCollection} that can be used as a task input.

‎platforms/core-configuration/model-core/src/main/java/org/gradle/model/internal/registry/ModelRegistry.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package org.gradle.model.internal.registry;
1818

19+
import org.gradle.internal.service.scopes.Scope;
20+
import org.gradle.internal.service.scopes.ServiceScope;
1921
import org.gradle.model.RuleSource;
2022
import org.gradle.model.internal.core.ModelAction;
2123
import org.gradle.model.internal.core.ModelActionRole;
@@ -28,6 +30,7 @@
2830

2931
import javax.annotation.Nullable;
3032

33+
@ServiceScope(Scope.Project.class)
3134
public interface ModelRegistry {
3235

3336
/**

‎platforms/core-execution/workers/src/main/java/org/gradle/workers/internal/IsolatedClassloaderWorkerFactory.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@
2222
import org.gradle.internal.operations.BuildOperationRef;
2323
import org.gradle.internal.operations.BuildOperationRunner;
2424
import org.gradle.internal.service.ServiceRegistry;
25+
import org.gradle.internal.service.scopes.Scope;
26+
import org.gradle.internal.service.scopes.ServiceScope;
2527
import org.gradle.process.internal.worker.RequestHandler;
2628

29+
@ServiceScope(Scope.Project.class)
2730
public class IsolatedClassloaderWorkerFactory implements WorkerFactory {
2831
private final BuildOperationRunner buildOperationRunner;
2932
private final ServiceRegistry internalServices;

‎platforms/core-execution/workers/src/main/java/org/gradle/workers/internal/WorkerDaemonFactory.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,15 @@
1919
import org.gradle.internal.operations.BuildOperationRef;
2020
import org.gradle.internal.operations.BuildOperationRunner;
2121
import org.gradle.internal.operations.CurrentBuildOperationRef;
22+
import org.gradle.internal.service.scopes.Scope;
23+
import org.gradle.internal.service.scopes.ServiceScope;
2224

2325
import javax.annotation.concurrent.ThreadSafe;
2426

2527
/**
2628
* Controls the lifecycle of the worker daemon and provides access to it.
2729
*/
30+
@ServiceScope(Scope.Project.class)
2831
@ThreadSafe
2932
public class WorkerDaemonFactory implements WorkerFactory {
3033
private final WorkerDaemonClientsManager clientsManager;
@@ -48,7 +51,7 @@ public DefaultWorkResult execute(IsolatedParametersActionExecutionSpec<?> spec,
4851
// is never called) the cancellation handler will not stop daemons on a cancellation (as there is no danger of
4952
// leaving one in an unsafe state).
5053
workerDaemonClientCancellationHandler.start();
51-
54+
5255
// wrap in build operation for logging startup failures
5356
final WorkerDaemonClient client = CurrentBuildOperationRef.instance().with(parentBuildOperation, this::reserveClient);
5457
try {

‎platforms/core-runtime/base-services/src/main/java/org/gradle/internal/typeconversion/TypeConverter.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616

1717
package org.gradle.internal.typeconversion;
1818

19+
import org.gradle.internal.service.scopes.Scope;
20+
import org.gradle.internal.service.scopes.ServiceScope;
21+
22+
@ServiceScope(Scope.Project.class)
1923
public interface TypeConverter {
2024
/**
2125
* @param type The target type. Should be the boxed type for primitives.

‎platforms/core-runtime/build-configuration/src/main/java/org/gradle/internal/buildconfiguration/tasks/DaemonJvmPropertiesModifier.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import org.gradle.api.UncheckedIOException;
2020
import org.gradle.internal.buildconfiguration.DaemonJvmPropertiesConfigurator;
2121
import org.gradle.internal.buildconfiguration.DaemonJvmPropertiesDefaults;
22+
import org.gradle.internal.service.scopes.Scope;
23+
import org.gradle.internal.service.scopes.ServiceScope;
2224
import org.gradle.internal.util.PropertiesUtils;
2325
import org.gradle.jvm.toolchain.JavaLanguageVersion;
2426
import org.gradle.platform.BuildPlatform;
@@ -33,6 +35,7 @@
3335

3436
import static org.gradle.internal.buildconfiguration.tasks.DaemonJvmPropertiesUtils.getToolchainUrlPropertyForPlatform;
3537

38+
@ServiceScope(Scope.Project.class)
3639
public class DaemonJvmPropertiesModifier {
3740

3841
public DaemonJvmPropertiesModifier() {

‎platforms/core-runtime/logging/src/main/java/org/gradle/internal/logging/progress/ProgressLoggingInputStreamListener.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@
1616

1717
package org.gradle.internal.logging.progress;
1818

19+
import org.gradle.internal.service.scopes.Scope;
20+
import org.gradle.internal.service.scopes.ServiceScope;
21+
1922
import java.io.IOException;
2023

24+
@ServiceScope(Scope.Project.class)
2125
public interface ProgressLoggingInputStreamListener {
2226

2327
void onProcessedBytes(int numberOfBytes) throws IOException;

‎platforms/enterprise/enterprise/src/main/java/org/gradle/internal/enterprise/test/impl/TestTaskPropertiesServices.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616

1717
package org.gradle.internal.enterprise.test.impl;
1818

19+
import org.gradle.internal.enterprise.test.TestTaskPropertiesService;
1920
import org.gradle.internal.service.ServiceRegistration;
2021
import org.gradle.internal.service.scopes.AbstractGradleModuleServices;
2122

2223
public class TestTaskPropertiesServices extends AbstractGradleModuleServices {
2324

2425
@Override
2526
public void registerProjectServices(ServiceRegistration registration) {
26-
registration.add(DefaultTestTaskPropertiesService.class);
27+
registration.add(TestTaskPropertiesService.class, DefaultTestTaskPropertiesService.class);
2728
}
2829

2930
}

‎platforms/enterprise/enterprise/src/main/java/org/gradle/internal/snapshot/SnapshottingService.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,15 @@
1616

1717
package org.gradle.internal.snapshot;
1818

19+
import org.gradle.internal.service.scopes.Scope;
20+
import org.gradle.internal.service.scopes.ServiceScope;
21+
1922
import java.nio.file.Path;
2023

2124
/**
2225
* Snapshotting service which is used by test distribution.
2326
*/
27+
@ServiceScope(Scope.Project.class)
2428
public interface SnapshottingService {
2529

2630
/**

0 commit comments

Comments
 (0)