aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Chang <erichang@google.com>2021-04-22 15:26:12 -0700
committerDagger Team <dagger-dev+copybara@google.com>2021-04-22 15:29:09 -0700
commit73f6458df16d083eec61095e5277bfe803c25261 (patch)
treed91fb0beaa791313453b3005ae8e9eba7284cfac
parent115eaac88bf53c81dd9600041968074ac8db0e52 (diff)
downloaddagger2-73f6458df16d083eec61095e5277bfe803c25261.tar.gz
Remove the references to beta in preparation for the upcoming stable release.
RELNOTES=n/a PiperOrigin-RevId: 369963385
-rw-r--r--build_defs.bzl3
-rw-r--r--java/dagger/hilt/BUILD6
-rw-r--r--java/dagger/hilt/android/BUILD6
-rw-r--r--java/dagger/hilt/android/processor/BUILD6
-rw-r--r--java/dagger/hilt/android/testing/BUILD6
-rw-r--r--java/dagger/hilt/processor/BUILD6
-rwxr-xr-xutil/deploy-to-maven-central.sh1
-rw-r--r--workspace_defs.bzl4
8 files changed, 17 insertions, 21 deletions
diff --git a/build_defs.bzl b/build_defs.bzl
index 686f164b4..915f0a056 100644
--- a/build_defs.bzl
+++ b/build_defs.bzl
@@ -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
diff --git a/java/dagger/hilt/BUILD b/java/dagger/hilt/BUILD
index 0286c45e4..3d12c91e7 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_BETA")
+load("//:build_defs.bzl", "POM_VERSION")
# Description:
# A library that wraps the Dagger API to make DI usage and testing easier.
@@ -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",
@@ -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 = [
diff --git a/java/dagger/hilt/android/BUILD b/java/dagger/hilt/android/BUILD
index 8d455a174..d8833e77c 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_BETA")
+load("//:build_defs.bzl", "POM_VERSION")
load("//tools:maven.bzl", "gen_maven_artifact")
package(default_visibility = ["//:src"])
@@ -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",
@@ -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 = [
diff --git a/java/dagger/hilt/android/processor/BUILD b/java/dagger/hilt/android/processor/BUILD
index e09222f08..ccf21033d 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_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",
@@ -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 = [
diff --git a/java/dagger/hilt/android/testing/BUILD b/java/dagger/hilt/android/testing/BUILD
index f269d3c77..93d4ceb94 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_BETA")
+load("//:build_defs.bzl", "POM_VERSION")
load("//tools:maven.bzl", "gen_maven_artifact")
package(default_visibility = ["//:src"])
@@ -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",
@@ -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 = [
diff --git a/java/dagger/hilt/processor/BUILD b/java/dagger/hilt/processor/BUILD
index 6bd65a85b..1f75d0a34 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_BETA")
+load("//:build_defs.bzl", "POM_VERSION")
load("//tools:maven.bzl", "gen_maven_artifact")
package(default_visibility = ["//:src"])
@@ -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",
@@ -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 = [
diff --git a/util/deploy-to-maven-central.sh b/util/deploy-to-maven-central.sh
index 2c8e12f8a..3633f0b8d 100755
--- a/util/deploy-to-maven-central.sh
+++ b/util/deploy-to-maven-central.sh
@@ -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 \
diff --git a/workspace_defs.bzl b/workspace_defs.bzl
index 2143fbe51..2a63e433f 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_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,