From 6c284292123f454e0e6e1c912ad6415d583c800b Mon Sep 17 00:00:00 2001
From: Walter Dziemianczyk <wdziemia@dropbox.com>
Date: Thu, 14 Mar 2024 13:12:40 -0400
Subject: [PATCH] Feedback

---
 .github/workflows/check.yml | 2 +-
 core/build.gradle           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index ac9fc1f92..932d35230 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -41,7 +41,7 @@ jobs:
       run: ./update-submodules
 
     - name: Generate Stone
-      run: ./gradlew :core:generateStone versionWriterTask
+      run: ./gradlew :core:generateStone
 
     - name: Ensure no changes in Generated Code
       run: ./scripts/check-clean-git-status
diff --git a/core/build.gradle b/core/build.gradle
index ccdbdfeb6..0a19fc01b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -37,7 +37,7 @@ tasks.register('versionWriterTask') {
     }
     it.inputs.property("versionName", versionName)
 
-    def generatedDir = project.layout.buildDirectory.dir("generated_stone_source/main/src")
+    def generatedDir = project.layout.buildDirectory.dir("generated/version")
     it.outputs.dir(generatedDir)
 
     it.doLast {
@@ -314,8 +314,8 @@ tasks.named("generateStone", StoneTask) {
 
     ])
     outputDir.set(project.layout.buildDirectory.dir("generated_stone_source/main"))
-    sourceSets { main { java.srcDir(outputDir.file("src")) } }
 }
+sourceSets.main.java.srcDir(generateStone)
 
 tasks.named("generateTestStone", StoneTask) {
     String packageName = 'com.dropbox.core.stone'
@@ -334,8 +334,8 @@ tasks.named("generateTestStone", StoneTask) {
             ),
     ])
     outputDir.set(project.layout.buildDirectory.dir("generated_stone_source/test"))
-    sourceSets { test { java.srcDir(outputDir.file("src")) } }
 }
+sourceSets.test.java.srcDir(generateTestStone)
 
 mavenPublishing {
     publishToMavenCentral(SonatypeHost.S01)