diff --git a/.releaserc b/.releaserc index 49170c0ae..ae403adbe 100644 --- a/.releaserc +++ b/.releaserc @@ -31,9 +31,6 @@ "assets": [ { "path": "build/libs/*.jar" - }, - { - "path": "build/libs/*.dex" } ] } diff --git a/build.gradle.kts b/build.gradle.kts index d05858324..d288793b1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,15 +27,14 @@ dependencies { } tasks { - register("generateDex") { - description = "Generate dex files from build" + register("generateBundle") { + description = "Generate dex files from build and bundle them in the jar file" dependsOn(build) doLast { val androidHome = System.getenv("ANDROID_HOME") ?: throw GradleException("ANDROID_HOME not found") val d8 = "${androidHome}/build-tools/32.0.0/d8" val input = configurations.archives.get().allArtifacts.files.files.first().absolutePath - val output = input.replace(".jar", ".dex") val work = File("${buildDir}/libs") exec { @@ -45,7 +44,7 @@ tasks { exec { workingDir = work - commandLine = listOf("mv", "classes.dex", output) + commandLine = listOf("zip", "-u", input, "classes.dex") } } } @@ -62,6 +61,6 @@ tasks { register("publish") { group = "publish" description = "Dummy task" - dependsOn(named("generateDex"), named("generateReadme")) + dependsOn(named("generateBundle"), named("generateReadme")) } }