Skip to content

Commit c7c6d6e

Browse files
authored
Feature/travis add jdk versions (#111)
* Remove Android and add more jdk versions to tests.
1 parent b266672 commit c7c6d6e

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

.travis.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
1-
language: android
2-
dist: trusty
1+
language: java
2+
dist: precise
33
sudo: required
4-
group: edge
5-
6-
android:
7-
components:
8-
- tools
9-
- platform-tools
10-
- tools
11-
- build-tools-25.0.2
12-
- android-25
13-
- extra-android-m2repository
144

155
before_cache:
166
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -22,13 +12,7 @@ cache:
2212

2313
jdk:
2414
- oraclejdk8
25-
26-
# Android build tools 25 require java 8 - until project separation java 7 tests are disabled
27-
# - oraclejdk7
28-
# - openjdk7
29-
30-
# Temporarily disabled, test fail because Hamcrest needs java 1.7
31-
# - openjdk6
15+
- oraclejdk7
3216

3317
# ciTest is configured to skip the various timeout tests that don't work in travis
3418
script: ./gradlew clean ciTest

java_shared.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,10 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
2828
artifacts {
2929
archives sourcesJar
3030
archives javadocJar
31+
}
32+
33+
tasks.each { task ->
34+
if (!project.hasProperty("ossrhPassword") && "signArchives" == task.name) {
35+
task.enabled = false
36+
}
3137
}

0 commit comments

Comments
 (0)