Skip to content

Commit 632cd2a

Browse files
committed
work on PR
1 parent 087f6e4 commit 632cd2a

File tree

7 files changed

+19
-411
lines changed

7 files changed

+19
-411
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ env:
1818
# Uncomment to add a library that should fail to build, along with documentation on why.
1919
matrix:
2020
allow_failures:
21-
# # Blocked on (github issue url)
21+
# Blocked on (github issue url)
2222
# - env: TEST_DIR=com.example-library
23-
# # Blocked on: https://github.com/j2objc-contrib/j2objc-common-libs-e2e-test/issues/48
23+
# Blocked on: https://github.com/j2objc-contrib/j2objc-common-libs-e2e-test/issues/48
2424
- env: TEST_DIR=com.fasterxml.jackson.core
2525

2626
branches:

libraryBuilds/com.fasterxml.jackson.core/com.fasterxml.jackson.core-jackson-core/build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,8 @@ dependencies {
1919
}
2020

2121
j2objcConfig {
22-
// Almost always there are no tests provided in an external source jar.
23-
24-
autoConfigureDeps true
25-
forceFilenameCollisionCheck false
26-
translateArgs = ['--segmented-headers', '--extract-unsequenced', '--build-closure']
22+
translateArgs '--segmented-headers'
23+
translateArgs '--extract-unsequenced'
2724

2825
testMinExpectedTests 0
2926
finalConfigure()

libraryBuilds/com.fasterxml.jackson.core/com.fasterxml.jackson.core-jackson-databind/build.gradle

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
sourceCompatibility = 1.7
17-
targetCompatibility = 1.7
1816

1917
dependencies {
2018
compile project(':com.fasterxml.jackson.core-jackson-core')
@@ -23,21 +21,11 @@ dependencies {
2321
testCompile 'junit:junit:4.11'
2422
}
2523

26-
test {
27-
testLogging {
28-
// Provide full exception info on failure, instead
29-
// of just pointing to an HTML file.
30-
exceptionFormat = 'full'
31-
}
32-
}
24+
j2objcConfig {
3325

26+
translateArgs '--segmented-headers'
27+
translateArgs '--extract-unsequenced'
3428

35-
j2objcConfig {
36-
// Almost always there are no tests provided in an external source jar.
37-
// testMinExpectedTests 0
38-
autoConfigureDeps true
39-
forceFilenameCollisionCheck false
40-
translateArgs = ['--segmented-headers', '--extract-unsequenced', '--build-closure']
4129
translatePattern {
4230
exclude '**/fasterxml/jackson/databind/ext/DOMSerializer.java'
4331
}

libraryBuilds/com.fasterxml.jackson.core/com.fasterxml.jackson.core-jackson-databind/src/test/java/com/fasterxml/jackson/custom/GenericsTest.java

Lines changed: 0 additions & 193 deletions
This file was deleted.

libraryBuilds/com.google.code.gson-gson/com.google.code.gson-gson/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
dependencies {
1818
j2objcTranslation 'com.google.code.gson:gson:2.3.1:sources'
19-
testCompile 'junit:junit:4.11'
2019
}
2120

2221
j2objcConfig {

0 commit comments

Comments
 (0)