build!: Dropping Java 7 support (#962)

* build: updating hamcrest-library to 2.2
* build: updating mockito-core to 4.1.0
* build: upgrade gradle wrapper to 4.10.1

.travis.yml

@@ -15,10 +15,9 @@ dist: trusty
 # Test against multiple JDKs to verify compatibility
 jdk:
   # Re-enable when TravisCI supports Gradle >= 4.3
-  # - oraclejdk9
+  - oraclejdk9
   - oraclejdk8
   - openjdk8
-  - openjdk7
 
 # Use JDK8 for startup, since JDK7 has issues with TLS when downloading plugins
 install:

build.gradle

@@ -10,7 +10,7 @@ apply plugin: 'signing'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 
-sourceCompatibility = 1.7
+sourceCompatibility = 1.8
 
 group = 'com.box'
 archivesBaseName = 'box-java-sdk'
@@ -50,20 +50,20 @@ dependencies {
     // Do not update to latest version, as v1.57 is needed for FIPS compliance purposes
     compile 'org.bouncycastle:bcpkix-jdk15on:1.57'
     testCompile 'junit:junit:4.13.2'
-    testCompile 'org.hamcrest:hamcrest-library:1.3'
+    testCompile 'org.hamcrest:hamcrest-library:2.2'
     testCompile 'com.github.tomakehurst:wiremock:2.27.2'
-    testCompile 'org.mockito:mockito-core:1.9.5'
+    testCompile 'org.mockito:mockito-core:4.1.0'
     testCompile 'org.slf4j:slf4j-nop:1.7.32'
     exampleCompile 'com.eclipsesource.minimal-json:minimal-json:0.9.5'
     checkstyle 'com.puppycrawl.tools:checkstyle:6.19'
     intTestImplementation 'junit:junit:4.13.2'
-    intTestImplementation 'org.hamcrest:hamcrest-library:1.3'
-    intTestImplementation 'org.mockito:mockito-core:1.9.5'
+    intTestImplementation 'org.hamcrest:hamcrest-library:2.2'
+    intTestImplementation 'org.mockito:mockito-core:4.1.0'
 }
 
 compileJava {
-    sourceCompatibility = 1.7
-    targetCompatibility = 1.7
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
 }
 
 javadoc {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Sep 09 10:02:33 CEST 2021
+#Tue Dec 14 13:15:46 CET 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip

src/intTest/java/com/box/sdk/BoxFileIT.java

@@ -11,12 +11,12 @@
 import static com.box.sdk.UniqueTestFolder.uploadTwoFileVersionsToUniqueFolder;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.emptyOrNullString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
@@ -26,11 +26,11 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.longThat;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.hamcrest.MockitoHamcrest.longThat;
 
 import com.box.sdk.sharedlink.BoxSharedLinkRequest;
 import java.io.ByteArrayInputStream;
@@ -415,7 +415,7 @@ public void deleteVersionSucceeds() {
             previousVersion.delete();
 
             Collection<BoxFileVersion> versionsAfterRemove = uploadedFile.getVersions();
-            assertThat(versionsAfterRemove, Matchers.<BoxFileVersion>hasSize(1));
+            assertThat(versionsAfterRemove, Matchers.hasSize(1));
         } finally {
             this.deleteFile(uploadedFile);
         }
@@ -430,7 +430,7 @@ public void shouldReturnTrashedAtForADeleteVersion() {
             uploadedFile = uploadFileToUniqueFolder(api, fileName, "Test file");
             uploadedFile.uploadNewVersion(this.getFileContent("Version 2"));
             Collection<BoxFileVersion> versions = uploadedFile.getVersions();
-            assertThat(versions, Matchers.<BoxFileVersion>hasSize(1));
+            assertThat(versions, Matchers.hasSize(1));
 
             BoxFileVersion version = versions.iterator().next();
             assertThat(version.getTrashedAt(), is(nullValue()));
@@ -606,7 +606,7 @@ public void createAndUpdateSharedLinkSucceeds() {
             permissions.setCanPreview(true);
             BoxSharedLink sharedLink = uploadedFile.createSharedLink(OPEN, null, permissions);
 
-            assertThat(sharedLink.getURL(), not(isEmptyOrNullString()));
+            assertThat(sharedLink.getURL(), not(is(emptyOrNullString())));
 
             sharedLink.getPermissions().setCanDownload(false);
             BoxFile.Info info = uploadedFile.new Info();
@@ -741,7 +741,7 @@ public void getPreviewLink() {
             URL uploadedFilePreviewLink = uploadedFile.getPreviewLink();
 
             assertThat(uploadedFilePreviewLink, is(notNullValue()));
-            assertThat(uploadedFilePreviewLink.toString(), not(isEmptyOrNullString()));
+            assertThat(uploadedFilePreviewLink.toString(), not(is(emptyOrNullString())));
         } finally {
             this.deleteFile(uploadedFile);
         }
@@ -758,7 +758,7 @@ public void getDownloadURL() {
             URL uploadedFileDownloadURL = uploadedFile.getDownloadURL();
 
             assertThat(uploadedFileDownloadURL, is(notNullValue()));
-            assertThat(uploadedFileDownloadURL.toString(), not(isEmptyOrNullString()));
+            assertThat(uploadedFileDownloadURL.toString(), not(is(emptyOrNullString())));
         } finally {
             this.deleteFile(uploadedFile);
         }