From 11a144e98d819953ea539fe23696dfc80a962c2a Mon Sep 17 00:00:00 2001 From: Leandro Borges Ferreira Date: Tue, 31 Jan 2023 10:27:59 +0100 Subject: [PATCH 1/3] Updating gradle and removing retrolambda --- build.gradle | 5 ----- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 38ff1f94..85f80d86 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,4 @@ plugins { - id "me.tatarka.retrolambda" version "3.7.1" id 'java-library' id 'io.github.gradle-nexus.publish-plugin' version '1.1.0' id 'com.diffplug.spotless' version '5.14.0' @@ -37,10 +36,6 @@ dependencies { api 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.0' } -retrolambda { - javaVersion JavaVersion.VERSION_1_7 -} - def localProperties = new Properties() def localPropertiesFile = project.rootProject.file('local.properties') if (localPropertiesFile.exists()) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6623300b..f42e62f3 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-6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From fcf3c86db8f47718192adb72675cec83c438dfa7 Mon Sep 17 00:00:00 2001 From: Leandro Borges Ferreira Date: Tue, 31 Jan 2023 10:43:49 +0100 Subject: [PATCH 2/3] Using setup-java@v3 --- .github/workflows/ci.yml | 4 ++++ .github/workflows/initiate_release.yml | 6 +++++- .github/workflows/javadoc.yml | 6 +++++- .github/workflows/release.yml | 5 ++++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f478592..e2d8d5f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,10 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 + - uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' - name: Commit message lint uses: wagoid/commitlint-github-action@v4 diff --git a/.github/workflows/initiate_release.yml b/.github/workflows/initiate_release.yml index 1de32aa6..59c1c98c 100644 --- a/.github/workflows/initiate_release.yml +++ b/.github/workflows/initiate_release.yml @@ -12,9 +12,13 @@ jobs: name: 🚀 Create release PR runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 # gives the changelog generator access to all previous commits + - uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' - name: Update CHANGELOG.md, build.gradle and push release branch env: diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml index 442416c1..30938502 100644 --- a/.github/workflows/javadoc.yml +++ b/.github/workflows/javadoc.yml @@ -8,9 +8,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: persist-credentials: false + - uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' - name: Set up Node.js 16 uses: actions/setup-node@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c5aa1eb9..da5eba72 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,10 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 - + - uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' - uses: actions/github-script@v5 with: script: | From 9e78d0047a5f36067cb409c51071e47ede0ea447 Mon Sep 17 00:00:00 2001 From: Leandro Borges Ferreira Date: Tue, 31 Jan 2023 12:57:14 +0100 Subject: [PATCH 3/3] Dependencies bump --- build.gradle | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 85f80d86..37f7dfc0 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,8 @@ repositories { maven { url uri('https://repo.maven.apache.org/maven2/') } } +var jackson_version = '2.14.2' + dependencies { sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -24,13 +26,13 @@ dependencies { testImplementation 'com.pholser:junit-quickcheck-generators:0.8.1' testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.2.0' - implementation 'com.google.guava:guava:20.0' - implementation 'com.squareup.okhttp3:okhttp:3.11.0' - implementation 'com.fasterxml.jackson.core:jackson-core:2.9.10' - implementation 'com.fasterxml.jackson.core:jackson-core:2.9.10' - implementation 'com.fasterxml.jackson.core:jackson-annotations:2.9.10' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.10' - implementation 'com.auth0:java-jwt:3.4.0' + implementation 'com.google.guava:guava:31.1-jre' + implementation 'com.squareup.okhttp3:okhttp:4.10.0' + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version" + implementation 'com.auth0:java-jwt:4.2.2' api 'net.sourceforge.streamsupport:streamsupport:1.7.0' api 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.0'