Merge pull request #33 from GoodforGod/dev

[3.1.1]

.editorconfig

@@ -0,0 +1,37 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# all-encompassing default settings unless otherwise specified
+[*]
+end_of_line = lf
+charset = utf-8
+
+# Json
+[*.json]
+indent_size = 2
+indent_style = space
+insert_final_newline = false
+trim_trailing_whitespace = true
+
+# Yaml
+[{*.yml, *.yaml}]
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Property files
+[*.properties]
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# XML files
+[*.xml]
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true

.github/workflows/gradle.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '11' ]
+        java: [ '11', '17' ]
     name: Java ${{ matrix.java }} setup
 
     steps:
@@ -25,16 +25,17 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
 
+      - name: Code Style
+        run: ./gradlew spotlessCheck
+
       - name: Build
         run: ./gradlew classes
 
-      - name: Codestyle
-        run: ./gradlew spotlessCheck
-
       - name: Test
         run: ./gradlew test jacocoTestReport
 
       - name: SonarQube
+        if: matrix.java == '17'
         run: ./gradlew sonarqube
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -18,7 +18,7 @@ Documentation for **versions 1.X.X** in [this document](/README-VERSION-1.X.md).
 **Gradle**
 ```groovy
 dependencies {
-    implementation 'com.github.goodforgod:dummymaker:3.1.0'
+    implementation 'com.github.goodforgod:dummymaker:3.1.1'
 }
 ```
 
@@ -27,7 +27,7 @@ dependencies {
 <dependency>
     <groupId>com.github.goodforgod</groupId>
     <artifactId>dummymaker</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
 </dependency>
 ```
 

build.gradle

@@ -4,7 +4,7 @@ plugins {
     id "java-library"
 
     id "org.sonarqube" version "3.3"
-    id "com.diffplug.spotless" version "5.14.3"
+    id "com.diffplug.spotless" version "6.1.0"
 }
 
 group = groupId
@@ -18,7 +18,7 @@ spotless {
         encoding("UTF-8")
         importOrder()
         removeUnusedImports()
-        eclipse().configFile("${projectDir}/config/codestyle.xml")
+        eclipse("4.21.0").configFile("${projectDir}/config/codestyle.xml")
     }
 }
 
@@ -40,7 +40,7 @@ dependencies {
     implementation "org.slf4j:slf4j-api:1.7.32"
     implementation "javax.inject:javax.inject:1"
 
-    testRuntimeOnly "ch.qos.logback:logback-classic:1.2.7"
+    testRuntimeOnly "ch.qos.logback:logback-classic:1.2.10"
     testImplementation "junit:junit:4.13.2"
 }
 

gradle.properties

@@ -1,11 +1,16 @@
 groupId=com.github.goodforgod
 artifactId=dummymaker
-artifactVersion=3.1.0
+artifactVersion=3.1.1
 
 
 ##### GRADLE #####
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 org.gradle.caching=true
-org.gradle.jvmargs=-Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 \
+  --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists