Moved to JDK 18.

This commit is contained in:
Erik C. Thauvin 2022-03-23 11:58:18 -07:00
parent 4972e8e5d8
commit fa34f47dab
11 changed files with 19 additions and 28 deletions

View file

@ -12,7 +12,7 @@ jobs:
strategy: strategy:
matrix: matrix:
java-version: [ 11, 17 ] java-version: [ 11, 17, 18 ]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

2
.idea/misc.xml generated
View file

@ -5,5 +5,5 @@
<pattern value="net.thauvin.erik.mobibot.modules.War" method="War" /> <pattern value="net.thauvin.erik.mobibot.modules.War" method="War" />
</component> </component>
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="17" project-jdk-type="JavaSDK" /> <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="18" project-jdk-type="JavaSDK" />
</project> </project>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

View file

@ -1,4 +1,4 @@
image: openjdk:17 image: openjdk:18
pipelines: pipelines:
default: default:

View file

@ -5,8 +5,8 @@ plugins {
id 'io.gitlab.arturbosch.detekt' version '1.19.0' id 'io.gitlab.arturbosch.detekt' version '1.19.0'
id 'java' id 'java'
id 'net.thauvin.erik.gradle.semver' version '1.0.4' id 'net.thauvin.erik.gradle.semver' version '1.0.4'
id 'org.jetbrains.kotlin.jvm' version '1.6.10' id 'org.jetbrains.kotlin.jvm' version '1.6.20-RC'
id 'org.jetbrains.kotlin.kapt' version '1.6.10' id 'org.jetbrains.kotlin.kapt' version '1.6.20-RC'
id 'org.jetbrains.kotlinx.kover' version '0.5.0' id 'org.jetbrains.kotlinx.kover' version '0.5.0'
id 'org.sonarqube' version '3.3' id 'org.sonarqube' version '3.3'
id 'pmd' id 'pmd'
@ -27,8 +27,8 @@ def isNonStable = { String version ->
mainClassName = packageName + '.Mobibot' mainClassName = packageName + '.Mobibot'
ext.versions = [ ext.versions = [
log4j: '2.17.1', log4j: '2.17.2',
pmd : '6.42.0', pmd : '6.43.0',
] ]
repositories { repositories {
@ -54,7 +54,7 @@ dependencies {
// Google // Google
implementation 'com.google.code.gson:gson:2.9.0' implementation 'com.google.code.gson:gson:2.9.0'
implementation 'com.google.guava:guava:31.0.1-jre' implementation 'com.google.guava:guava:31.1-jre'
// Kotlin // Kotlin
implementation platform('org.jetbrains.kotlin:kotlin-bom') implementation platform('org.jetbrains.kotlin:kotlin-bom')
@ -71,7 +71,7 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp:4.9.3' implementation 'com.squareup.okhttp3:okhttp:4.9.3'
implementation 'net.aksingh:owm-japis:2.5.3.0' implementation 'net.aksingh:owm-japis:2.5.3.0'
implementation 'net.objecthunter:exp4j:0.4.8' implementation 'net.objecthunter:exp4j:0.4.8'
implementation 'org.json:json:20211205' implementation 'org.json:json:20220320'
implementation 'org.jsoup:jsoup:1.14.3' implementation 'org.jsoup:jsoup:1.14.3'
implementation 'org.twitter4j:twitter4j-core:4.0.7' implementation 'org.twitter4j:twitter4j-core:4.0.7'

Binary file not shown.

View file

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

View file

@ -43,7 +43,7 @@ import static net.thauvin.erik.mobibot.Utils.bold;
/** /**
* The War module. * The War module.
* *
* @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a> * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
* @since 1.0 * @since 1.0
*/ */
public final class War extends AbstractModule { public final class War extends AbstractModule {

View file

@ -39,7 +39,7 @@ import assertk.assertions.isInstanceOf
import com.rometools.rome.io.FeedException import com.rometools.rome.io.FeedException
import net.thauvin.erik.mobibot.FeedReader.Companion.readFeed import net.thauvin.erik.mobibot.FeedReader.Companion.readFeed
import org.testng.annotations.Test import org.testng.annotations.Test
import java.io.FileNotFoundException import java.io.IOException
import java.net.MalformedURLException import java.net.MalformedURLException
import java.net.UnknownHostException import java.net.UnknownHostException
@ -64,8 +64,8 @@ class FeedReaderTest {
assertThat { readFeed("https://www.example.com") }.isFailure().isInstanceOf(FeedException::class.java) assertThat { readFeed("https://www.example.com") }.isFailure().isInstanceOf(FeedException::class.java)
assertThat { readFeed("https://www.examples.com/foo") }.isFailure() assertThat { readFeed("https://www.thauvin.net/foo") }.isFailure()
.isInstanceOf(FileNotFoundException::class.java) .isInstanceOf(IOException::class.java)
assertThat { readFeed("https://www.examplesfoo.com/") }.isFailure() assertThat { readFeed("https://www.examplesfoo.com/") }.isFailure()
.isInstanceOf(UnknownHostException::class.java) .isInstanceOf(UnknownHostException::class.java)

View file

@ -36,6 +36,7 @@ import assertk.assertThat
import assertk.assertions.any import assertk.assertions.any
import assertk.assertions.contains import assertk.assertions.contains
import assertk.assertions.isEqualTo import assertk.assertions.isEqualTo
import assertk.assertions.isGreaterThan
import assertk.assertions.isInstanceOf import assertk.assertions.isInstanceOf
import assertk.assertions.matches import assertk.assertions.matches
import assertk.assertions.prop import assertk.assertions.prop
@ -79,7 +80,7 @@ class CurrencyConverterTest {
fun testCurrencyRates() { fun testCurrencyRates() {
val rates = currencyRates() val rates = currencyRates()
assertThat(rates).all { assertThat(rates).all {
size().isEqualTo(33) size().isGreaterThan(30)
any { it.matches("[A-Z]{3}: +[\\d.]+".toRegex()) } any { it.matches("[A-Z]{3}: +[\\d.]+".toRegex()) }
contains("EUR: 1") contains("EUR: 1")
} }

View file

@ -1,9 +1,9 @@
#Generated by the Semver Plugin for Gradle #Generated by the Semver Plugin for Gradle
#Mon Feb 14 23:01:11 PST 2022 #Wed Mar 23 11:53:53 PDT 2022
version.buildmeta=024 version.buildmeta=035
version.major=0 version.major=0
version.minor=8 version.minor=8
version.patch=0 version.patch=0
version.prerelease=rc version.prerelease=rc
version.project=mobibot version.project=mobibot
version.semver=0.8.0-rc+024 version.semver=0.8.0-rc+035