diff --git a/.gitignore b/.gitignore index 7608c83..974e53c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ /evilmusic.log /.gradle/ /node_modules/ +/npm-debug.log /.project /.settings/ /src/main/webapp/dist diff --git a/.tern-project b/.tern-project index 5d7f78b..d5c493a 100644 --- a/.tern-project +++ b/.tern-project @@ -1,18 +1,17 @@ { - "libs": [ - "browser", - "ecma5", - "ecma6", - "jquery" - ], - "loadEagerly": [ - "src/main/webapp/**/*.js" - ], - "plugins": { - "complete_strings": {}, - "angular": {}, - "doc_comment": { - "fullDocs": true + "ecmaVersion": 6, + "libs": [ + "browser" + ], + "loadEagerly": [ + "src/main/webapp/**/*.js" + ], + "plugins": { + "es_modules": {}, + "complete_strings": {}, + "angular": {}, + "doc_comment": { + "fullDocs": true + } } - } -} \ No newline at end of file +} diff --git a/README.md b/README.md index 2687436..021c2dd 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Web based music player for lossless formats. Gradle is used to build (and currently to run) EvilMusic. It can be obtained from https://www.gradle.org. #### Java -Necessary to run the EvilMusic server. If you are on Linux, it can be obtained by using the command `apt-get install openjdk-7-jre`. The Oracle implementation of Java can be obtained from https://www.oracle.com/java. +Necessary to run the EvilMusic server. If you are on Linux, it can be obtained by using the command `apt-get install openjdk-8-jre`. The Oracle implementation of Java can be obtained from https://www.oracle.com/java. #### metaflac The `metaflac` command is required to read meta data from FLAC files. If you are on Linux, it can be obtained from the `flac` package using the command, `apt-get install flac`. Otherwise, it can be obtained from https://xiph.org/flac.