From 78438d562499115cc7b722c7505a4e08a953fa1d Mon Sep 17 00:00:00 2001 From: Brad Corso Date: Thu, 25 Feb 2021 11:43:30 -0800 Subject: [PATCH] Update all "alpha" references to "beta" in preparation for the upcoming beta release. RELNOTES=N/A PiperOrigin-RevId: 359575497 --- build_defs.bzl | 2 +- java/dagger/hilt/BUILD | 6 +++--- java/dagger/hilt/android/BUILD | 6 +++--- java/dagger/hilt/android/processor/BUILD | 6 +++--- java/dagger/hilt/android/testing/BUILD | 6 +++--- java/dagger/hilt/processor/BUILD | 6 +++--- util/deploy-to-maven-central.sh | 8 ++++---- workspace_defs.bzl | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/build_defs.bzl b/build_defs.bzl index 01a480ea805..686f164b400 100644 --- a/build_defs.bzl +++ b/build_defs.bzl @@ -28,4 +28,4 @@ SOURCE_7_TARGET_7 = [ POM_VERSION = "${project.version}" # DO NOT remove the comment on the next line. It's used in deploy-to-maven-central.sh -POM_VERSION_ALPHA = POM_VERSION #ALPHA_POSTFIX +POM_VERSION_BETA = POM_VERSION #BETA_POSTFIX diff --git a/java/dagger/hilt/BUILD b/java/dagger/hilt/BUILD index 47f8cfbf4fc..ffc18323f3a 100644 --- a/java/dagger/hilt/BUILD +++ b/java/dagger/hilt/BUILD @@ -13,7 +13,7 @@ # limitations under the License. load("//tools:maven.bzl", "gen_maven_artifact") -load("//:build_defs.bzl", "POM_VERSION_ALPHA") +load("//:build_defs.bzl", "POM_VERSION_BETA") # Description: # A library that wraps the Dagger API to make DI usage and testing easier. @@ -180,7 +180,7 @@ filegroup( java_library( name = "artifact-core-lib", - tags = ["maven_coordinates=com.google.dagger:hilt-core:" + POM_VERSION_ALPHA], + tags = ["maven_coordinates=com.google.dagger:hilt-core:" + POM_VERSION_BETA], exports = [ ":define_component", ":entry_point", @@ -196,7 +196,7 @@ java_library( gen_maven_artifact( name = "artifact-core", - artifact_coordinates = "com.google.dagger:hilt-core:" + POM_VERSION_ALPHA, + artifact_coordinates = "com.google.dagger:hilt-core:" + POM_VERSION_BETA, artifact_name = "Hilt Core", artifact_target = ":artifact-core-lib", artifact_target_libs = [ diff --git a/java/dagger/hilt/android/BUILD b/java/dagger/hilt/android/BUILD index 093f5ee4637..5e82837e906 100644 --- a/java/dagger/hilt/android/BUILD +++ b/java/dagger/hilt/android/BUILD @@ -14,7 +14,7 @@ # Description: # A library based on Hilt that provides standard components and automated injection for Android. -load("//:build_defs.bzl", "POM_VERSION_ALPHA") +load("//:build_defs.bzl", "POM_VERSION_BETA") load("//tools:maven.bzl", "gen_maven_artifact") package(default_visibility = ["//:src"]) @@ -144,7 +144,7 @@ java_library( android_library( name = "artifact-lib", - tags = ["maven_coordinates=com.google.dagger:hilt-android:" + POM_VERSION_ALPHA], + tags = ["maven_coordinates=com.google.dagger:hilt-android:" + POM_VERSION_BETA], exports = [ ":android_entry_point", ":early_test_entry_point", @@ -159,7 +159,7 @@ android_library( gen_maven_artifact( name = "artifact", - artifact_coordinates = "com.google.dagger:hilt-android:" + POM_VERSION_ALPHA, + artifact_coordinates = "com.google.dagger:hilt-android:" + POM_VERSION_BETA, artifact_name = "Hilt Android", artifact_target = ":artifact-lib", artifact_target_libs = [ diff --git a/java/dagger/hilt/android/processor/BUILD b/java/dagger/hilt/android/processor/BUILD index e116c4443cb..a9d66387464 100644 --- a/java/dagger/hilt/android/processor/BUILD +++ b/java/dagger/hilt/android/processor/BUILD @@ -15,14 +15,14 @@ # Description: # Hilt android processors. -load("//:build_defs.bzl", "POM_VERSION_ALPHA") +load("//:build_defs.bzl", "POM_VERSION_BETA") load("//tools:maven.bzl", "gen_maven_artifact") package(default_visibility = ["//:src"]) java_library( name = "artifact-lib", - tags = ["maven_coordinates=com.google.dagger:hilt-android-compiler:" + POM_VERSION_ALPHA], + tags = ["maven_coordinates=com.google.dagger:hilt-android-compiler:" + POM_VERSION_BETA], visibility = ["//visibility:private"], exports = [ "//java/dagger/hilt/processor:artifact-lib-shared", @@ -31,7 +31,7 @@ java_library( gen_maven_artifact( name = "artifact", - artifact_coordinates = "com.google.dagger:hilt-android-compiler:" + POM_VERSION_ALPHA, + artifact_coordinates = "com.google.dagger:hilt-android-compiler:" + POM_VERSION_BETA, artifact_name = "Hilt Android Processor", artifact_target = ":artifact-lib", artifact_target_libs = [ diff --git a/java/dagger/hilt/android/testing/BUILD b/java/dagger/hilt/android/testing/BUILD index 09dc945c5ba..d63cd3aba9b 100644 --- a/java/dagger/hilt/android/testing/BUILD +++ b/java/dagger/hilt/android/testing/BUILD @@ -14,7 +14,7 @@ # Description: # Testing libraries for Hilt Android. -load("//:build_defs.bzl", "POM_VERSION_ALPHA") +load("//:build_defs.bzl", "POM_VERSION_BETA") load("//tools:maven.bzl", "gen_maven_artifact") package(default_visibility = ["//:src"]) @@ -171,7 +171,7 @@ java_library( android_library( name = "artifact-lib", testonly = 1, - tags = ["maven_coordinates=com.google.dagger:hilt-android-testing:" + POM_VERSION_ALPHA], + tags = ["maven_coordinates=com.google.dagger:hilt-android-testing:" + POM_VERSION_BETA], exports = [ ":bind_value", ":custom_test_application", @@ -186,7 +186,7 @@ android_library( gen_maven_artifact( name = "artifact", testonly = 1, - artifact_coordinates = "com.google.dagger:hilt-android-testing:" + POM_VERSION_ALPHA, + artifact_coordinates = "com.google.dagger:hilt-android-testing:" + POM_VERSION_BETA, artifact_name = "Hilt Android Testing", artifact_target = ":artifact-lib", artifact_target_libs = [ diff --git a/java/dagger/hilt/processor/BUILD b/java/dagger/hilt/processor/BUILD index 87adcf34f65..77cbf2fc59c 100644 --- a/java/dagger/hilt/processor/BUILD +++ b/java/dagger/hilt/processor/BUILD @@ -15,7 +15,7 @@ # Description: # Hilt android processors. -load("//:build_defs.bzl", "POM_VERSION_ALPHA") +load("//:build_defs.bzl", "POM_VERSION_BETA") load("//tools:maven.bzl", "gen_maven_artifact") package(default_visibility = ["//:src"]) @@ -42,7 +42,7 @@ java_library( java_library( name = "artifact-lib", - tags = ["maven_coordinates=com.google.dagger:hilt-compiler:" + POM_VERSION_ALPHA], + tags = ["maven_coordinates=com.google.dagger:hilt-compiler:" + POM_VERSION_BETA], visibility = ["//visibility:private"], exports = [ ":artifact-lib-shared", @@ -51,7 +51,7 @@ java_library( gen_maven_artifact( name = "artifact", - artifact_coordinates = "com.google.dagger:hilt-compiler:" + POM_VERSION_ALPHA, + artifact_coordinates = "com.google.dagger:hilt-compiler:" + POM_VERSION_BETA, artifact_name = "Hilt Processor", artifact_target = ":artifact-lib", artifact_target_libs = [ diff --git a/util/deploy-to-maven-central.sh b/util/deploy-to-maven-central.sh index de2b49c48fa..2c8e12f8a74 100755 --- a/util/deploy-to-maven-central.sh +++ b/util/deploy-to-maven-central.sh @@ -24,17 +24,17 @@ bash $(dirname $0)/run-local-tests.sh # Note: we detach from head before making any sed changes to avoid commiting # a particular version to master. This sed change used to be done at the very -# end of the script, but with the introduction of "-alpha" to the Hilt +# end of the script, but with the introduction of "-beta" to the Hilt # artifacts, we need to do the sed replacement before deploying the artifacts to # maven. Note, that this sed replacement is only done for versioned releases. # HEAD-SNAPSHOT and LOCAL_SNAPSHOT versions of Hilt artifacts do not contain -# "-alpha". +# "-beta". git checkout --detach # Set the version string that is used as a tag in all of our libraries. If # another repo depends on a versioned tag of Dagger, their java_library.tags # should match the versioned release. -sed -i s/'#ALPHA_POSTFIX'/'+ "-alpha"'/g build_defs.bzl +sed -i s/'#BETA_POSTFIX'/'+ "-beta"'/g build_defs.bzl sed -i s/'${project.version}'/"${VERSION_NAME}"/g build_defs.bzl bash $(dirname $0)/deploy-dagger.sh \ @@ -46,7 +46,7 @@ bash $(dirname $0)/deploy-dagger.sh \ bash $(dirname $0)/deploy-hilt.sh \ "gpg:sign-and-deploy-file" \ - "${VERSION_NAME}-alpha" \ + "${VERSION_NAME}-beta" \ "-DrepositoryId=sonatype-nexus-staging" \ "-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/" \ "-Dgpg.keyname=${KEY}" diff --git a/workspace_defs.bzl b/workspace_defs.bzl index c017b76f9be..2143fbe512e 100644 --- a/workspace_defs.bzl +++ b/workspace_defs.bzl @@ -14,10 +14,10 @@ """A macro to configure Dagger deps within a workspace""" -load("//:build_defs.bzl", "POM_VERSION", "POM_VERSION_ALPHA") +load("//:build_defs.bzl", "POM_VERSION", "POM_VERSION_BETA") _DAGGER_VERSION = POM_VERSION -_HILT_VERSION = POM_VERSION_ALPHA +_HILT_VERSION = POM_VERSION_BETA DAGGER_ARTIFACTS = [ "com.google.dagger:dagger:" + _DAGGER_VERSION,