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

Add a sub-project for the common sources. #1155

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from

Commits on Oct 26, 2023

  1. Add a sub-project for the common sources.

    Puts the common sources in an explicit Gradle sub-project rather
    than just referring to them from multiple sourceSets.
    
    Pro: Project now loads cleanly in Studio with no duplicate source
    root warnings and Studio can follow cross-refs between all
    sub-projects.
    
    Pro: Also tidied up the dependencies to the constants build.
    Hopefully we can now tidy that build up further.
    
    Con: Had to add a whole new set of stubs (platform-stub) for
    Platform.java due to circular dependency... All of the code in
    common/ expects to be compiled against the current platform's
    Platform.java but all of the Platform.java's also expect to be
    compiled against the common code.
    
    Pro: Adding platform-stub allows us to remove the platformJar
    stuff from the OpenJDK build. Turns out this was just a hack to
    allow android-platform to build on OpenJDK so compiling against a
    stub is cleaner.
    
    Con: the common build's processTestResources task seems to try
    and copy all the resources twice causing an error.  Added a hacky
    workaround for now.
    
    Major con: The AARs built by the Android build do not contain
    classes from the common sources. I've tried multiple ways of
    expressing the dependency and got nowhere so advice would be
    appreciated.
    prbprbprb committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    eed81ae View commit details
    Browse the repository at this point in the history
  2. Lint fixes

    prbprbprb committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    ffd0d0c View commit details
    Browse the repository at this point in the history
  3. Fix javadoc sources.

    Still various Javadoc issues remain but they existed before this PR.
    prbprbprb committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    1546bd0 View commit details
    Browse the repository at this point in the history
  4. Fix sourcesJar generation.

    prbprbprb committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    b01d229 View commit details
    Browse the repository at this point in the history
  5. Remove extraneous cmake version.

    When specified in a defaultConfig block it ends
    up setting the module version too.....
    prbprbprb committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    c9e1039 View commit details
    Browse the repository at this point in the history
  6. Dependency fix.

    prbprbprb committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    fd35a0e View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. Configuration menu
    Copy the full SHA
    16ce8d2 View commit details
    Browse the repository at this point in the history
  2. Fix Android publishing.

    Was using a no-longer-needed 3P plugin which doesn't
    work correctly with the latest AGP.  Now is at least
    publishing an AAR even though it doesn't contain
    the common classes.
    prbprbprb committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    de6a78d View commit details
    Browse the repository at this point in the history
  3. Publish all classes for Android builds.

    1. Remove the implementation dependency from :conscrypt-android
    to :conscrypt-common as that ends up exposing conscrypt-common
    as a dependency in the POM file.
    
    2. Just copy the actual class files from the :conscrypt-common
    output into the :conscrypt-android build directory before the
    AAR is built.
    prbprbprb committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    c9ed33e View commit details
    Browse the repository at this point in the history