trying to clean up build.gradle...

Sharlottes · Aug 26, 2023 · 7d90677 · 7d90677
1 parent c009386
commit 7d90677
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -30,7 +30,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Build with Gradle
-        run: ./gradlew buildDex
+        run: ./gradlew deploy
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3

diff --git a/build.gradle b/build.gradle
@@ -31,6 +31,8 @@ jar.archiveFileName.set("raw-$artifactFilename")
 
 def isWindows = System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("windows")
 task dexify(type: Jar){
+    dependsOn "jar"
+
     archiveFileName.set(artifactFilename)
 
     final File jarArtifact = new File(tasks.jar.archiveFile.get().asFile.parent, "raw-$artifactFilename"),
@@ -61,8 +63,10 @@ task dexify(type: Jar){
     from(zipTree(jarArtifact), zipTree(dexedArtifact))
 }
 
-tasks.named("dexify").configure { dependsOn(":jar") }
-task buildDex dependsOn "build", "dexify"
+task deploy(type: Jar) {
+    dependsOn dexify
+    dependsOn "build"
+}
 
 tasks.withType(JavaCompile){
     targetCompatibility = 8