Clean up name and rule for generating r8 with dependencies
Change-Id: I1ef23299e496061b7ef2e4286475e43715525d67
diff --git a/build.gradle b/build.gradle
index 33605a1..b4dc7ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -529,15 +529,6 @@
baseName 'deps'
}
-task repackageDepsForLib(type: ShadowJar) {
- configurations = [project.configurations.runtimeClasspath]
- mergeServiceFiles(it)
- configureRelocations(it)
- exclude { it.getRelativePath().getPathString() == "module-info.class" }
- exclude { it.getRelativePath().getPathString().startsWith("META-INF/maven/") }
- baseName 'r8lib_deps'
-}
-
task repackageSources(type: ShadowJar) {
from sourceSets.main.output
mergeServiceFiles(it)
@@ -547,16 +538,19 @@
baseName 'sources'
}
-task R8libWithDeps(type: ShadowJar) {
+task r8WithRelocatedDeps(type: ShadowJar) {
from consolidatedLicense.outputs.files
- baseName 'r8lib_with_deps'
+ baseName 'r8_with_relocated_deps'
classifier = null
version = null
manifest {
attributes 'Main-Class': 'com.android.tools.r8.SwissArmyKnife'
}
from repackageSources.outputs.files
- from repackageDepsForLib.outputs.files
+ from repackageDeps.outputs.files
+ doLast {
+ configureRelocations(it)
+ }
}
task R8(type: ShadowJar) {
