Skip to content

Commit

Permalink
Upgrade to java 8 and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
palpa committed Mar 15, 2015
1 parent e200ddb commit c7b4d61
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 11 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: java
jdk:
- openjdk7
- oraclejdk7
- oraclejdk8
deploy:
provider: heroku
api_key:
Expand Down
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ subprojects {
group = 'org.reparationservice'
version = '0.0.1-SNAPSHOT'

sourceCompatibility = 1.7
targetCompatibility = 1.7
sourceCompatibility = 1.8
targetCompatibility = 1.8

eclipse {
classpath {
containers.remove('org.eclipse.jdt.launching.JRE_CONTAINER')
containers 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7'
containers 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8'
}
}

Expand All @@ -31,7 +31,7 @@ subprojects {

dependencies {
compile 'joda-time:joda-time:2.6'
testCompile 'org.assertj:assertj-core:1.7.0'
testCompile 'org.assertj:assertj-core:2.0.0'
testCompile 'de.bechte.junit:junit-hierarchicalcontextrunner:4.12.0'
}
//Expose project test classes
Expand All @@ -49,5 +49,5 @@ subprojects {
}

task wrapper(type: Wrapper) {
gradleVersion = '2.1'
gradleVersion = '2.3'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Oct 10 12:59:50 ART 2014
#Sun Mar 15 15:40:16 ART 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
1 change: 0 additions & 1 deletion system.properties

This file was deleted.

2 changes: 1 addition & 1 deletion web-interface/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
springBootVersion = '1.2.0.RELEASE'
springBootVersion = '1.2.2.RELEASE'
}
repositories {
mavenCentral()
Expand Down

0 comments on commit c7b4d61

Please sign in to comment.