Merge pull request #83 from panic08/switch-from-checkstyle-to-spotless

Switch from checkstyle to spotless

Author: therepanic

.idea/misc.xml

@@ -1,3 +1,12 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:5.17.0'
+    }
+}
+
 ext {
     jsoupVersion = '1.18.3'
     okhttpVersion = '4.12.0'
@@ -7,20 +16,27 @@ ext {
 }
 
 allprojects {
-    apply plugin: 'java'
-    apply plugin: 'checkstyle'
+    group = 'ru.funpay4j'
+    version = '1.0.6'
+}
 
-    checkstyle {
-        configFile = file("$rootProject.projectDir/src/checkstyle/checkstyle.xml")
-        ignoreFailures = false
-    }
+def javaVersion = JavaVersion.current()
 
-    checkstyleMain {
-        source = 'src/main/java'
-    }
+subprojects { subproject ->
+    if (subproject.name != 'examples' && javaVersion.compareTo(JavaVersion.VERSION_1_8) == 0) {
+        apply plugin: 'com.diffplug.spotless'
 
-    checkstyleTest {
-        source = 'src/test/java'
+        spotless {
+            java {
+                target("src/main/java/**/*.java", "src/test/java/**/*.java")
+
+                googleJavaFormat().aosp()
+                importOrder("java", "javax", "org", "com")
+                removeUnusedImports()
+                trimTrailingWhitespace()
+                endWithNewline()
+            }
+        }
     }
 
     repositories {
@@ -35,6 +51,4 @@ allprojects {
         options.encoding = 'UTF-8'
     }
 
-    group = 'ru.funpay4j'
-    version = '1.0.6'
 }

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'java'
+    id 'java-library'
 }
 
 dependencies {

client/build.gradle

@@ -14,11 +14,11 @@
 
 package ru.funpay4j.client.client;
 
-import ru.funpay4j.client.request.SaveOfferRequest;
 import ru.funpay4j.client.exceptions.FunPayApiException;
 import ru.funpay4j.client.exceptions.InvalidCsrfTokenOrPHPSESSIDException;
 import ru.funpay4j.client.exceptions.InvalidGoldenKeyException;
 import ru.funpay4j.client.exceptions.offer.OfferAlreadyRaisedException;
+import ru.funpay4j.client.request.SaveOfferRequest;
 
 /**
  * Interface for sending thematic requests to FunPay
@@ -35,7 +35,8 @@ public interface FunPayClient {
      * @throws FunPayApiException if the other api-related exception
      * @throws InvalidGoldenKeyException if the golden key is invalid
      */
-    void updateAvatar(String goldenKey, byte[] newAvatar) throws FunPayApiException, InvalidGoldenKeyException;
+    void updateAvatar(String goldenKey, byte[] newAvatar)
+            throws FunPayApiException, InvalidGoldenKeyException;
 
     /**
      * Send a request to raise all offers
@@ -47,7 +48,8 @@ public interface FunPayClient {
      * @throws InvalidGoldenKeyException if the golden key is invalid
      * @throws OfferAlreadyRaisedException if the offer already raised
      */
-    void raiseAllOffers(String goldenKey, long gameId, long lotId) throws FunPayApiException, InvalidGoldenKeyException, OfferAlreadyRaisedException;
+    void raiseAllOffers(String goldenKey, long gameId, long lotId)
+            throws FunPayApiException, InvalidGoldenKeyException, OfferAlreadyRaisedException;
 
     /**
      * Send a request to save offer
@@ -60,8 +62,10 @@ public interface FunPayClient {
      * @throws InvalidGoldenKeyException if the golden key is invalid
      * @throws InvalidCsrfTokenOrPHPSESSIDException if the csrf token or PHPSESSID is invalid
      */
-    void saveOffer(String goldenKey, String csrfToken, String phpSessionId , SaveOfferRequest request) throws FunPayApiException,
-            InvalidGoldenKeyException, InvalidCsrfTokenOrPHPSESSIDException;
+    void saveOffer(
+            String goldenKey, String csrfToken, String phpSessionId, SaveOfferRequest request)
+            throws FunPayApiException, InvalidGoldenKeyException,
+                    InvalidCsrfTokenOrPHPSESSIDException;
 
     /**
      * Send a request to add offer image
@@ -72,5 +76,6 @@ void saveOffer(String goldenKey, String csrfToken, String phpSessionId , SaveOff
      * @throws FunPayApiException if the other api-related exception
      * @throws InvalidGoldenKeyException if the golden key is invalid
      */
-    Long addOfferImage(String goldenKey, byte[] image) throws FunPayApiException, InvalidGoldenKeyException;
-}
+    Long addOfferImage(String goldenKey, byte[] image)
+            throws FunPayApiException, InvalidGoldenKeyException;
+}