Skip to content

Commit

Permalink
remove openjdk7 from .travis.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
tsuyoshizawa committed Jul 6, 2019
1 parent 6c4ac96 commit 46a6b0f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 12 deletions.
7 changes: 1 addition & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
language: java
jdk:
- openjdk7
- oraclejdk8
- oraclejdk9
install:
# workaround for the missing EC cipher suites
# will download Gradle distribution using OracleJDK8
- if [ "openjdk7" == "$TRAVIS_JDK_VERSION" ]; then JAVA_HOME=$(jdk_switcher home openjdk8) ./gradlew testClasses ; fi
- openjdk12
after_success:
- ./gradlew cobertura coveralls
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'net.saliman:gradle-cobertura-plugin:2.0.0' // cobertura plugin
classpath 'net.saliman:gradle-cobertura-plugin:2.6.1' // cobertura plugin
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.4.0'
}
}

apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'cobertura'
apply plugin: 'net.saliman.cobertura'
apply plugin: 'com.github.kt3k.coveralls'

apply from: 'dictionary.gradle'
Expand All @@ -21,8 +21,8 @@ archivesBaseName = 'zxcvbn'
sourceCompatibility = 1.7
targetCompatibility = 1.7

task wrapper(type: Wrapper) {
gradleVersion = '4.6'
wrapper {
gradleVersion = '5.5'
}

repositories {
Expand Down Expand Up @@ -147,4 +147,4 @@ task preCompile << {
tasks.createDictionary.execute()
}

compileJava.dependsOn preCompile
compileJava.dependsOn preCompile
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip

0 comments on commit 46a6b0f

Please sign in to comment.