Release of version 2.0.0 (#37)

* Support gradle (#30)
* Cleaning up, tests etc.
* Add test logging.
* Cleanup of dependencies.
* Updating to Gradle 6.4.1
* Rewrite to Kotlin (#36)

.travis.yml

@@ -1,7 +1,7 @@
 language: java
 
 jdk:
-  - openjdk14
+  - openjdk11
 
 addons:
   sonarcloud:
@@ -19,5 +19,4 @@ cache:
     - '.gradle'
 
 script:
-#  - ./gradlew clean build sonarqube ## FIXME enable when the java/util/jar/Pack200 bug has been fixed
-  - ./gradlew clean build
+  - ./gradlew clean build sonarqube

build.gradle

@@ -1,36 +1,47 @@
 plugins {
-    id 'java'
     id 'jacoco'
     id "org.sonarqube" version "2.8"
+    id 'org.jetbrains.kotlin.jvm' version '1.3.72'
 }
 
 group = 'com.wikia.tibia'
-version = '1.2.0'
+version = '2.0.0'
 description = 'TibiaWikiBot'
 
 repositories {
     mavenLocal()
     mavenCentral()
 }
 
+ext {
+    slf4jVersion = '1.8.0-beta4'
+    jacksonVersion = '2.11.0'
+    lombokVersion = '1.18.12'
+}
+
 dependencies {
-    implementation 'org.slf4j:slf4j-api:1.8.0-beta4'
-    implementation 'org.slf4j:slf4j-simple:1.8.0-beta4'
-    implementation 'org.json:json:20190722'
-    implementation 'one.util:streamex:0.7.2'
-    implementation 'commons-io:commons-io:2.6'
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.11.0'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.0'
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.11.0'
-    implementation 'org.skyscreamer:jsonassert:1.5.0'
-    implementation 'com.google.guava:guava:29.0-jre'
-    implementation 'io.vavr:vavr:0.10.2'
-    testImplementation 'junit:junit:4.13'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
-    testImplementation 'org.hamcrest:hamcrest-core:2.2'
-    testImplementation 'org.hamcrest:hamcrest-library:2.2'
-    annotationProcessor 'org.projectlombok:lombok:1.18.12'
-    compileOnly 'org.projectlombok:lombok:1.18.12'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+    implementation "org.slf4j:slf4j-api:${slf4jVersion}"
+    implementation "org.slf4j:slf4j-simple:${slf4jVersion}"
+    implementation "org.json:json:20190722"
+    implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
+    implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:${jacksonVersion}"
+    implementation "org.skyscreamer:jsonassert:1.5.0"
+    implementation "com.google.guava:guava:29.0-jre"
+    implementation "io.vavr:vavr:0.10.2"
+    testImplementation "junit:junit:4.13"
+    testImplementation "org.mockito:mockito-core:3.3.3"
+    testImplementation "org.hamcrest:hamcrest-core:2.2"
+    annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
+    compileOnly "org.projectlombok:lombok:${lombokVersion}"
+}
+
+compileKotlin {
+    kotlinOptions.jvmTarget = "11"
+}
+compileTestKotlin {
+    kotlinOptions.jvmTarget = "11"
 }
 
 sonarqube {
@@ -40,13 +51,14 @@ sonarqube {
     }
 }
 
-sourceCompatibility = 14
-
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
-    options.compilerArgs += '--enable-preview'
 }
 
 tasks.withType(Test) {
-    jvmArgs += "--enable-preview"
-}
+    useJUnit()
+
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri May 01 17:07:54 CEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%