From f614d5f70521a159a47a92546b2313cc7d836594 Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Tue, 16 Jun 2020 23:53:33 +0500 Subject: [PATCH 1/2] updated gradle version to gradle 6 --- build.gradle | 19 ++++++++++++------- .../ab/OptimizelyHttpClientTest.java | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 5f6d659fa..881e9bea7 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,7 @@ plugins { id 'me.champeau.gradle.jmh' version '0.4.5' id 'nebula.optional-base' version '3.2.0' id 'com.github.hierynomus.license' version '0.15.0' + id 'com.github.spotbugs' version "4.3.0" } allprojects { @@ -44,7 +45,7 @@ allprojects { subprojects { apply plugin: 'com.jfrog.bintray' - apply plugin: 'findbugs' + apply plugin: 'com.github.spotbugs' apply plugin: 'jacoco' apply plugin: 'java' apply plugin: 'maven-publish' @@ -52,11 +53,15 @@ subprojects { apply plugin: 'nebula.optional-base' apply plugin: 'com.github.hierynomus.license' + sourceCompatibility = 1.8 targetCompatibility = 1.8 repositories { jcenter() + maven { + url 'https://plugins.gradle.org/m2/' + } } task sourcesJar(type: Jar, dependsOn: classes) { @@ -74,15 +79,15 @@ subprojects { archives javadocJar } - tasks.withType(FindBugs) { + spotbugsMain { reports { xml.enabled = false html.enabled = true } } - findbugs { - findbugsJmh.enabled = false + spotbugs { + spotbugsJmh.enabled = false } test { @@ -207,9 +212,9 @@ task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') { description = 'Generates an aggregate report from all subprojects' dependsOn publishedProjects.test, jacocoMerge - additionalSourceDirs = files(publishedProjects.sourceSets.main.allSource.srcDirs) - sourceDirectories = files(publishedProjects.sourceSets.main.allSource.srcDirs) - classDirectories = files(publishedProjects.sourceSets.main.output) + getAdditionalSourceDirs().setFrom(files(publishedProjects.sourceSets.main.allSource.srcDirs)) + getSourceDirectories().setFrom(files(publishedProjects.sourceSets.main.allSource.srcDirs)) + getAdditionalClassDirs().setFrom(files(publishedProjects.sourceSets.main.output)) executionData jacocoMerge.destinationFile reports { diff --git a/core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyHttpClientTest.java b/core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyHttpClientTest.java index a67e61501..f51ccac1e 100644 --- a/core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyHttpClientTest.java +++ b/core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyHttpClientTest.java @@ -73,7 +73,7 @@ public void testProxySettings() throws IOException { @Test public void testExecute() throws IOException { HttpUriRequest httpUriRequest = RequestBuilder.get().build(); - ResponseHandler responseHandler = response -> null; + ResponseHandler responseHandler = response -> false; CloseableHttpClient mockHttpClient = mock(CloseableHttpClient.class); when(mockHttpClient.execute(httpUriRequest, responseHandler)).thenReturn(true); diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d75ee9126..a9a50f830 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip From 7f32015e0fd2d0595350fe9d9f7a79e5bd39259e Mon Sep 17 00:00:00 2001 From: Muhammad Noman Date: Wed, 17 Jun 2020 17:16:09 +0500 Subject: [PATCH 2/2] updated header --- .../test/java/com/optimizely/ab/OptimizelyHttpClientTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyHttpClientTest.java b/core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyHttpClientTest.java index f51ccac1e..8b92e6fc1 100644 --- a/core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyHttpClientTest.java +++ b/core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyHttpClientTest.java @@ -1,6 +1,6 @@ /** * - * Copyright 2019, Optimizely + * Copyright 2019-2020, Optimizely * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.