Require Java 8 and update dependencies

This is possible as Android now supports Java 8.

Author: rubengees

build.gradle

@@ -2,11 +2,11 @@ ext {
     version = '3.0.0'
     group = 'com.github.proxer'
 
-    sourceCompatibility = 1.7
-    targetCompatibility = 1.7
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
 }
 
-def jetbrainsAnnotationsVersion = '13.0'
+def jetbrainsAnnotationsVersion = '15.0'
 
 def retrofitVersion = '2.3.0'
 def okHttpVersion = '3.8.0'
@@ -15,7 +15,7 @@ def moshiVersion = '1.5.0'
 def lombokVersion = '1.16.16'
 
 def junitVersion = '4.12'
-def assertjVersion = '3.7.0'
+def assertjVersion = '3.8.0'
 
 def privateConstructorVersion = '1.2.0'
 
@@ -38,9 +38,7 @@ ext.deps = [
 
 buildscript {
     repositories {
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
+        maven { url "https://plugins.gradle.org/m2/" }
     }
 
     dependencies {

library/build.gradle

@@ -7,17 +7,8 @@ apply plugin: 'de.fuerstenau.buildconfig'
 apply plugin: "jacoco"
 apply plugin: "io.freefair.javadoc-links"
 
-tasks.matching { it instanceof JavaCompile && it.name != "compileTestJava" }.all {
-    sourceCompatibility = rootProject.ext.sourceCompatibility
-    targetCompatibility = rootProject.ext.targetCompatibility
-
-    if (System.getenv('CIRCLECI')) {
-        options.bootClasspath = "/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rt.jar"
-    }
-}
-
 dependencies {
-    api deps.jetbrainsAnnotations
+    apiElements deps.jetbrainsAnnotations
 
     api deps.retrofit
     api deps.retrofitMoshi
@@ -26,6 +17,8 @@ dependencies {
 
     compileOnly deps.lombok
 
+    testImplementation deps.jetbrainsAnnotations
+
     testImplementation deps.junit
     testImplementation deps.assertj
 
@@ -49,6 +42,7 @@ task delombok {
     doLast {
         ant.taskdef(name: 'delombok', classname: 'lombok.delombok.ant.Tasks$Delombok',
                 classpath: configurations.compileOnly.asPath)
+
         ant.delombok(encoding: 'UTF-8', from: srcPath, to: delombokPath,
                 classpath: configurations.compileClasspath.asPath)
     }
@@ -94,7 +88,7 @@ publishing {
 
 jacocoTestReport {
     reports {
-        xml.enabled true
-        html.enabled false
+        xml.enabled = true
+        html.enabled = false
     }
 }

library/src/main/java/me/proxer/library/api/EnumRetrofitConverterFactory.java

@@ -4,7 +4,6 @@
 import retrofit2.Converter;
 import retrofit2.Retrofit;
 
-import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 
@@ -17,16 +16,9 @@ final class EnumRetrofitConverterFactory extends Converter.Factory {
     public Converter<?, String> stringConverter(final Type type, final Annotation[] annotations,
                                                 final Retrofit retrofit) {
         if (((Class<?>) type).isEnum()) {
-            return new EnumConverter();
+            return (Converter<Enum<?>, String>) ProxerUtils::getApiEnumName;
         }
 
         return null;
     }
-
-    private static final class EnumConverter implements Converter<Enum<?>, String> {
-        @Override
-        public String convert(final Enum<?> e) throws IOException {
-            return ProxerUtils.getApiEnumName(e);
-        }
-    }
 }