Skip to content

Commit 4526de0

Browse files
authored
Upgrade dependencies and update used JDKs (#16)
* Remove unsupported JDK versions * Update Gradle to version 4.4 * Disable ECDSA algorithm * Run before install * Fix deprication error for left shift operator The error in question was: > The Task.leftShift(Closure) method has been deprecated and is scheduled to be > removed in Gradle 5.0. Please use Task.doLast(Action) instead. * Remove Java 6 tests but compile with support for Java 6 Gradle has problem downloading dependencies: https://travis-ci.org/tus/tus-java-client/jobs/318341024#L505 * Update mockserver-netty * Use sudo for changing Java security file * Add comment
1 parent 61ed1ce commit 4526de0

File tree

6 files changed

+94
-82
lines changed

6 files changed

+94
-82
lines changed

.travis.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
sudo: false
1+
sudo: required
22
language: java
33
jdk:
44
- oraclejdk8
5-
- oraclejdk7
6-
- openjdk6
5+
- oraclejdk9
76
- openjdk7
7+
- openjdk8
8+
before_install:
9+
# OpenJDK 7 does not support HTTPS using Elliptic Curves, but the Gradle
10+
# server use them. Therefore, we manually disable them to enable communication.
11+
- sudo sed -i 's/^jdk.certpath.disabledAlgorithms=.*/jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, ECDSA/' /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/security/java.security || true
812
deploy:
913
- provider: script
1014
script: ./deploy-gh-pages.sh
1115
on:
1216
branch: master
13-
jdk: openjdk7
17+
jdk: openjdk8
1418
- provider: script
1519
script: ./deploy-bintray.sh
1620
on:
1721
tags: true
18-
jdk: openjdk6
22+
jdk: openjdk8
1923

2024
env:
2125
global:

build.gradle

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,15 @@ allprojects {
99
}
1010
}
1111

12+
// We compile the library using Java 1.6 compatibility
13+
// in order to ensure interoperability with older Android platforms.
14+
sourceCompatibility = 1.6
15+
targetCompatibility = 1.6
16+
1217
dependencies {
1318
compile 'org.jetbrains:annotations:13.0'
1419
testCompile 'junit:junit:4.12'
15-
testCompile 'org.mock-server:mockserver-netty:3.9.17'
20+
testCompile 'org.mock-server:mockserver-netty:5.2.2'
1621
}
1722

1823
task sourcesJar(type: Jar, dependsOn: classes) {
@@ -25,38 +30,40 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
2530
from javadoc.destinationDir
2631
}
2732

28-
task createPom << {
29-
pom {
30-
project {
31-
groupId 'io.tus.java.client'
32-
artifactId 'tus-java-client'
33-
name 'tus-java-client'
34-
version project.getProperties().get('pomVersion')
35-
packaging 'pom'
36-
description 'Java client for tus, the resumable file uploading protocol.'
37-
url 'http://tus.io'
38-
39-
scm {
40-
url 'https://github.com/tus/tus-java-client'
41-
connection 'https://github.com/tus/tus-java-client'
42-
developerConnection 'https://github.com/tus/tus-java-client'
43-
}
33+
task createPom {
34+
doLast {
35+
pom {
36+
project {
37+
groupId 'io.tus.java.client'
38+
artifactId 'tus-java-client'
39+
name 'tus-java-client'
40+
version project.getProperties().get('pomVersion')
41+
packaging 'pom'
42+
description 'Java client for tus, the resumable file uploading protocol.'
43+
url 'http://tus.io'
4444

45-
developers {
46-
developer {
47-
id 'acconut'
48-
name 'Marius Kleidl'
49-
45+
scm {
46+
url 'https://github.com/tus/tus-java-client'
47+
connection 'https://github.com/tus/tus-java-client'
48+
developerConnection 'https://github.com/tus/tus-java-client'
5049
}
51-
}
5250

53-
inceptionYear '2015'
54-
licenses {
55-
license {
56-
name 'The MIT License (MIT)'
57-
url 'http://opensource.org/licenses/MIT'
51+
developers {
52+
developer {
53+
id 'acconut'
54+
name 'Marius Kleidl'
55+
56+
}
57+
}
58+
59+
inceptionYear '2015'
60+
licenses {
61+
license {
62+
name 'The MIT License (MIT)'
63+
url 'http://opensource.org/licenses/MIT'
64+
}
5865
}
5966
}
60-
}
61-
}.writeTo("build/libs/pom.xml")
67+
}.writeTo("build/libs/pom.xml")
68+
}
6269
}

gradle/wrapper/gradle-wrapper.jar

2.91 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Thu Jul 16 22:37:16 CEST 2015
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip

gradlew

Lines changed: 43 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 4 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)