Skip to content

Commit 8144a8e

Browse files
committed
Merge pull request #41 from madvay/joda-18
Update joda-convert to 1.8
2 parents 54e91bf + 950bc86 commit 8144a8e

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

.travis.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ env:
1212
- TEST_DIR=org.joda-joda-primitives
1313
- TEST_DIR=org.apache.commons-commons-lang3
1414

15-
matrix:
16-
allow_failures:
17-
# Blocked on https://github.com/JodaOrg/joda-convert/issues/7
18-
- env: TEST_DIR=org.joda-joda-convert
19-
# Blocked on https://github.com/JodaOrg/joda-convert/issues/7
20-
- env: TEST_DIR=joda-time-joda-time
15+
# Uncomment to add a library that should fail to build, along with documentation on why.
16+
# matrix:
17+
# allow_failures:
18+
# # Blocked on (github issue url)
19+
# - env: TEST_DIR=com.example-library
2120

2221
branches:
2322
only:

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ This is a subproject of [j2objc-gradle](https://github.com/j2objc-gradle)
66
and [maintained by some of the same people](NOTICE). Like j2objc-gradle, this project is not affiliated
77
with Google.
88

9+
The build status of various libraries can be found
10+
[here](https://travis-ci.org/j2objc-contrib/j2objc-common-libs-e2e-test).
11+
Each library is configured in [libraryBuilds](libraryBuilds).
12+
913
[![Build Status](https://travis-ci.org/j2objc-contrib/j2objc-common-libs-e2e-test.svg?branch=master)](https://travis-ci.org/j2objc-contrib/j2objc-common-libs-e2e-test)
1014

1115
**Goals**

libraryBuilds/joda-time-joda-time/joda-time-joda-time/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
*/
1616

1717
dependencies {
18-
compile project(':org.joda-joda-convert')
1918
j2objcTranslation 'joda-time:joda-time:2.8.2:sources'
19+
compile project(':org.joda-joda-convert')
20+
compile 'com.google.guava:guava:18.0'
2021
}
2122

2223
j2objcConfig {

libraryBuilds/org.joda-joda-convert/org.joda-joda-convert/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@
1515
*/
1616

1717
dependencies {
18-
j2objcTranslation 'org.joda:joda-convert:1.7:sources'
18+
j2objcTranslation 'org.joda:joda-convert:1.8:sources'
19+
compile 'com.google.guava:guava:18.0'
1920
}
2021

2122
j2objcConfig {
23+
autoConfigureDeps true
24+
2225
// No tests in the sources.jar.
2326
testMinExpectedTests 0
2427
finalConfigure()

0 commit comments

Comments
 (0)