Skip to content

Commit 8d82cc5

Browse files
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)
1 parent 4e06614 commit 8d82cc5

207 files changed

Lines changed: 4407 additions & 11943 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: java
22

33
jdk:
4-
- openjdk14
4+
- openjdk11
55

66
addons:
77
sonarcloud:
@@ -19,5 +19,4 @@ cache:
1919
- '.gradle'
2020

2121
script:
22-
# - ./gradlew clean build sonarqube ## FIXME enable when the java/util/jar/Pack200 bug has been fixed
23-
- ./gradlew clean build
22+
- ./gradlew clean build sonarqube

build.gradle

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,47 @@
11
plugins {
2-
id 'java'
32
id 'jacoco'
43
id "org.sonarqube" version "2.8"
4+
id 'org.jetbrains.kotlin.jvm' version '1.3.72'
55
}
66

77
group = 'com.wikia.tibia'
8-
version = '1.2.0'
8+
version = '2.0.0'
99
description = 'TibiaWikiBot'
1010

1111
repositories {
1212
mavenLocal()
1313
mavenCentral()
1414
}
1515

16+
ext {
17+
slf4jVersion = '1.8.0-beta4'
18+
jacksonVersion = '2.11.0'
19+
lombokVersion = '1.18.12'
20+
}
21+
1622
dependencies {
17-
implementation 'org.slf4j:slf4j-api:1.8.0-beta4'
18-
implementation 'org.slf4j:slf4j-simple:1.8.0-beta4'
19-
implementation 'org.json:json:20190722'
20-
implementation 'one.util:streamex:0.7.2'
21-
implementation 'commons-io:commons-io:2.6'
22-
implementation 'com.fasterxml.jackson.core:jackson-core:2.11.0'
23-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.0'
24-
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.11.0'
25-
implementation 'org.skyscreamer:jsonassert:1.5.0'
26-
implementation 'com.google.guava:guava:29.0-jre'
27-
implementation 'io.vavr:vavr:0.10.2'
28-
testImplementation 'junit:junit:4.13'
29-
testImplementation 'org.mockito:mockito-core:3.3.3'
30-
testImplementation 'org.hamcrest:hamcrest-core:2.2'
31-
testImplementation 'org.hamcrest:hamcrest-library:2.2'
32-
annotationProcessor 'org.projectlombok:lombok:1.18.12'
33-
compileOnly 'org.projectlombok:lombok:1.18.12'
23+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
24+
implementation "org.slf4j:slf4j-api:${slf4jVersion}"
25+
implementation "org.slf4j:slf4j-simple:${slf4jVersion}"
26+
implementation "org.json:json:20190722"
27+
implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
28+
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
29+
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:${jacksonVersion}"
30+
implementation "org.skyscreamer:jsonassert:1.5.0"
31+
implementation "com.google.guava:guava:29.0-jre"
32+
implementation "io.vavr:vavr:0.10.2"
33+
testImplementation "junit:junit:4.13"
34+
testImplementation "org.mockito:mockito-core:3.3.3"
35+
testImplementation "org.hamcrest:hamcrest-core:2.2"
36+
annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
37+
compileOnly "org.projectlombok:lombok:${lombokVersion}"
38+
}
39+
40+
compileKotlin {
41+
kotlinOptions.jvmTarget = "11"
42+
}
43+
compileTestKotlin {
44+
kotlinOptions.jvmTarget = "11"
3445
}
3546

3647
sonarqube {
@@ -40,13 +51,14 @@ sonarqube {
4051
}
4152
}
4253

43-
sourceCompatibility = 14
44-
4554
tasks.withType(JavaCompile) {
4655
options.encoding = 'UTF-8'
47-
options.compilerArgs += '--enable-preview'
4856
}
4957

5058
tasks.withType(Test) {
51-
jvmArgs += "--enable-preview"
52-
}
59+
useJUnit()
60+
61+
testLogging {
62+
events "passed", "skipped", "failed"
63+
}
64+
}

gradle/wrapper/gradle-wrapper.jar

216 Bytes
Binary file not shown.
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Fri May 01 17:07:54 CEST 2020
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
31
distributionBase=GRADLE_USER_HOME
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
64
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

gradlew

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/com/wikia/tibia/Main.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/main/java/com/wikia/tibia/enums/Article.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/main/java/com/wikia/tibia/enums/BestiaryLevel.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/main/java/com/wikia/tibia/enums/BestiaryOccurrence.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)