Skip to content

Fix wrong build path when building multiple modules together. #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GrandZhuo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix wrong build path when building multiple modules together. #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 12 additions & 18 deletions source/src/main/groovy/com/kezong/fataar/DirectoryManager.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,27 @@ class DirectoryManager {

private static final String INTERMEDIATES_TEMP_FOLDER = "fat-aar";

private static Project sProject;

static void attach(Project project) {
sProject = project;
}

static File getReBundleDirectory(LibraryVariant variant) {
return sProject.file("${sProject.getBuildDir()}/outputs/${RE_BUNDLE_FOLDER}/${variant.name}")
static File getReBundleDirectory(Project project, LibraryVariant variant) {
return project.file("${project.getBuildDir()}/outputs/${RE_BUNDLE_FOLDER}/${variant.name}")
}

static File getRJavaDirectory(LibraryVariant variant) {
return sProject.file("${sProject.getBuildDir()}/intermediates/${INTERMEDIATES_TEMP_FOLDER}/r/${variant.name}")
static File getRJavaDirectory(Project project, LibraryVariant variant) {
return project.file("${project.getBuildDir()}/intermediates/${INTERMEDIATES_TEMP_FOLDER}/r/${variant.name}")
}

static File getRClassDirectory(LibraryVariant variant) {
return sProject.file("${sProject.getBuildDir()}/intermediates/${INTERMEDIATES_TEMP_FOLDER}/r-class/${variant.name}")
static File getRClassDirectory(Project project, LibraryVariant variant) {
return project.file("${project.getBuildDir()}/intermediates/${INTERMEDIATES_TEMP_FOLDER}/r-class/${variant.name}")
}

static File getRJarDirectory(LibraryVariant variant) {
return sProject.file("${sProject.getBuildDir()}/outputs/${RE_BUNDLE_FOLDER}/${variant.name}/libs")
static File getRJarDirectory(Project project, LibraryVariant variant) {
return project.file("${project.getBuildDir()}/outputs/${RE_BUNDLE_FOLDER}/${variant.name}/libs")
}

static File getMergeClassDirectory(LibraryVariant variant) {
return sProject.file("${sProject.getBuildDir()}/intermediates/${INTERMEDIATES_TEMP_FOLDER}/merge_classes/${variant.name}")
static File getMergeClassDirectory(Project project, LibraryVariant variant) {
return project.file("${project.getBuildDir()}/intermediates/${INTERMEDIATES_TEMP_FOLDER}/merge_classes/${variant.name}")
}

static File getKotlinMetaDirectory(LibraryVariant variant) {
return sProject.file("${sProject.getBuildDir()}/tmp/kotlin-classes/${variant.name}/META-INF")
static File getKotlinMetaDirectory(Project project, LibraryVariant variant) {
return project.file("${project.getBuildDir()}/tmp/kotlin-classes/${variant.name}/META-INF")
}
}
1 change: 0 additions & 1 deletion source/src/main/groovy/com/kezong/fataar/FatAarPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ class FatAarPlugin implements Plugin<Project> {
this.project = project
checkAndroidPlugin()
FatUtils.attach(project)
DirectoryManager.attach(project)
project.extensions.create(FatAarExtension.NAME, FatAarExtension)
createConfigurations()
registerTransform()
Expand Down
6 changes: 3 additions & 3 deletions source/src/main/groovy/com/kezong/fataar/RClassesGenerate.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ class RClassesGenerate {
}

TaskProvider configure(TaskProvider<Task> reBundleTask) {
File rJavaDir = DirectoryManager.getRJavaDirectory(mVariant)
File rClassDir = DirectoryManager.getRClassDirectory(mVariant)
File rJarDir = DirectoryManager.getRJarDirectory(mVariant)
File rJavaDir = DirectoryManager.getRJavaDirectory(mProject, mVariant)
File rClassDir = DirectoryManager.getRClassDirectory(mProject, mVariant)
File rJarDir = DirectoryManager.getRJarDirectory(mProject, mVariant)
def RJarTask = configureRJarTask(rClassDir, rJarDir, reBundleTask)
def RClassTask = configureRClassTask(rJavaDir, rClassDir, RJarTask)
def RFileTask = configureRFileTask(rJavaDir, RClassTask)
Expand Down
10 changes: 5 additions & 5 deletions source/src/main/groovy/com/kezong/fataar/VariantProcessor.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class VariantProcessor {

private TaskProvider configureReBundleAarTask(TaskProvider bundleTask) {
File aarOutputFile
File reBundleDir = DirectoryManager.getReBundleDirectory(mVariant)
File reBundleDir = DirectoryManager.getReBundleDirectory(mProject, mVariant)
bundleTask.configure { it ->
if (FatUtils.compareVersion(mProject.gradle.gradleVersion, "5.1") >= 0) {
aarOutputFile = new File(it.getDestinationDirectory().getAsFile().get(), it.getArchiveFileName().get())
Expand Down Expand Up @@ -225,7 +225,7 @@ class VariantProcessor {
doLast {
for (archiveLibrary in mAndroidArchiveLibraries) {
if (archiveLibrary.dataBindingFolder != null && archiveLibrary.dataBindingFolder.exists()) {
String filePath = "${DirectoryManager.getReBundleDirectory(mVariant).path}/${archiveLibrary.dataBindingFolder.name}"
String filePath = "${DirectoryManager.getReBundleDirectory(mProject, mVariant).path}/${archiveLibrary.dataBindingFolder.name}"
new File(filePath).mkdirs()
mProject.copy {
from archiveLibrary.dataBindingFolder
Expand All @@ -234,7 +234,7 @@ class VariantProcessor {
}

if (archiveLibrary.dataBindingLogFolder != null && archiveLibrary.dataBindingLogFolder.exists()) {
String filePath = "${DirectoryManager.getReBundleDirectory(mVariant).path}/${archiveLibrary.dataBindingLogFolder.name}"
String filePath = "${DirectoryManager.getReBundleDirectory(mProject, mVariant).path}/${archiveLibrary.dataBindingLogFolder.name}"
new File(filePath).mkdirs()
mProject.copy {
from archiveLibrary.dataBindingLogFolder
Expand Down Expand Up @@ -370,7 +370,7 @@ class VariantProcessor {
.withPathSensitivity(PathSensitivity.RELATIVE)
inputs.files(mJarFiles).withPathSensitivity(PathSensitivity.RELATIVE)
}
File outputDir = DirectoryManager.getMergeClassDirectory(mVariant)
File outputDir = DirectoryManager.getMergeClassDirectory(mProject, mVariant)
File javacDir = mVersionAdapter.getClassPathDirFiles().first()
outputs.dir(outputDir)

Expand Down Expand Up @@ -401,7 +401,7 @@ class VariantProcessor {

mProject.copy {
from outputDir.absolutePath + "/META-INF"
into DirectoryManager.getKotlinMetaDirectory(mVariant)
into DirectoryManager.getKotlinMetaDirectory(mProject, mVariant)
include '*.kotlin_module'
}
}
Expand Down