From 2785dbe1e519164686bb93a83ab265e33b21b5c1 Mon Sep 17 00:00:00 2001 From: Advay Mengle Date: Sat, 26 Sep 2015 16:30:00 -0700 Subject: [PATCH] Adds squareup.otto, which fails on Android deps Issue #6 --- .travis.yml | 8 ++++-- libraryBuilds/run-all.sh | 3 ++- libraryBuilds/squareup-otto/build.gradle | 1 + libraryBuilds/squareup-otto/gradlew | 1 + libraryBuilds/squareup-otto/local.properties | 1 + libraryBuilds/squareup-otto/settings.gradle | 1 + .../squareup-otto/squareup-otto/build.gradle | 27 +++++++++++++++++++ 7 files changed, 39 insertions(+), 3 deletions(-) create mode 120000 libraryBuilds/squareup-otto/build.gradle create mode 120000 libraryBuilds/squareup-otto/gradlew create mode 120000 libraryBuilds/squareup-otto/local.properties create mode 100644 libraryBuilds/squareup-otto/settings.gradle create mode 100644 libraryBuilds/squareup-otto/squareup-otto/build.gradle diff --git a/.travis.yml b/.travis.yml index 4d44abf..0cbf54d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,13 @@ os: osx env: - TEST_DIR=gson - TEST_DIR=joda-primitives - - TEST_DIR=joda-convert - - TEST_DIR=joda-time - TEST_DIR=apache-commons-lang3 - TEST_DIR=apache-commons-collections4 + # Put expected failures at the end. + - TEST_DIR=joda-convert + - TEST_DIR=joda-time - TEST_DIR=apache-commons-math3 + - TEST_DIR=squareup-otto matrix: allow_failures: @@ -22,6 +24,8 @@ matrix: - env: TEST_DIR=joda-time # Requires geometry support from java.awt and also java.net. - env: TEST_DIR=apache-commons-math3 + # Requires android.os.Looper + - env: TEST_DIR=squareup-otto branches: only: diff --git a/libraryBuilds/run-all.sh b/libraryBuilds/run-all.sh index 43ac888..f1795e1 100755 --- a/libraryBuilds/run-all.sh +++ b/libraryBuilds/run-all.sh @@ -21,8 +21,9 @@ set -ev ./run-test.sh joda-primitives ./run-test.sh apache-commons-lang3 ./run-test.sh apache-commons-collections4 -./run-test.sh apache-commons-math3 +./run-test.sh squareup-otto # May fail. ./run-test.sh joda-convert ./run-test.sh joda-time +./run-test.sh apache-commons-math3 diff --git a/libraryBuilds/squareup-otto/build.gradle b/libraryBuilds/squareup-otto/build.gradle new file mode 120000 index 0000000..64ec370 --- /dev/null +++ b/libraryBuilds/squareup-otto/build.gradle @@ -0,0 +1 @@ +../common/build.gradle \ No newline at end of file diff --git a/libraryBuilds/squareup-otto/gradlew b/libraryBuilds/squareup-otto/gradlew new file mode 120000 index 0000000..bde144b --- /dev/null +++ b/libraryBuilds/squareup-otto/gradlew @@ -0,0 +1 @@ +../../j2objc-gradle/gradlew \ No newline at end of file diff --git a/libraryBuilds/squareup-otto/local.properties b/libraryBuilds/squareup-otto/local.properties new file mode 120000 index 0000000..217624b --- /dev/null +++ b/libraryBuilds/squareup-otto/local.properties @@ -0,0 +1 @@ +../common/local.properties \ No newline at end of file diff --git a/libraryBuilds/squareup-otto/settings.gradle b/libraryBuilds/squareup-otto/settings.gradle new file mode 100644 index 0000000..43500cf --- /dev/null +++ b/libraryBuilds/squareup-otto/settings.gradle @@ -0,0 +1 @@ +include ':squareup-otto' diff --git a/libraryBuilds/squareup-otto/squareup-otto/build.gradle b/libraryBuilds/squareup-otto/squareup-otto/build.gradle new file mode 100644 index 0000000..064b67d --- /dev/null +++ b/libraryBuilds/squareup-otto/squareup-otto/build.gradle @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2015 the authors of j2objc-common-libs-e2e-test + * + * 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. + */ + +dependencies { + j2objcTranslation 'com.squareup:otto:1.3.8:sources' +} + +j2objcConfig { + filenameCollisionCheck false + + // Almost always there are no tests provided in an external source jar. + testMinExpectedTests 0 + finalConfigure() +}