Merge branch 'stable-2.14'
* stable-2.14:
Update bazlets to latest stable-2.14 to use 2.14.1-SNAPSHOT API
Remove remnants of buck build
Change-Id: Iec17c3de94d58d7310e8c0bd3adbae14fe40a7a3
diff --git a/.gitignore b/.gitignore
index 3245346..caafe06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,14 +2,8 @@
/.classpath
/.project
/.settings
-/.buckconfig.local
-/.buckd
-/buck-cache
-/buck-out
/local.properties
*.pyc
-.buckversion
-/bucklets
/bazel-bin
/bazel-genfiles
/bazel-out
diff --git a/WORKSPACE b/WORKSPACE
index 4656ffb..30cab56 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,30 +3,30 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "8e0bb37977452a66141833370430f307e959acfb",
+ commit = "74b31c8fae3a92c6c3e46a046b57cf1d8a6549d4",
# local_path = "/home/<user>/projects/bazlets",
)
# Release Plugin API
-load(
- "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
- "gerrit_api",
-)
+#load(
+# "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+# "gerrit_api",
+#)
# Snapshot Plugin API
-#load(
-# "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-# "gerrit_api_maven_local",
-#)
+load(
+ "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+ "gerrit_api_maven_local",
+)
load(
"@com_googlesource_gerrit_bazlets//:gerrit_gwt.bzl",
"gerrit_gwt",
)
# Load release Plugin API
-gerrit_api()
+#gerrit_api()
# Load snapshot Plugin API
-# gerrit_api_maven_local()
+gerrit_api_maven_local()
gerrit_gwt()
diff --git a/tools/buck.defs b/tools/buck.defs
deleted file mode 100644
index 41eeeca..0000000
--- a/tools/buck.defs
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright (C) 2014 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-include_defs('//lib/build.defs')
-
-original_java_library = java_library
-def java_library(
- name,
- srcs=[],
- resources=[],
- source='7',
- target='7',
- proguard_config=None,
- deps=[],
- exported_deps=[],
- visibility=[],
- ):
- original_java_library(
- name=name,
- srcs=srcs,
- resources=resources,
- source=source,
- target=target,
- proguard_config=proguard_config,
- deps=deps,
- exported_deps=exported_deps,
- visibility=visibility,
- )
-
-original_java_test = java_test
-def java_test(
- name,
- srcs=[],
- labels=[],
- resources=[],
- source='7',
- target='7',
- vm_args=[],
- source_under_test=[],
- contacts=[],
- deps=[],
- visibility=[],
- ):
- original_java_test(
- name=name,
- srcs=srcs,
- labels=labels,
- resources=resources,
- source=source,
- target=target,
- vm_args=vm_args,
- source_under_test=source_under_test,
- contacts=contacts,
- deps=deps,
- visibility=visibility,
- )