From ec049c748588170f9cea1c1b537913b291cb39c8 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 10 May 2021 15:57:02 -0700 Subject: [PATCH] Updated to JDK >= 11 on CIs and switched to Gradle 7.0.1 --- .circleci/config.yml | 8 ++++---- .gitlab-ci.yml | 2 +- .travis.yml | 2 +- build.gradle | 4 +++- gradle/wrapper/gradle-wrapper.properties | 2 +- version.properties | 6 +++--- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 41e99be..33e114d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,11 +30,11 @@ defaults_gradle: &defaults_gradle path: build/reports/ jobs: - build_gradle_jdk15: + build_gradle_jdk16: <<: *defaults docker: - - image: cimg/openjdk:15.0.2 + - image: cimg/openjdk:16.0.0 <<: *defaults_gradle @@ -42,7 +42,7 @@ jobs: <<: *defaults docker: - - image: cimg/openjdk:11.0.7 + - image: cimg/openjdk:11.0.10 <<: *defaults_gradle @@ -51,5 +51,5 @@ workflows: gradle: jobs: - build_gradle_jdk11 - - build_gradle_jdk15 + - build_gradle_jdk16 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e06d44..4b01f79 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: openjdk:11-jdk-slim +image: gradle:7-jdk11 variables: GRADLE_OPTS: "-Dorg.gradle.daemon=false" diff --git a/.travis.yml b/.travis.yml index 83aefb4..84c808c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ addons: jdk: - openjdk11 - - openjdk14 + - openjdk15 before_install: - chmod +x gradlew diff --git a/build.gradle b/build.gradle index d55ba00..d5efd48 100644 --- a/build.gradle +++ b/build.gradle @@ -57,7 +57,6 @@ dependencies { implementation 'net.thauvin.erik:cryptoprice:0.9.0-SNAPSHOT' implementation 'net.thauvin.erik:pinboard-poster:1.0.3' - implementation 'org.json:json:20210307' implementation 'org.jsoup:jsoup:1.13.1' implementation 'org.twitter4j:twitter4j-core:4.0.7' @@ -73,6 +72,9 @@ dependencies { } test { + testLogging { + exceptionFormat "full" + } useTestNG() { options.suites('src/test/resources/testng.xml') } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643..e5338d3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME 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 zipStorePath=wrapper/dists diff --git a/version.properties b/version.properties index f827da8..4d6d016 100644 --- a/version.properties +++ b/version.properties @@ -1,9 +1,9 @@ #Generated by the Semver Plugin for Gradle -#Sat May 08 02:52:53 PDT 2021 -version.buildmeta=688 +#Mon May 10 15:50:39 PDT 2021 +version.buildmeta=696 version.major=0 version.minor=8 version.patch=0 version.prerelease=beta version.project=mobibot -version.semver=0.8.0-beta+688 +version.semver=0.8.0-beta+696