-
Notifications
You must be signed in to change notification settings - Fork 43
fix: wire merge classes to asm transformer #417
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@callstack/react-native-brownfield': patch | ||
| --- | ||
|
|
||
| fix: merge classes to contain third party libs classes |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 45 additions & 47 deletions
92
...act/brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/VariantHelper.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,61 +1,59 @@ | ||
| package com.callstack.react.brownfield.processors | ||
|
|
||
| import com.callstack.react.brownfield.shared.BaseProject | ||
| import com.callstack.react.brownfield.utils.AndroidArchiveLibrary | ||
| import com.callstack.react.brownfield.utils.DirectoryManager | ||
| import com.callstack.react.brownfield.utils.capitalized | ||
| import org.gradle.api.file.ConfigurableFileCollection | ||
| import java.io.File | ||
| import java.nio.file.Files | ||
| import java.nio.file.Path | ||
| import java.nio.file.Paths | ||
|
|
||
| class VariantHelper : BaseProject() { | ||
| private fun getClassPathDirFiles(variantName: String): ConfigurableFileCollection { | ||
| return project.files( | ||
| "$buildDir/intermediates/javac/$variantName/compile${variantName.capitalized()}JavaWithJavac/classes", | ||
| ) | ||
| import org.gradle.api.Project | ||
| import org.gradle.api.Task | ||
| import org.gradle.api.tasks.TaskCollection | ||
|
|
||
| object VariantHelper { | ||
| fun getAsmTransformTaskName(capitalizedVariantName: String): String { | ||
| return "transform${capitalizedVariantName}ClassesWithAsm" | ||
| } | ||
|
|
||
| fun classesMergeTaskDoFirst( | ||
| outputDir: File, | ||
| variantName: String, | ||
| ) { | ||
| val pathsToDelete = mutableListOf<Path>() | ||
| val javacDir = getClassPathDirFiles(variantName).first() | ||
| project.fileTree(outputDir).forEach { path -> | ||
| pathsToDelete.add( | ||
| Paths.get(outputDir.absolutePath).relativize(Paths.get(path.absolutePath)), | ||
| ) | ||
| fun getBundledAssetsVariantName( | ||
| variantName: String?, | ||
| buildTypeName: String?, | ||
| isDebuggable: Boolean, | ||
| ): String { | ||
| require(!variantName.isNullOrEmpty()) { | ||
| "getBundledAssetsVariantName: Variant name cannot be empty" | ||
| } | ||
| outputDir.deleteRecursively() | ||
| pathsToDelete.forEach { path -> | ||
| Files.deleteIfExists(Paths.get("$javacDir.absolutePath/$path")) | ||
|
|
||
| require(!buildTypeName.isNullOrEmpty()) { | ||
| "getBundledAssetsVariantName: Build Type cannot be empty" | ||
| } | ||
| } | ||
|
|
||
| fun classesMergeTaskDoLast( | ||
| outputDir: File, | ||
| aarLibraries: Collection<AndroidArchiveLibrary>, | ||
| jarFiles: MutableList<File>, | ||
| variantName: String, | ||
| isMinifyEnabled: Boolean, | ||
| ) { | ||
| MergeProcessor.mergeClassesJarIntoClasses(project, aarLibraries, outputDir) | ||
| if (isMinifyEnabled) { | ||
| MergeProcessor.mergeLibsIntoClasses(project, aarLibraries, jarFiles, outputDir) | ||
| if (!isDebuggable) { | ||
| return variantName | ||
| } | ||
| val javacDir = getClassPathDirFiles(variantName).first() | ||
| project.copy { copyTask -> | ||
| copyTask.from(outputDir) | ||
| copyTask.into(javacDir) | ||
| copyTask.exclude("META-INF/") | ||
|
|
||
| if (variantName == buildTypeName) { | ||
| return "release" | ||
| } | ||
|
|
||
| project.copy { copyTask -> | ||
| copyTask.from("${outputDir.absolutePath}/META-INF") | ||
| copyTask.into(DirectoryManager.getKotlinMetaDirectory(variantName)) | ||
| copyTask.include("*.kotlin_module") | ||
| val capitalizedBuildTypeName = buildTypeName.capitalized() | ||
| return if (variantName.endsWith(capitalizedBuildTypeName)) { | ||
| "${variantName.removeSuffix(capitalizedBuildTypeName)}Release" | ||
| } else { | ||
| "release" | ||
| } | ||
| } | ||
|
|
||
| fun getExpoUpdatesResourcesTaskName(variantName: String): String { | ||
| return "create${variantName.capitalized()}UpdatesResources" | ||
| } | ||
|
|
||
| fun getKotlinCompileTask( | ||
| project: Project, | ||
| capitalizedVariantName: String, | ||
| ): TaskCollection<Task> { | ||
| return project.tasks.matching { it.name == "compile${capitalizedVariantName}Kotlin" } | ||
| } | ||
|
|
||
| fun getJavaCompileTask( | ||
| project: Project, | ||
| capitalizedVariantName: String, | ||
| ): TaskCollection<Task> { | ||
| return project.tasks.matching { it.name == "compile${capitalizedVariantName}JavaWithJavac" } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Previously, we used to check for isMinifyEnabled. I'm wondering: aren't we missing handling of this case? If any consumer enables minify on the brownfield library module, will embedded libs/*.jar from dependencies be merged?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This check was not doing any work as the
jarFileswould always contain an empty list. Verified locally by enabling minification for brownfieldlib and we only need to adjust the proguard-rules and add consumer-rules to our packages like brownie, navigation and brownfield, which I will do in a follow-up PR.