Improve gradle config and use jsr305 as compileOnly instead of jetbrains

Author: rubengees

README.md

@@ -277,7 +277,7 @@ As this project uses [Lombok](https://projectlombok.org/), you will also need th
 ## Dependencies
 
 This library highly relies on [Retrofit](https://github.com/square/retrofit) and [OkHttp](http://square.github.io/okhttp/) by [Square](https://github.com/square) for the network communication.<br>
-Moreover it uses [Moshi](https://github.com/square/moshi) for response parsing and the [Jetbrains Annotations](https://www.jetbrains.com/help/idea/2017.1/nullable-and-notnull-annotations.html) to improve code style and provide IDE support.
+Moreover it uses [Moshi](https://github.com/square/moshi) for response parsing.
 
 ## Contributions and contributors
 

build.gradle

@@ -1,65 +1,57 @@
-ext {
-    version = '3.0.3'
-    group = 'com.github.proxer'
-
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
-}
-
-def jetbrainsAnnotationsVersion = '15.0'
-
-def retrofitVersion = '2.3.0'
-def okHttpVersion = '3.8.1'
-def moshiVersion = '1.5.0'
-
-def lombokVersion = '1.16.18'
-
-def junitVersion = '4.12'
-def assertjVersion = '3.8.0'
-
-def privateConstructorVersion = '1.2.0'
-
-ext.deps = [
-        jetbrainsAnnotations: "org.jetbrains:annotations:$jetbrainsAnnotationsVersion",
-
-        retrofit            : "com.squareup.retrofit2:retrofit:$retrofitVersion",
-        retrofitMoshi       : "com.squareup.retrofit2:converter-moshi:$retrofitVersion",
-        okHttp              : "com.squareup.okhttp3:okhttp:$okHttpVersion",
-        moshi               : "com.squareup.moshi:moshi:$moshiVersion",
-
-        lombok              : "org.projectlombok:lombok:$lombokVersion",
-
-        junit               : "junit:junit:$junitVersion",
-        assertj             : "org.assertj:assertj-core:$assertjVersion",
-
-        mockwebserver       : "com.squareup.okhttp3:mockwebserver:$okHttpVersion",
-        privateConstructor  : "com.pushtorefresh.java-private-constructor-checker:checker:$privateConstructorVersion"
-]
-
 buildscript {
+    ext {
+        version = '3.0.3'
+        group = 'com.github.proxer'
+
+        buildConfigPluginVersion = '1.1.8'
+        freefairPluginsVersion = '1.0.0'
+
+        lombokVersion = '1.16.18'
+        jsr305Version = '3.0.2'
+
+        retrofitVersion = '2.3.0'
+        okHttpVersion = '3.8.1'
+        moshiVersion = '1.5.0'
+
+        junitVersion = '4.12'
+        assertjVersion = '3.8.0'
+        privateConstructorVersion = '1.2.0'
+
+        deps = [
+                lombok            : "org.projectlombok:lombok:$lombokVersion",
+                jsr305            : "com.google.code.findbugs:jsr305:$jsr305Version",
+
+                retrofit          : "com.squareup.retrofit2:retrofit:$retrofitVersion",
+                retrofitMoshi     : "com.squareup.retrofit2:converter-moshi:$retrofitVersion",
+                okHttp            : "com.squareup.okhttp3:okhttp:$okHttpVersion",
+                moshi             : "com.squareup.moshi:moshi:$moshiVersion",
+
+                junit             : "junit:junit:$junitVersion",
+                assertj           : "org.assertj:assertj-core:$assertjVersion",
+                mockwebserver     : "com.squareup.okhttp3:mockwebserver:$okHttpVersion",
+                privateConstructor: "com.pushtorefresh.java-private-constructor-checker:checker:$privateConstructorVersion"
+        ]
+    }
+
     repositories {
         maven { url 'https://plugins.gradle.org/m2/' }
     }
 
     dependencies {
-        classpath 'gradle.plugin.de.fuerstenau:BuildConfigPlugin:1.1.8'
-        classpath 'io.freefair.gradle:gradle-plugins:0.10.1'
+        classpath "gradle.plugin.de.fuerstenau:BuildConfigPlugin:$buildConfigPluginVersion"
+        classpath "io.freefair.gradle:gradle-plugins:$freefairPluginsVersion"
     }
 }
 
 allprojects {
     version = rootProject.ext.version
     group = rootProject.ext.group
 
-    tasks.withType(JavaCompile) {
-        options.encoding = 'UTF-8'
-    }
-
     repositories {
         jcenter()
     }
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.1-milestone-1'
+    gradleVersion = '4.1-rc-1'
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Sun Jul 02 22:48:39 CEST 2017
+#Thu Jul 27 02:05:24 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,49 +1,41 @@
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
-apply plugin: 'de.fuerstenau.buildconfig'
 
-apply plugin: "jacoco"
-apply plugin: "io.freefair.javadoc-links"
+apply plugin: 'jacoco'
+apply plugin: 'de.fuerstenau.buildconfig'
+apply plugin: 'io.freefair.javadoc-links'
 
 apply plugin: 'idea'
 
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
 dependencies {
-    api deps.jetbrainsAnnotations
+    compileOnly deps.lombok
+    compileOnly deps.jsr305
 
     api deps.retrofit
     api deps.retrofitMoshi
     api deps.okHttp
     api deps.moshi
 
-    compileOnly deps.lombok
-
-    testImplementation deps.jetbrainsAnnotations
+    testCompileOnly deps.lombok
+    testCompileOnly deps.jsr305
 
     testImplementation deps.junit
     testImplementation deps.assertj
-
     testImplementation deps.mockwebserver
     testImplementation deps.privateConstructor
-
-    testCompileOnly deps.lombok
 }
 
-task delombok {
-    dependsOn compileJava
-
-    def srcPath = 'src/main/java'
-    def delombokPath = 'build/delombok'
-
-    inputs.files file(srcPath)
-    outputs.dir file(delombokPath)
-
-    ext.outputDir = delombokPath
+task delombok(dependsOn: compileJava) {
+    ext.outputDir = 'build/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,
+        ant.delombok(encoding: 'UTF-8', from: 'src/main/java', to: ext.outputDir,
                 classpath: configurations.compileClasspath.asPath)
     }
 }
@@ -62,7 +54,14 @@ javadoc {
     failOnError = false
 }
 
-task sourceJar(type: Jar, dependsOn: classes) {
+jacocoTestReport {
+    reports {
+        xml.enabled = true
+        html.enabled = false
+    }
+}
+
+task sourceJar(type: Jar, dependsOn: delombok) {
     from delombok.outputDir
 }
 
@@ -85,10 +84,3 @@ publishing {
         }
     }
 }
-
-jacocoTestReport {
-    reports {
-        xml.enabled = true
-        html.enabled = false
-    }
-}

library/build.gradle

@@ -5,8 +5,8 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import me.proxer.library.entitiy.messenger.Conference;
-import org.jetbrains.annotations.NotNull;
 
+import javax.annotation.Nonnull;
 import java.util.Date;
 
 /**
@@ -57,7 +57,7 @@ static class IntermediateConference {
         @Json(name = "image")
         String image;
 
-        @NotNull
+        @Nonnull
         String getImage() {
             final int delimiterIndex = image.indexOf(IMAGE_DELIMITER);
 
@@ -68,7 +68,7 @@ String getImage() {
             }
         }
 
-        @NotNull
+        @Nonnull
         String getImageType() {
             final int delimiterIndex = image.indexOf(IMAGE_DELIMITER);
 

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

@@ -1,6 +1,6 @@
 package me.proxer.library.api;
 
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * @author Ruben Gees

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

@@ -5,8 +5,8 @@
 import me.proxer.library.enums.Genre;
 import me.proxer.library.enums.MediaLanguage;
 import me.proxer.library.util.ProxerUtils;
-import org.jetbrains.annotations.NotNull;
 
+import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -48,7 +48,7 @@ private static class DelimitedEnumSetAdapter<T extends Enum<T>> extends JsonAdap
         private final Class<T> enumType;
         private final String delimiter;
 
-        DelimitedEnumSetAdapter(@NotNull final Class<T> enumType, @NotNull final String delimiter) {
+        DelimitedEnumSetAdapter(@Nonnull final Class<T> enumType, @Nonnull final String delimiter) {
             this.enumType = enumType;
             this.delimiter = delimiter;
         }

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

@@ -1,6 +1,6 @@
 package me.proxer.library.api;
 
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
 
 /**
  * Interface for all endpoints.
@@ -13,6 +13,6 @@ public interface Endpoint<T> {
     /**
      * Builds the call for this endpoint.
      */
-    @NotNull
+    @Nonnull
     ProxerCall<T> build();
 }

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

@@ -4,9 +4,9 @@
 import okhttp3.Interceptor;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.io.IOException;
 
 /**
@@ -20,7 +20,7 @@ final class HeaderInterceptor implements Interceptor {
     private final String apiKey;
     private final String userAgent;
 
-    HeaderInterceptor(@NotNull final String apiKey, @Nullable final String userAgent) {
+    HeaderInterceptor(@Nonnull final String apiKey, @Nullable final String userAgent) {
         this.apiKey = apiKey;
         this.userAgent = userAgent;
     }