diff options
author | danysantiago <danysantiago@google.com> | 2020-01-22 16:04:12 -0800 |
---|---|---|
committer | Daniel Santiago <danyboricua91@gmail.com> | 2020-01-28 14:52:35 -0800 |
commit | f45213ea279d8deb926377fb66de18f3ae5cbc97 (patch) | |
tree | 2cca2345d6e95d945a90c2c4349ddc2a4fc68a04 /util | |
parent | 7f636ca0329c6df2e8e7ac4ecdc776a483c0cdb8 (diff) | |
download | dagger2-f45213ea279d8deb926377fb66de18f3ae5cbc97.tar.gz |
Dagger AndroidX Migration
Update imports and dependencies to use AndroidX APIs.
For backwards compatibility, produce two new artifacts,
"dagger-android-legacy" and "dagger-android-support-legacy" that are
dejetified artifacts of the AndroidX versions.
Resolves #1652
Resolves #1619
Resolves #1489
Resolves #1444
Resolves #1313
Resolves #1271
Resolves #1248
Resolves #1264
Co-authored-by: Zac Sweers <zsweers@slack-corp.com>
RELNOTES=Migrate dagger-android to AndroidX.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=291051989
Diffstat (limited to 'util')
-rwxr-xr-x | util/execute-deploy.sh | 94 |
1 files changed, 60 insertions, 34 deletions
diff --git a/util/execute-deploy.sh b/util/execute-deploy.sh index d3a701935..1bf8c68c3 100755 --- a/util/execute-deploy.sh +++ b/util/execute-deploy.sh @@ -20,13 +20,20 @@ bazel_output_file() { echo -n $output_file } +# Builds and deploys the given artifacts to a configured maven goal. +# @param {string} library the library to deploy. +# @param {string} pomfile the pom file to deploy. +# @param {string} srcjar the sources jar of the library. This is an optional +# parameter, if provided then javadoc must also be provided. +# @param {string} javadoc the java doc jar of the library. This is an optional +# parameter, if provided then srcjar must also be provided. deploy_library() { + local arg_count=$# local library=$1 - local srcjar=$2 - local javadoc=$3 - local pomfile=$4 + local pomfile=$2 + bazel build --define=pom_version="$VERSION_NAME" \ - $library $srcjar $javadoc $pomfile + $library $pomfile # TODO(user): Consider moving this into the "gen_maven_artifact" macro, this # requires having the version checked-in for the build system. @@ -34,12 +41,23 @@ deploy_library() { $(bazel_output_file $library) \ $(bazel_output_file $pomfile) - mvn $MVN_GOAL \ - -Dfile=$(bazel_output_file $library) \ - -Djavadoc=$(bazel_output_file $javadoc) \ - -DpomFile=$(bazel_output_file $pomfile) \ - -Dsources=$(bazel_output_file $srcjar) \ - "${EXTRA_MAVEN_ARGS[@]:+${EXTRA_MAVEN_ARGS[@]}}" + if [ $arg_count == 4 ] ; then + local srcjar=$3 + local javadoc=$4 + bazel build --define=pom_version="$VERSION_NAME" \ + $srcjar $javadoc + mvn $MVN_GOAL \ + -Dfile=$(bazel_output_file $library) \ + -Djavadoc=$(bazel_output_file $javadoc) \ + -DpomFile=$(bazel_output_file $pomfile) \ + -Dsources=$(bazel_output_file $srcjar) \ + "${EXTRA_MAVEN_ARGS[@]:+${EXTRA_MAVEN_ARGS[@]}}" + else + mvn $MVN_GOAL \ + -Dfile=$(bazel_output_file $library) \ + -DpomFile=$(bazel_output_file $pomfile) \ + "${EXTRA_MAVEN_ARGS[@]:+${EXTRA_MAVEN_ARGS[@]}}" + fi } add_tracking_version() { @@ -73,74 +91,82 @@ find_pom_value() { deploy_library \ java/dagger/libcore.jar \ + java/dagger/pom.xml \ java/dagger/libcore-src.jar \ - java/dagger/core-javadoc.jar \ - java/dagger/pom.xml + java/dagger/core-javadoc.jar deploy_library \ gwt/libgwt.jar \ + gwt/pom.xml \ gwt/libgwt.jar \ - gwt/libgwt.jar \ - gwt/pom.xml + gwt/libgwt.jar deploy_library \ java/dagger/internal/codegen/artifact.jar \ + java/dagger/internal/codegen/pom.xml \ java/dagger/internal/codegen/artifact-src.jar \ - java/dagger/internal/codegen/artifact-javadoc.jar \ - java/dagger/internal/codegen/pom.xml + java/dagger/internal/codegen/artifact-javadoc.jar deploy_library \ java/dagger/producers/artifact.jar \ + java/dagger/producers/pom.xml \ java/dagger/producers/artifact-src.jar \ - java/dagger/producers/artifact-javadoc.jar \ - java/dagger/producers/pom.xml + java/dagger/producers/artifact-javadoc.jar deploy_library \ java/dagger/spi/artifact.jar \ + java/dagger/spi/pom.xml \ java/dagger/spi/artifact-src.jar \ - java/dagger/spi/artifact-javadoc.jar \ - java/dagger/spi/pom.xml + java/dagger/spi/artifact-javadoc.jar deploy_library \ java/dagger/android/android.aar \ + java/dagger/android/pom.xml \ java/dagger/android/libandroid-src.jar \ - java/dagger/android/android-javadoc.jar \ - java/dagger/android/pom.xml + java/dagger/android/android-javadoc.jar + +deploy_library \ + java/dagger/android/android-legacy.aar \ + java/dagger/android/legacy-pom.xml # b/37741866 and https://github.com/google/dagger/issues/715 deploy_library \ java/dagger/android/libandroid.jar \ + java/dagger/android/jarimpl-pom.xml \ java/dagger/android/libandroid-src.jar \ - java/dagger/android/android-javadoc.jar \ - java/dagger/android/jarimpl-pom.xml + java/dagger/android/android-javadoc.jar deploy_library \ java/dagger/android/support/support.aar \ + java/dagger/android/support/pom.xml \ java/dagger/android/support/libsupport-src.jar \ - java/dagger/android/support/support-javadoc.jar \ - java/dagger/android/support/pom.xml + java/dagger/android/support/support-javadoc.jar + +deploy_library \ + java/dagger/android/support/support-legacy.aar \ + java/dagger/android/support/legacy-pom.xml deploy_library \ shaded_android_processor.jar \ + java/dagger/android/processor/pom.xml \ java/dagger/android/processor/libprocessor-src.jar \ - java/dagger/android/processor/processor-javadoc.jar \ - java/dagger/android/processor/pom.xml + java/dagger/android/processor/processor-javadoc.jar deploy_library \ java/dagger/grpc/server/libserver.jar \ + java/dagger/grpc/server/server-pom.xml \ java/dagger/grpc/server/libserver-src.jar \ - java/dagger/grpc/server/javadoc.jar \ - java/dagger/grpc/server/server-pom.xml + java/dagger/grpc/server/javadoc.jar deploy_library \ java/dagger/grpc/server/libannotations.jar \ + java/dagger/grpc/server/annotations-pom.xml \ java/dagger/grpc/server/libannotations-src.jar \ - java/dagger/grpc/server/javadoc.jar \ - java/dagger/grpc/server/annotations-pom.xml + java/dagger/grpc/server/javadoc.jar deploy_library \ shaded_grpc_server_processor.jar \ + java/dagger/grpc/server/processor/pom.xml \ java/dagger/grpc/server/processor/libprocessor-src.jar \ - java/dagger/grpc/server/processor/javadoc.jar \ - java/dagger/grpc/server/processor/pom.xml + java/dagger/grpc/server/processor/javadoc.jar |