Created
September 19, 2024 08:24
-
-
Save lptr/5f0e146726bf9bfe4b210aab160910d8 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/platforms/core-runtime/process-services/build.gradle.kts b/platforms/core-runtime/process-services/build.gradle.kts | |
| index 22f8c317557..5694a46ebc8 100644 | |
| --- a/platforms/core-runtime/process-services/build.gradle.kts | |
| +++ b/platforms/core-runtime/process-services/build.gradle.kts | |
| @@ -8,6 +8,7 @@ dependencies { | |
| api(projects.concurrent) | |
| api(projects.stdlibJavaExtensions) | |
| api(projects.baseServices) | |
| + api(projects.coreApi) | |
| api(libs.jsr305) | |
| testImplementation(testFixtures(projects.core)) | |
| diff --git a/subprojects/core-api/build.gradle.kts b/subprojects/core-api/build.gradle.kts | |
| index b138bdf6712..6a743b3e6c3 100644 | |
| --- a/subprojects/core-api/build.gradle.kts | |
| +++ b/subprojects/core-api/build.gradle.kts | |
| @@ -22,7 +22,6 @@ errorprone { | |
| dependencies { | |
| compileOnly(libs.jetbrainsAnnotations) | |
| - api(projects.processServices) | |
| api(projects.stdlibJavaExtensions) | |
| api(projects.buildCacheSpi) | |
| api(projects.loggingApi) | |
| diff --git a/platforms/core-runtime/process-services/src/main/java/org/gradle/process/BaseExecSpec.java b/subprojects/core-api/src/main/java/org/gradle/process/BaseExecSpec.java | |
| similarity index 100% | |
| rename from platforms/core-runtime/process-services/src/main/java/org/gradle/process/BaseExecSpec.java | |
| rename to subprojects/core-api/src/main/java/org/gradle/process/BaseExecSpec.java | |
| diff --git a/platforms/core-runtime/process-services/src/main/java/org/gradle/process/CommandLineArgumentProvider.java b/subprojects/core-api/src/main/java/org/gradle/process/CommandLineArgumentProvider.java | |
| similarity index 100% | |
| rename from platforms/core-runtime/process-services/src/main/java/org/gradle/process/CommandLineArgumentProvider.java | |
| rename to subprojects/core-api/src/main/java/org/gradle/process/CommandLineArgumentProvider.java | |
| diff --git a/platforms/core-runtime/process-services/src/main/java/org/gradle/process/ExecResult.java b/subprojects/core-api/src/main/java/org/gradle/process/ExecResult.java | |
| similarity index 92% | |
| rename from platforms/core-runtime/process-services/src/main/java/org/gradle/process/ExecResult.java | |
| rename to subprojects/core-api/src/main/java/org/gradle/process/ExecResult.java | |
| index 0109805a8f3..ba0ae644ad8 100644 | |
| --- a/platforms/core-runtime/process-services/src/main/java/org/gradle/process/ExecResult.java | |
| +++ b/subprojects/core-api/src/main/java/org/gradle/process/ExecResult.java | |
| @@ -16,6 +16,7 @@ | |
| package org.gradle.process; | |
| +import org.gradle.api.provider.Provider; | |
| import org.gradle.process.internal.ExecException; | |
| /** | |
| @@ -27,6 +28,10 @@ public interface ExecResult { | |
| */ | |
| int getExitValue(); | |
| + default Provider<String> getSomething() { | |
| + return null; | |
| + } | |
| + | |
| /** | |
| * Throws an {@link org.gradle.process.internal.ExecException} if the process exited with a non-zero exit value. | |
| * | |
| diff --git a/platforms/core-runtime/process-services/src/main/java/org/gradle/process/ExecSpec.java b/subprojects/core-api/src/main/java/org/gradle/process/ExecSpec.java | |
| similarity index 100% | |
| rename from platforms/core-runtime/process-services/src/main/java/org/gradle/process/ExecSpec.java | |
| rename to subprojects/core-api/src/main/java/org/gradle/process/ExecSpec.java | |
| diff --git a/platforms/core-runtime/process-services/src/main/java/org/gradle/process/ProcessForkOptions.java b/subprojects/core-api/src/main/java/org/gradle/process/ProcessForkOptions.java | |
| similarity index 100% | |
| rename from platforms/core-runtime/process-services/src/main/java/org/gradle/process/ProcessForkOptions.java | |
| rename to subprojects/core-api/src/main/java/org/gradle/process/ProcessForkOptions.java |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment