Updated to JDK >= 11 on CIs and switched to Gradle 7.0.1

This commit is contained in:
Erik C. Thauvin 2021-05-10 15:57:02 -07:00
parent f580f0f7f2
commit ec049c7485
6 changed files with 13 additions and 11 deletions

View file

@ -30,11 +30,11 @@ defaults_gradle: &defaults_gradle
path: build/reports/ path: build/reports/
jobs: jobs:
build_gradle_jdk15: build_gradle_jdk16:
<<: *defaults <<: *defaults
docker: docker:
- image: cimg/openjdk:15.0.2 - image: cimg/openjdk:16.0.0
<<: *defaults_gradle <<: *defaults_gradle
@ -42,7 +42,7 @@ jobs:
<<: *defaults <<: *defaults
docker: docker:
- image: cimg/openjdk:11.0.7 - image: cimg/openjdk:11.0.10
<<: *defaults_gradle <<: *defaults_gradle
@ -51,5 +51,5 @@ workflows:
gradle: gradle:
jobs: jobs:
- build_gradle_jdk11 - build_gradle_jdk11
- build_gradle_jdk15 - build_gradle_jdk16

View file

@ -1,4 +1,4 @@
image: openjdk:11-jdk-slim image: gradle:7-jdk11
variables: variables:
GRADLE_OPTS: "-Dorg.gradle.daemon=false" GRADLE_OPTS: "-Dorg.gradle.daemon=false"

View file

@ -14,7 +14,7 @@ addons:
jdk: jdk:
- openjdk11 - openjdk11
- openjdk14 - openjdk15
before_install: before_install:
- chmod +x gradlew - chmod +x gradlew

View file

@ -57,7 +57,6 @@ dependencies {
implementation 'net.thauvin.erik:cryptoprice:0.9.0-SNAPSHOT' implementation 'net.thauvin.erik:cryptoprice:0.9.0-SNAPSHOT'
implementation 'net.thauvin.erik:pinboard-poster:1.0.3' implementation 'net.thauvin.erik:pinboard-poster:1.0.3'
implementation 'org.json:json:20210307' implementation 'org.json:json:20210307'
implementation 'org.jsoup:jsoup:1.13.1' implementation 'org.jsoup:jsoup:1.13.1'
implementation 'org.twitter4j:twitter4j-core:4.0.7' implementation 'org.twitter4j:twitter4j-core:4.0.7'
@ -73,6 +72,9 @@ dependencies {
} }
test { test {
testLogging {
exceptionFormat "full"
}
useTestNG() { useTestNG() {
options.suites('src/test/resources/testng.xml') options.suites('src/test/resources/testng.xml')
} }

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.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View file

@ -1,9 +1,9 @@
#Generated by the Semver Plugin for Gradle #Generated by the Semver Plugin for Gradle
#Sat May 08 02:52:53 PDT 2021 #Mon May 10 15:50:39 PDT 2021
version.buildmeta=688 version.buildmeta=696
version.major=0 version.major=0
version.minor=8 version.minor=8
version.patch=0 version.patch=0
version.prerelease=beta version.prerelease=beta
version.project=mobibot version.project=mobibot
version.semver=0.8.0-beta+688 version.semver=0.8.0-beta+696