From 9698719d3b5f8e462b320c3b0686ade765186302 Mon Sep 17 00:00:00 2001
From: Luciano Balmaceda <balmacedaluciano@gmail.com>
Date: Tue, 29 Jun 2021 16:55:26 +0200
Subject: [PATCH 1/3] use newer OSS plugin version

---
 lib/build.gradle | 20 --------------------
 settings.gradle  |  2 +-
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index c121e9e6..968bebc2 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -30,33 +30,13 @@ oss {
     }
 }
 
-def javaVersion = 8
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-}
-
 compileJava {
     exclude 'module-info.java'
-
-    options.compilerArgs = ['--release', "$javaVersion"]
-}
-
-// Use latest JDK for javadoc generation
-tasks.withType(Javadoc).configureEach {
-    javadocTool = javaToolchains.javadocToolFor {
-        languageVersion = JavaLanguageVersion.of(16)
-    }
 }
 
 javadoc {
     // Exclude internal implementation package from javadoc
     excludes = ['com/auth0/jwt/impl', 'module-info.java']
-    // Specify Java version this project uses
-    // Otherwise would use version of javadoc toolchain by default which could
-    // cause compilation error mismatch between compileJava and javadoc creation
-    options.addStringOption('-release', "$javaVersion")
 }
 
 dependencies {
diff --git a/settings.gradle b/settings.gradle
index 7faf41ff..cb0a7603 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,7 +4,7 @@ pluginManagement {
     }
     plugins {
         id 'com.jfrog.bintray' version '1.8.5'
-        id 'com.auth0.gradle.oss-library.java' version '0.15.1'
+        id 'com.auth0.gradle.oss-library.java' version '0.16.0'
     }
 }
 

From 198fe77638ba0651e98e904a4a855fe43a400b88 Mon Sep 17 00:00:00 2001
From: Luciano Balmaceda <balmacedaluciano@gmail.com>
Date: Tue, 29 Jun 2021 16:55:44 +0200
Subject: [PATCH 2/3] remove unused bintray plugin

---
 lib/build.gradle | 1 -
 settings.gradle  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 968bebc2..974a882f 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'java'
     id 'jacoco'
-    id 'com.jfrog.bintray'
     id 'com.auth0.gradle.oss-library.java'
 }
 
diff --git a/settings.gradle b/settings.gradle
index cb0a7603..b614415b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,7 +3,6 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        id 'com.jfrog.bintray' version '1.8.5'
         id 'com.auth0.gradle.oss-library.java' version '0.16.0'
     }
 }

From f5fd7603850fcd57525b0436ba51fb0af5e164d5 Mon Sep 17 00:00:00 2001
From: Luciano Balmaceda <balmacedaluciano@gmail.com>
Date: Thu, 1 Jul 2021 19:00:15 +0200
Subject: [PATCH 3/3] add back toolchains block

---
 lib/build.gradle | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/build.gradle b/lib/build.gradle
index 974a882f..1164fb5e 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -29,6 +29,12 @@ oss {
     }
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
 compileJava {
     exclude 'module-info.java'
 }