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.

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

Jump to bottom

Merge android and library plugins #1519

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

Merge android and library plugins #1519

wants to merge 25 commits into from
+133 −198

Commits on Jun 29, 2024

  1. Remove old Application and Library compose plugins. 

    Change-Id: I3950ff97d29726dc6786d7dade76c5f313df5fdb
    @Jaehwa-Noh
    Jaehwa-Noh committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    dcf8122 View commit details
    Browse the repository at this point in the history

  2. Create new AndroidComposeConventionPlugin. 

    Change-Id: Iefd17b525739afd74a5879d63efb4056a41226ad
    @Jaehwa-Noh
    Jaehwa-Noh committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    12f4bcb View commit details
    Browse the repository at this point in the history

  3. Merge two android and library compose plugins. 

    Change-Id: I9d60c901a37aac23e528a8dcd50dc8b9546ca0ca
    @Jaehwa-Noh
    Jaehwa-Noh committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    b45f714 View commit details
    Browse the repository at this point in the history

  4. Add org.jetbrains.kotlin.plugin.compose plugin. 

    Change-Id: Ie044682a22a27a7f1ba3cee737041ad5aeb8d061
    @Jaehwa-Noh
    Jaehwa-Noh committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    37bef79 View commit details
    Browse the repository at this point in the history

  5. Replace to merged plugin nowinandroid.android.compose. 

    Change-Id: I0d3ef3274e576f110f17a31afd8db1d4fec4a772
    @Jaehwa-Noh
    Jaehwa-Noh committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    126a63c View commit details
    Browse the repository at this point in the history

  6. Replace apply to pluginManager.apply. 

    Change-Id: I697c76e64752235f6b6b86f7e7749982845b6364
    @Jaehwa-Noh
    Jaehwa-Noh committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    48056b7 View commit details
    Browse the repository at this point in the history

  7. Change instruction TODO text. 

    Change-Id: I00d681ebb75eaef5def0d77177f16c103619eed6
    @Jaehwa-Noh
    Jaehwa-Noh committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    aa2750c View commit details
    Browse the repository at this point in the history

  8. Remove old Jacoco plugins. 

    Change-Id: I27088b424beec76e3ddf37ef1c93481735ed7148
    @Jaehwa-Noh
    Jaehwa-Noh committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    c801932 View commit details
    Browse the repository at this point in the history

  9. Merge application and library jacoco plugins. 

    Change-Id: Ia2f5d65ef9ee8a928e31e014c27888cdb2282d79
    @Jaehwa-Noh
    Jaehwa-Noh committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    20f0ad5 View commit details
    Browse the repository at this point in the history

  10. Merge application and library jacoco plugins. 

    Change-Id: Ic3358128fd7e71a6a98a757a2d649f90c5dc639a
    @Jaehwa-Noh
    Jaehwa-Noh committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    d147de3 View commit details
    Browse the repository at this point in the history

  11. Replace library and application jacoco to merged jacoco plugins. 

    Change-Id: Ib5f5d471c1c7464948deb13ec52bf4f31fc60d47
    @Jaehwa-Noh
    Jaehwa-Noh committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    4260c93 View commit details
    Browse the repository at this point in the history

  12. Add explicit extension type. 

    Change-Id: I78249a206d670941fc15346e4032e760dc8eacee
    @Jaehwa-Noh
    Jaehwa-Noh committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    8f64823 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Update build-logic/convention/src/main/kotlin/AndroidComposeConventio… 

    …nPlugin.kt


Change TODO instruction.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
    @Jaehwa-Noh @dturner
    Jaehwa-Noh and dturner committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    eeac016 View commit details
    Browse the repository at this point in the history

  2. Update core/testing/build.gradle.kts 

    Remove empty space.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
    @Jaehwa-Noh @dturner
    Jaehwa-Noh and dturner committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    6687ec6 View commit details
    Browse the repository at this point in the history

  3. Update core/ui/build.gradle.kts 

    Remove empty space.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
    @Jaehwa-Noh @dturner
    Jaehwa-Noh and dturner committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    40623e0 View commit details
    Browse the repository at this point in the history

  4. Update feature/bookmarks/build.gradle.kts 

    Remove empty space.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
    @Jaehwa-Noh @dturner
    Jaehwa-Noh and dturner committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    20e8322 View commit details
    Browse the repository at this point in the history

  5. Update feature/foryou/build.gradle.kts 

    Remove empty space.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
    @Jaehwa-Noh @dturner
    Jaehwa-Noh and dturner committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    aeb9b47 View commit details
    Browse the repository at this point in the history

  6. Update feature/search/build.gradle.kts 

    Remove empty space.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
    @Jaehwa-Noh @dturner
    Jaehwa-Noh and dturner committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    f4543c4 View commit details
    Browse the repository at this point in the history

  7. Update feature/settings/build.gradle.kts 

    Remove empty space.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
    @Jaehwa-Noh @dturner
    Jaehwa-Noh and dturner committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    bf9c90e View commit details
    Browse the repository at this point in the history

  8. Update feature/topic/build.gradle.kts 

    Remove empty space.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
    @Jaehwa-Noh @dturner
    Jaehwa-Noh and dturner committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    6fa8f0d View commit details
    Browse the repository at this point in the history

  9. Update build-logic/convention/src/main/kotlin/AndroidJacocoConvention… 

    …Plugin.kt


Change TODO instruction.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
    @Jaehwa-Noh @dturner
    Jaehwa-Noh and dturner committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    362b000 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. Refactor when block and remove side effect. 

    Change-Id: Iff587e10d3f4a60615abe6cdf60528c2f8163825
    @Jaehwa-Noh
    Jaehwa-Noh committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    2d06641 View commit details
    Browse the repository at this point in the history

  2. Update feature/interests/build.gradle.kts 

    Remove empty space.

Co-authored-by: Don Turner <dturner@users.noreply.github.com>
    @Jaehwa-Noh @dturner
    Jaehwa-Noh and dturner committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    1858bc3 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. Merge branch 'refs/heads/android-remote-main' into merge-android-and-… 

    …library

Change-Id: I61961ab997a825bfd236ae8a0f7778aba2b32cd4

# Conflicts:
#	core/testing/build.gradle.kts
    @Jaehwa-Noh
    Jaehwa-Noh committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    39991d2 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Refector when blocks 

    Change-Id: I8c0b35434adf87a776f28a3fc83ecac9f65db998
    @dturner
    dturner committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    b2d3131 View commit details
    Browse the repository at this point in the history