diff options
-rw-r--r-- | integration/Android.mk | 33 | ||||
-rw-r--r-- | integration/LICENSE.txt | 27 | ||||
-rw-r--r-- | integration/README.android | 1 | ||||
-rw-r--r-- | integration/build.gradle | 13 | ||||
-rw-r--r-- | src/org/hamcrest/MatcherAssert.java (renamed from integration/src/org/hamcrest/MatcherAssert.java) | 0 | ||||
-rw-r--r-- | src/org/hamcrest/TypeSafeMatcher.java (renamed from library/src/org/hamcrest/TypeSafeMatcher.java) | 0 |
6 files changed, 0 insertions, 74 deletions
diff --git a/integration/Android.mk b/integration/Android.mk deleted file mode 100644 index 8126b30..0000000 --- a/integration/Android.mk +++ /dev/null @@ -1,33 +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. -# -# - -LOCAL_PATH := $(call my-dir) - -# TODO: add host and hostdex jars - -#------------------------------- -# build a target jar - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_MODULE := hamcrest-integration -LOCAL_JAVA_LIBRARIES := hamcrest -LOCAL_SDK_VERSION := 4 -LOCAL_MODULE_TAGS := optional - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/integration/LICENSE.txt b/integration/LICENSE.txt deleted file mode 100644 index 5ebe92c..0000000 --- a/integration/LICENSE.txt +++ /dev/null @@ -1,27 +0,0 @@ -BSD License
-
-Copyright (c) 2000-2006, www.hamcrest.org
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions and the following disclaimer. Redistributions in binary form must reproduce
-the above copyright notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the distribution.
-
-Neither the name of Hamcrest nor the names of its contributors may be used to endorse
-or promote products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
diff --git a/integration/README.android b/integration/README.android deleted file mode 100644 index a86659e..0000000 --- a/integration/README.android +++ /dev/null @@ -1 +0,0 @@ -Source obtained from https://hamcrest.googlecode.com/files/hamcrest-integration-1.1.jar, with the easymock and jmock dependent classes removed diff --git a/integration/build.gradle b/integration/build.gradle deleted file mode 100644 index 54ab15f..0000000 --- a/integration/build.gradle +++ /dev/null @@ -1,13 +0,0 @@ -apply plugin: 'java' - -sourceSets { - main { - java { - srcDirs = ['src'] - } - } -} - -dependencies { - compile project(':hamcrest') -} diff --git a/integration/src/org/hamcrest/MatcherAssert.java b/src/org/hamcrest/MatcherAssert.java index 3eb234a..3eb234a 100644 --- a/integration/src/org/hamcrest/MatcherAssert.java +++ b/src/org/hamcrest/MatcherAssert.java diff --git a/library/src/org/hamcrest/TypeSafeMatcher.java b/src/org/hamcrest/TypeSafeMatcher.java index 7f18fd3..7f18fd3 100644 --- a/library/src/org/hamcrest/TypeSafeMatcher.java +++ b/src/org/hamcrest/TypeSafeMatcher.java |