Skip to content
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

Merge android and library plugins #1519

Draft
wants to merge 25 commits into
base: main
Choose a base branch
from

Conversation

Jaehwa-Noh
Copy link
Contributor

What I have done and why
Some custom plugins in build-logic had duplicated parts.
For example, AndroidApplicationComposeConventionPlugin.kt differs from AndroidLibraryComposeConventionPlugin.kt in small ways, just extension from application or library.

So that I merged these files into one AndroidComposeConventionPlugin.kt, also Jacobo plugins had been merged.

Change-Id: I3950ff97d29726dc6786d7dade76c5f313df5fdb
Change-Id: Iefd17b525739afd74a5879d63efb4056a41226ad
Change-Id: I9d60c901a37aac23e528a8dcd50dc8b9546ca0ca
Change-Id: Ie044682a22a27a7f1ba3cee737041ad5aeb8d061
Change-Id: I0d3ef3274e576f110f17a31afd8db1d4fec4a772
Change-Id: I697c76e64752235f6b6b86f7e7749982845b6364
Change-Id: I00d681ebb75eaef5def0d77177f16c103619eed6
Change-Id: I27088b424beec76e3ddf37ef1c93481735ed7148
Change-Id: Ia2f5d65ef9ee8a928e31e014c27888cdb2282d79
Change-Id: Ic3358128fd7e71a6a98a757a2d649f90c5dc639a
Change-Id: Ib5f5d471c1c7464948deb13ec52bf4f31fc60d47
Change-Id: I78249a206d670941fc15346e4032e760dc8eacee
core/testing/build.gradle.kts Outdated Show resolved Hide resolved
core/ui/build.gradle.kts Outdated Show resolved Hide resolved
feature/bookmarks/build.gradle.kts Outdated Show resolved Hide resolved
feature/foryou/build.gradle.kts Outdated Show resolved Hide resolved
feature/search/build.gradle.kts Outdated Show resolved Hide resolved
feature/settings/build.gradle.kts Outdated Show resolved Hide resolved
feature/topic/build.gradle.kts Outdated Show resolved Hide resolved
Jaehwa-Noh and others added 13 commits July 3, 2024 08:47
…nPlugin.kt


Change TODO instruction.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
Remove empty space.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
Remove empty space.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
Remove empty space.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
Remove empty space.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
Remove empty space.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
Remove empty space.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
Remove empty space.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
…Plugin.kt


Change TODO instruction.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
Change-Id: Iff587e10d3f4a60615abe6cdf60528c2f8163825
Remove empty space.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
…library

Change-Id: I61961ab997a825bfd236ae8a0f7778aba2b32cd4

# Conflicts:
#	core/testing/build.gradle.kts
Change-Id: I8c0b35434adf87a776f28a3fc83ecac9f65db998
seve-andre added a commit to seve-andre/jetpack-compose-template that referenced this pull request Sep 16, 2024
@keyboardsurfer
Copy link
Member

This PR looks good to me. Please resolve the merge conflicts so we can do a final pass before merging.

@Jaehwa-Noh Jaehwa-Noh marked this pull request as draft December 20, 2024 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants