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/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'
diff --git a/platforms/core-execution/persistent-cache/src/main/java/org/gradle/cache/internal/AbstractCrossProcessCacheAccess.java b/platforms/core-execution/persistent-cache/src/main/java/org/gradle/cache/internal/AbstractCrossProcessCacheAccess.java
index 592be29565d..567eefc1359 100644
--- a/platforms/core-execution/persistent-cache/src/main/java/org/gradle/cache/internal/AbstractCrossProcessCacheAccess.java
+++ b/platforms/core-execution/persistent-cache/src/main/java/org/gradle/cache/internal/AbstractCrossProcessCacheAccess.java
@@ -16,19 +16,58 @@
package org.gradle.cache.internal;
-import org.gradle.cache.CrossProcessCacheAccess;
+import org.gradle.api.Action;

gradle-test-logger-plugin (com.adarshr:gradle-test-logger-plugin:3.2.0)

spotless-plugin-gradle (com.diffplug.spotless:spotless-plugin-gradle:6.20.0)

gradle-versions-plugin (com.github.ben-manes:gradle-versions-plugin:0.47.0)

spotbugs-gradle-plugin (com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.0-beta.3)

hilt-android-gradle-plugin (com.google.dagger:hilt-android-gradle-plugin:2.47)

diff --git a/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/MinimalJavaCompileOptions.java b/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/MinimalJavaCompileOptions.java
index 8bd64a34085..9b0f0f7926c 100644
--- a/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/MinimalJavaCompileOptions.java
+++ b/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/MinimalJavaCompileOptions.java
@@ -53,23 +53,23 @@ public class MinimalJavaCompileOptions implements Serializable {
public MinimalJavaCompileOptions(final CompileOptions compileOptions) {
FileCollection sourcepath = compileOptions.getSourcepath();
this.sourcepath = sourcepath == null ? null : ImmutableList.copyOf(sourcepath.getFiles());
- this.compilerArgs = Lists.newArrayList(compileOptions.getAllCompilerArgs());
- this.encoding = compileOptions.getEncoding();
diff --git a/subprojects/workers/src/integTest/groovy/org/gradle/workers/internal/WorkerExecutorNestingIntegrationTest.groovy b/subprojects/workers/src/integTest/groovy/org/gradle/workers/internal/WorkerExecutorNestingIntegrationTest.groovy
index 4bafe3023e0..125b582e331 100644
--- a/subprojects/workers/src/integTest/groovy/org/gradle/workers/internal/WorkerExecutorNestingIntegrationTest.groovy
+++ b/subprojects/workers/src/integTest/groovy/org/gradle/workers/internal/WorkerExecutorNestingIntegrationTest.groovy
@@ -146,14 +146,12 @@ class WorkerExecutorNestingIntegrationTest extends AbstractWorkerExecutorIntegra
buildFile << """
${getWorkActionWithNesting("noIsolation", "noIsolation")}
- class WorkerExecutorThreads {
static def getWorkerExecutorThreads() {