Test Java 14 and 15

.github/workflows/ci.yml

@@ -24,11 +24,13 @@ jobs:
       matrix:
         java-version:
           - "1.8"
-          - "9.0"
-          - "10.0"
-          - "11.0"
-          - "12.0"
-          - "13.0"
+          - "9"
+          - "10"
+          - "11"
+          - "12"
+          - "13"
+          - "14"
+          - "15"
 
     steps:
       - uses: actions/checkout@master

README.md

@@ -2,7 +2,7 @@
 
 [![Maven Central](https://img.shields.io/maven-central/v/com.stripe/stripe-java)](https://mvnrepository.com/artifact/com.stripe/stripe-java)
 [![JavaDoc](http://img.shields.io/badge/javadoc-reference-blue.svg)](https://stripe.dev/stripe-java)
-[![Build Status](https://travis-ci.org/stripe/stripe-java.svg?branch=master)](https://travis-ci.org/stripe/stripe-java)
+[![Build Status](https://github.com/stripe/stripe-java/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/stripe/stripe-java/actions?query=branch%3Amaster)
 
 The official [Stripe][stripe] Java client library.
 
@@ -37,7 +37,7 @@ Add this dependency to your project's POM:
 You'll need to manually install the following JARs:
 
 - The Stripe JAR from <https://github.com/stripe/stripe-java/releases/latest>
-- [Google Gson][gson] from <https://repo1.maven.org/maven2/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar>.
+- [Google Gson][gson] from <https://repo1.maven.org/maven2/com/google/code/gson/gson/2.8.8/gson-2.8.8.jar>.
 
 ### [ProGuard][proguard]
 

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         //Add only for SNAPSHOT versions
         //maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
@@ -13,11 +13,11 @@ plugins {
     id "java"
     id "maven"
     id "jacoco"
-    id "io.freefair.lombok" version "5.2.1"
-    id "com.diffplug.spotless" version "5.7.0"
-    id "net.ltgt.errorprone" version "1.3.0"
-    id "com.github.kt3k.coveralls" version "2.10.2"
-    id "biz.aQute.bnd.builder" version "5.2.0"
+    id "io.freefair.lombok" version "5.3.3.3" // 5.3 branch is the last branch compatible with Gradle 6
+    id "com.diffplug.spotless" version "5.14.3"
+    id "net.ltgt.errorprone" version "2.0.2"
+    id "com.github.kt3k.coveralls" version "2.12.0"
+    id "biz.aQute.bnd.builder" version "5.3.0"
     id "org.ajoberstar.git-publish" version "3.0.0"
 }
 
@@ -56,19 +56,19 @@ configurations.all {
 }
 
 repositories {
-     jcenter()
+     mavenCentral()
 }
 
 dependencies {
-    errorprone group: "com.google.errorprone", name: "error_prone_core", version: "2.4.0"
+    errorprone group: "com.google.errorprone", name: "error_prone_core", version: "2.9.0"
     errorproneJavac group: "com.google.errorprone", name: "javac", version:"9+181-r4173-1"
-    implementation group: "com.google.code.gson", name: "gson", version:"2.8.6"
-    testImplementation group: "com.google.guava", name: "guava", version:"30.0-jre"
-    testImplementation group: "com.squareup.okhttp3", name: "mockwebserver", version: "4.9.0"
-    testImplementation group: "org.mockito", name: "mockito-core", version:"3.5.15"
-    testImplementation group: "org.junit.jupiter", name: "junit-jupiter-api", version: "5.7.0"
-    testRuntimeOnly group: "org.junit.jupiter", name: "junit-jupiter-engine", version: "5.7.0"
-    testRuntimeOnly group: "org.slf4j", name: "slf4j-api", version: "1.7.30"
+    implementation group: "com.google.code.gson", name: "gson", version:"2.8.8"
+    testImplementation group: "com.google.guava", name: "guava", version:"30.1.1-jre"
+    testImplementation group: "com.squareup.okhttp3", name: "mockwebserver", version: "4.9.1"
+    testImplementation group: "org.mockito", name: "mockito-core", version:"3.12.4"
+    testImplementation group: "org.junit.jupiter", name: "junit-jupiter-api", version: "5.7.2"
+    testRuntimeOnly group: "org.junit.jupiter", name: "junit-jupiter-engine", version: "5.7.2"
+    testRuntimeOnly group: "org.slf4j", name: "slf4j-api", version: "1.7.32"
 }
 
 jar {
@@ -84,7 +84,7 @@ jar {
 }
 
 lombok {
-    version = "1.18.16"
+    version = "1.18.20"
     config['lombok.addLombokGeneratedAnnotation'] = 'true'
     config['lombok.getter.noIsPrefix'] = 'true'
 }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell