Disable generateAccessWidener for now

Sinytra · Jul 4, 2024 · 4399dce · 4399dce
1 parent 727e91b
commit 4399dce
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,6 +18,11 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
         with:
           gradle-home-cache-cleanup: true
+      - name: Setup env properties
+        shell: bash
+        run: |
+          mkdir -p ~/.gradle/
+          echo "GRADLE_USER_HOME=${HOME}/.gradle" >> $GITHUB_ENV
       - name: Create placeholder assets dir
         run: mkdir -p ${{ env.GRADLE_USER_HOME }}/caches/fabric-loom/assets
       - run: ./gradlew check build publishToMavenLocal --stacktrace
@@ -81,5 +86,14 @@ jobs:
         with:
           distribution: 'microsoft'
           java-version: '21'
+      - name: Setup env properties
+        env:
+          GRADLE_PROPERTIES: ${{ vars.GRADLE_PROPERTIES }}
+        shell: bash
+        run: |
+          mkdir -p ~/.gradle/
+          echo "GRADLE_USER_HOME=${HOME}/.gradle" >> $GITHUB_ENV
+      - name: Create placeholder assets dir
+        run: mkdir -p ${{ env.GRADLE_USER_HOME }}/caches/fabric-loom/assets
       - run: ./gradlew generateResources --stacktrace --warning-mode=fail
       - run: if [ -n "$(git status --porcelain)" ]; then exit 1; fi
diff --git a/fabric-convention-tags-v2/build.gradle b/fabric-convention-tags-v2/build.gradle
@@ -26,13 +26,13 @@ sourceSets {
 }
 
 dependencies {
-//	datagenImplementation project(path: ":fabric-data-generation-api-v1", configuration: 'namedElements')
+	datagenImplementation project(path: ":fabric-data-generation-api-v1", configuration: 'namedElements')
 }
 
 loom {
 	runs {
 		datagen {
-			inherit server
+			data()
 			name "Data Generation"
 			vmArg "-Dfabric-api.datagen"
 			vmArg "-Dfabric-api.datagen.output-dir=${file("src/generated/resources")}"

diff --git a/fabric-data-generation-api-v1/build.gradle b/fabric-data-generation-api-v1/build.gradle
@@ -61,6 +61,7 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
 
 task generateAccessWidener() {
+	enabled = false
 	doLast {
 		File inputJar = loom.namedMinecraftProvider.parentMinecraftProvider.mergedJar.path.toFile()
 		String accessWidener = "accessWidener\tv2\tnamed\n"

diff --git a/fabric-transitive-access-wideners-v1/build.gradle b/fabric-transitive-access-wideners-v1/build.gradle
@@ -22,6 +22,7 @@ import java.nio.file.Path
 import java.util.stream.Collectors
 
 task generateAccessWidener {
+	enabled = false
 	doLast {
 		List<String> lines = new ArrayList<>();
 		lines.add("accessWidener v2 named")