Merge branch 'main' into journal-world

cjburkey01 · May 9, 2024 · 3f94ff5 · 3f94ff5
2 parents c0ed2c4 + ebfd6f8
commit 3f94ff5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 20 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -38,7 +38,7 @@ jobs:
  run: chmod +x gradlew
 
  - name: Build with Gradle
- run: ./gradlew build
+ run: ./gradlew clean build
 
  - name: Upload artifact
  uses: actions/upload-artifact@v2

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -133,11 +133,11 @@ tasks {
 
  build {
  mustRunAfter("googleFormat", "clean")
+ dependsOn("jar")
  // When the build task is run, copy the version into the testServerDir and output
  // (Also rebuild the README file)
  finalizedBy("updateReadme",
- "copyClaimChunkToOutputDir",
- "copyClaimChunkToPluginsDir"
+ "copyClaimChunkToOutputDir"
  );
  }
 
@@ -215,29 +215,16 @@ tasks {
  mustRunAfter("copyClaimChunkToOutputDir");
  description = "Copies ClaimChunk from the build directory to the test server plugin directory.";
 
- val inputFile = mainDir.file("build/libs/claimchunk-${project.version}.jar");
- val outputDir = mainDir.dir("${DepData.TEST_SERVER_DIR}/plugins");
-
- inputs.file(inputFile);
- outputs.file(outputDir.file("claimchunk-${project.version}.jar"));
-
- from(mainDir.file("build/libs/claimchunk-${project.version}.jar"));
- into(outputDir);
+ from(jar);
+ into(mainDir.dir("${DepData.TEST_SERVER_DIR}/plugins"));
  }
 
  register<Copy>("copyClaimChunkToOutputDir") {
- // dependsOn("shadowJar");
  mustRunAfter("updateReadme");
  description = "Copies ClaimChunk from the build directory to the output directory.";
 
- val inputFile = mainDir.file("build/libs/claimchunk-${project.version}.jar");
- val outputDir = mainDir.dir(DepData.OUTPUT_DIR);
-
- inputs.file(inputFile);
- outputs.file(outputDir.file("claimchunk-${project.version}.jar"));
-
- from(inputFile);
- into(outputDir);
+ from(jar);
+ into(mainDir.dir(DepData.OUTPUT_DIR));
  }
 
  register<JavaExec>("googleFormat") {