Merge pull request #110 from librespot-org/toml-conf

Use TOML for configuration file

Author: devgianlu

.gitignore

@@ -2,5 +2,5 @@
 out/
 target/
 *iml
-conf.json
+config.toml
 /cache/

README.md

@@ -2,7 +2,7 @@
 [![Build Status](https://travis-ci.com/librespot-org/librespot-java.svg?branch=master)](https://travis-ci.com/librespot-org/librespot-java)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/xyz.gianlu.librespot/librespot-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/xyz.gianlu.librespot/librespot-java)
 
-`librespot-java` is a port of [librespot](https://github.com/librespot-org/librespot), originally written in Rust. Additionally, this implementation provides an useful API to request metadata or control the player, more [here](https://github.com/librespot-org/librespot-java/blob/master/api).
+`librespot-java` is a port of [librespot](https://github.com/librespot-org/librespot), originally written in Rust, which as evolved into the most up-to-date open-source Spotify client. Additionally, this implementation provides an useful API to request metadata or control the player, more [here](https://github.com/librespot-org/librespot-java/blob/master/api).
 
 ## Features
 This client is pretty much capable of playing anything that's available on Spotify. 
@@ -14,7 +14,7 @@ Its main features are:
 - Gapless playback
 
 ## Get started
-All the configuration you need is inside the `conf.properties` file, there you can decide to authenticate with:
+All the configuration you need is inside the `config.toml` file, there you can decide to authenticate with:
 - Username and password
 - Zeroconf
 - Facebook
@@ -36,6 +36,6 @@ This is more advanced and should only be used if you saved an authentication blo
 You can download the latest release from [here](https://github.com/librespot-org/librespot-java/releases) and then run `java -jar ./librespot-core-jar-with-dependencies.jar` from the command line.
 
 ## Build it
-This project uses [Maven](https://maven.apache.org/), after installing it you can compile with `mvn clean package` in the project root, if the compilation succeeds you'll be pleased with a JAR executable in `core/target`. Remember that you need to clone the project with its submodules (`git clone --recursive https://github.com/librespot-org/librespot-java`).
+This project uses [Maven](https://maven.apache.org/), after installing it you can compile with `mvn clean package` in the project root, if the compilation succeeds you'll be pleased with a JAR executable in `core/target`.
 
 To run the newly build jar run `java -jar ./core/target/librespot-core-jar-with-dependencies.jar`.

api/pom.xml

@@ -47,10 +47,5 @@
             <artifactId>librespot-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>xyz.gianlu.librespot</groupId>
-            <artifactId>librespot-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
 </project>

api/src/main/java/xyz/gianlu/librespot/api/Main.java

@@ -5,7 +5,6 @@
 import xyz.gianlu.librespot.core.Session;
 import xyz.gianlu.librespot.spirc.SpotifyIrc;
 
-import java.io.File;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 
@@ -15,7 +14,7 @@
 public class Main {
 
     public static void main(String[] args) throws IOException, GeneralSecurityException, SpotifyIrc.IrcException, Session.SpotifyAuthenticationException {
-        Session session = new Session.Builder(new FileConfiguration(new File("conf.properties"), args)).create();
+        Session session = new Session.Builder(new FileConfiguration(args)).create();
 
         ApiServer server = new ApiServer(24879);
         server.registerHandler(new PlayerHandler(session));

conf.properties

@@ -49,18 +49,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <!-- Data -->
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>${protobuf.version}</version>
-        </dependency>
-
         <!-- Audio -->
         <dependency>
             <groupId>org.jcraft</groupId>
@@ -88,5 +76,12 @@
             <artifactId>okhttp</artifactId>
             <version>3.14.1</version>
         </dependency>
+
+        <!-- TOML configuration -->
+        <dependency>
+            <groupId>com.electronwill.night-config</groupId>
+            <artifactId>toml</artifactId>
+            <version>3.6.0</version>
+        </dependency>
     </dependencies>
 </project>