Skip to content

Instantly share code, notes, and snippets.

View lptr's full-sized avatar

Lóránt Pintér lptr

View GitHub Profile
diff --git a/subprojects/public-api/build.gradle.kts b/subprojects/public-api/build.gradle.kts
index 6843632f414..9aba37fbbf6 100644
--- a/subprojects/public-api/build.gradle.kts
+++ b/subprojects/public-api/build.gradle.kts
@@ -28,6 +28,7 @@ dependencies {
externalApi(libs.groovy)
}
+val testRepoLocation = layout.buildDirectory.dir("repos/test")
publishing {
diff --git a/build-logic/packaging/src/main/kotlin/gradlebuild.public-api-jar.gradle.kts b/build-logic/packaging/src/main/kotlin/gradlebuild.public-api-jar.gradle.kts
index 3dcb5de01aa..cd4377fbe2d 100644
--- a/build-logic/packaging/src/main/kotlin/gradlebuild.public-api-jar.gradle.kts
+++ b/build-logic/packaging/src/main/kotlin/gradlebuild.public-api-jar.gradle.kts
@@ -16,7 +16,7 @@
import gradlebuild.configureAsRuntimeElements
import gradlebuild.configureAsRuntimeJarClasspath
-import gradlebuild.packaging.transforms.CopyPublicApiClassesTransform
+import gradlebuild.packaging.tasks.ProguardExec
diff --git a/subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/DependencyReportTaskIntegrationTest.groovy b/subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/DependencyReportTaskIntegrationTest.groovy
index cc0dc29df19..82d0d2b71e6 100644
--- a/subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/DependencyReportTaskIntegrationTest.groovy
+++ b/subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/DependencyReportTaskIntegrationTest.groovy
@@ -116,7 +116,7 @@ conf
when:
executer.noExtraLogging()
- run "dependencies"
+ run "dependencies", "--stacktrace"
diff --git a/platforms/core-execution/build-cache-http/src/main/java/org/gradle/caching/http/internal/DefaultHttpBuildCacheServiceFactory.java b/platforms/core-execution/build-cache-http/src/main/java/org/gradle/caching/http/internal/DefaultHttpBuildCacheServiceFactory.java
index 141e49c2014..1ad7e2e8a3a 100644
--- a/platforms/core-execution/build-cache-http/src/main/java/org/gradle/caching/http/internal/DefaultHttpBuildCacheServiceFactory.java
+++ b/platforms/core-execution/build-cache-http/src/main/java/org/gradle/caching/http/internal/DefaultHttpBuildCacheServiceFactory.java
@@ -25,6 +25,7 @@
import org.gradle.caching.http.HttpBuildCacheCredentials;
import org.gradle.internal.authentication.DefaultBasicAuthentication;
import org.gradle.internal.deprecation.Documentation;
+import org.gradle.internal.operations.BuildOperationRunner;
import org.gradle.internal.resource.transport.http.DefaultHttpSettings;
diff --git a/platforms/core-configuration/kotlin-dsl-integ-tests/build.gradle.kts b/platforms/core-configuration/kotlin-dsl-integ-tests/build.gradle.kts
index e7a687bfbb3..84ffcf22781 100644
--- a/platforms/core-configuration/kotlin-dsl-integ-tests/build.gradle.kts
+++ b/platforms/core-configuration/kotlin-dsl-integ-tests/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
integTestImplementation(project(":core-api"))
integTestImplementation(project(":core"))
integTestImplementation(project(":model-core"))
+ integTestImplementation(project(":messaging"))
integTestImplementation(project(":internal-testing"))
diff --git a/platforms/core-execution/execution/src/main/java/org/gradle/internal/execution/steps/AbstractResolveCachingStateStep.java b/platforms/core-execution/execution/src/main/java/org/gradle/internal/execution/steps/AbstractResolveCachingStateStep.java
index 1436c1e1b83..53c976c736a 100644
--- a/platforms/core-execution/execution/src/main/java/org/gradle/internal/execution/steps/AbstractResolveCachingStateStep.java
+++ b/platforms/core-execution/execution/src/main/java/org/gradle/internal/execution/steps/AbstractResolveCachingStateStep.java
@@ -52,8 +52,8 @@ public AbstractResolveCachingStateStep(BuildCacheController buildCache) {
@Override
public CachingResult execute(UnitOfWork work, C context) {
CachingState cachingState;
- cachingState = determineCacheKeyWithBeforeExecutionState(context)
- .map(cacheKeyAndBeforeExecutionState -> calculateCachingState(work, context, cacheKeyAndBeforeExecutionState.getCacheKey(), cacheKeyAndBeforeExecutionState.getBeforeExecutionSt
@lptr
lptr / .gitignore
Last active January 26, 2024 14:47
*.txt
diff --git a/platformio.ini b/platformio.ini
index dd73415..bdb058f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -25,6 +25,7 @@ build_flags =
monitor_filters = esp32_exception_decoder
monitor_speed = 115200
+monitor_raw = true
lib_deps =
diff --git a/platforms/core-execution/execution/src/integTest/groovy/org/gradle/internal/execution/IncrementalExecutionIntegrationTest.groovy b/platforms/core-execution/execution/src/integTest/groovy/org/gradle/internal/execution/IncrementalExecutionIntegrationTest.groovy
index a7a098a1e23..d67adc4f6a3 100644
--- a/platforms/core-execution/execution/src/integTest/groovy/org/gradle/internal/execution/IncrementalExecutionIntegrationTest.groovy
+++ b/platforms/core-execution/execution/src/integTest/groovy/org/gradle/internal/execution/IncrementalExecutionIntegrationTest.groovy
@@ -64,13 +64,6 @@ class IncrementalExecutionIntegrationTest extends Specification implements Valid
def snapshotter = new DefaultFileCollectionSnapshotter(fileSystemAccess, TestFiles.fileSystem())
def fingerprinter = new AbsolutePathFileCollectionFingerprinter(DirectorySensitivity.DEFAULT, snapshotter, FileSystemLocationSnapshotHasher.DEFAULT)
def executionHistoryStore = new TestExecutionHistoryStore()
- def outputChangeL
--- executed-000.log 2023-11-17 10:59:12
+++ executed-001.log 2023-11-17 11:00:17
@@ -4078,7 +4078,6 @@
>>> Running TaskExecution: task ':cityquiz:createDebugApkListingFileRedirect'
>>> Running TaskExecution: task ':cityquiz:createDebugVariantModel'
>>> Running TaskExecution: task ':cityquiz:createDebugVariantModel'
->>> Running TaskExecution: task ':cityquiz:desugarDebugFileDependencies'
>>> Running TaskExecution: task ':cityquiz:dexBuilderDebug'
>>> Running TaskExecution: task ':cityquiz:featureDebugWriter'
>>> Running TaskExecution: task ':cityquiz:featureDebugWriter'