Skip to content

Commit

Permalink
Update all "alpha" references to "beta" in preparation for the upcomi…
Browse files Browse the repository at this point in the history
…ng beta release.

RELNOTES=N/A
PiperOrigin-RevId: 359575497
  • Loading branch information
bcorso authored and Dagger Team committed Feb 25, 2021
1 parent ceccfc6 commit 78438d5
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion build_defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions java/dagger/hilt/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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",
Expand All @@ -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 = [
Expand Down
6 changes: 3 additions & 3 deletions java/dagger/hilt/android/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down Expand Up @@ -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",
Expand All @@ -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 = [
Expand Down
6 changes: 3 additions & 3 deletions java/dagger/hilt/android/processor/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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 = [
Expand Down
6 changes: 3 additions & 3 deletions java/dagger/hilt/android/testing/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down Expand Up @@ -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",
Expand All @@ -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 = [
Expand Down
6 changes: 3 additions & 3 deletions java/dagger/hilt/processor/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand All @@ -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",
Expand All @@ -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 = [
Expand Down
8 changes: 4 additions & 4 deletions util/deploy-to-maven-central.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions workspace_defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 78438d5

Please sign in to comment.