Skip to content

Commit f7489df

Browse files
authored
Merge pull request #22 from verhagen/issue/21-build_on_travis_causes_issues
Fixes issues with the Travis-CI build
2 parents afa33a7 + 5ac87fe commit f7489df

3 files changed

Lines changed: 19 additions & 8 deletions

File tree

.gitignore

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1-
.DS_Store
2-
gradle
1+
# Gradle
32
.gradle/
3+
build/
4+
5+
gradle
46
gradlew
57
gradle.bat
6-
build/
7-
hjson.iml
8+
9+
# IntelliJ
10+
*.iml
811
.idea
12+
13+
# Eclipse
14+
.project
15+
.classpath
16+
.settings/
17+
18+
# MacOS
19+
.DS_Store

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: java
22
jdk:
3-
- oraclejdk8
4-
- oraclejdk7
3+
- openjdk8
4+
- openjdk11
55
env:
66
global:
77
secure:

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ version = '3.0.0'
44
group = 'org.hjson'
55
description = """Hjson, the Human JSON."""
66

7-
sourceCompatibility = 1.7
8-
targetCompatibility = 1.7
7+
sourceCompatibility = 1.8
8+
targetCompatibility = 1.8
99

1010
sourceSets {
1111
main {

0 commit comments

Comments
 (0)