Skip to content

Commit

Permalink
Remove the references to beta in preparation for the upcoming stable …
Browse files Browse the repository at this point in the history
…release.

RELNOTES=n/a
PiperOrigin-RevId: 369963385
  • Loading branch information
Chang-Eric authored and Dagger Team committed Apr 22, 2021
1 parent 115eaac commit 73f6458
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 21 deletions.
3 changes: 0 additions & 3 deletions build_defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,3 @@ 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_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_BETA")
load("//:build_defs.bzl", "POM_VERSION")

# Description:
# A library that wraps the Dagger API to make DI usage and testing easier.
Expand Down Expand Up @@ -181,7 +181,7 @@ filegroup(

java_library(
name = "artifact-core-lib",
tags = ["maven_coordinates=com.google.dagger:hilt-core:" + POM_VERSION_BETA],
tags = ["maven_coordinates=com.google.dagger:hilt-core:" + POM_VERSION],
exports = [
":define_component",
":entry_point",
Expand All @@ -197,7 +197,7 @@ java_library(

gen_maven_artifact(
name = "artifact-core",
artifact_coordinates = "com.google.dagger:hilt-core:" + POM_VERSION_BETA,
artifact_coordinates = "com.google.dagger:hilt-core:" + POM_VERSION,
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_BETA")
load("//:build_defs.bzl", "POM_VERSION")
load("//tools:maven.bzl", "gen_maven_artifact")

package(default_visibility = ["//:src"])
Expand Down Expand Up @@ -151,7 +151,7 @@ java_library(

android_library(
name = "artifact-lib",
tags = ["maven_coordinates=com.google.dagger:hilt-android:" + POM_VERSION_BETA],
tags = ["maven_coordinates=com.google.dagger:hilt-android:" + POM_VERSION],
exports = [
":android_entry_point",
":early_entry_point",
Expand All @@ -166,7 +166,7 @@ android_library(

gen_maven_artifact(
name = "artifact",
artifact_coordinates = "com.google.dagger:hilt-android:" + POM_VERSION_BETA,
artifact_coordinates = "com.google.dagger:hilt-android:" + POM_VERSION,
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_BETA")
load("//:build_defs.bzl", "POM_VERSION")
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_BETA],
tags = ["maven_coordinates=com.google.dagger:hilt-android-compiler:" + POM_VERSION],
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_BETA,
artifact_coordinates = "com.google.dagger:hilt-android-compiler:" + POM_VERSION,
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_BETA")
load("//:build_defs.bzl", "POM_VERSION")
load("//tools:maven.bzl", "gen_maven_artifact")

package(default_visibility = ["//:src"])
Expand Down Expand Up @@ -174,7 +174,7 @@ java_library(
android_library(
name = "artifact-lib",
testonly = 1,
tags = ["maven_coordinates=com.google.dagger:hilt-android-testing:" + POM_VERSION_BETA],
tags = ["maven_coordinates=com.google.dagger:hilt-android-testing:" + POM_VERSION],
exports = [
":bind_value",
":custom_test_application",
Expand All @@ -189,7 +189,7 @@ android_library(
gen_maven_artifact(
name = "artifact",
testonly = 1,
artifact_coordinates = "com.google.dagger:hilt-android-testing:" + POM_VERSION_BETA,
artifact_coordinates = "com.google.dagger:hilt-android-testing:" + POM_VERSION,
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_BETA")
load("//:build_defs.bzl", "POM_VERSION")
load("//tools:maven.bzl", "gen_maven_artifact")

package(default_visibility = ["//:src"])
Expand Down Expand Up @@ -43,7 +43,7 @@ java_library(

java_library(
name = "artifact-lib",
tags = ["maven_coordinates=com.google.dagger:hilt-compiler:" + POM_VERSION_BETA],
tags = ["maven_coordinates=com.google.dagger:hilt-compiler:" + POM_VERSION],
visibility = ["//visibility:private"],
exports = [
":artifact-lib-shared",
Expand All @@ -52,7 +52,7 @@ java_library(

gen_maven_artifact(
name = "artifact",
artifact_coordinates = "com.google.dagger:hilt-compiler:" + POM_VERSION_BETA,
artifact_coordinates = "com.google.dagger:hilt-compiler:" + POM_VERSION,
artifact_name = "Hilt Processor",
artifact_target = ":artifact-lib",
artifact_target_libs = [
Expand Down
1 change: 0 additions & 1 deletion util/deploy-to-maven-central.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ 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/'#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 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_BETA")
load("//:build_defs.bzl", "POM_VERSION")

_DAGGER_VERSION = POM_VERSION
_HILT_VERSION = POM_VERSION_BETA
_HILT_VERSION = POM_VERSION

DAGGER_ARTIFACTS = [
"com.google.dagger:dagger:" + _DAGGER_VERSION,
Expand Down

0 comments on commit 73f6458

Please sign in to comment.