From 7c1760c775045ca166670030b2113883d6e923b3 Mon Sep 17 00:00:00 2001 From: xing_xing1992 Date: Sat, 7 Jan 2023 19:40:51 +0800 Subject: [PATCH] Fixed JaCoCo build cache --- 0001-Fixed-JaCoCo-build-cache-issue.patch | 59 +++++++++++++++++++++++ mockito.spec | 9 ++-- 2 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 0001-Fixed-JaCoCo-build-cache-issue.patch diff --git a/0001-Fixed-JaCoCo-build-cache-issue.patch b/0001-Fixed-JaCoCo-build-cache-issue.patch new file mode 100644 index 0000000..0fd621e --- /dev/null +++ b/0001-Fixed-JaCoCo-build-cache-issue.patch @@ -0,0 +1,59 @@ +From 6ad1135eb4b93e5aa2866f27bb933b28edc0da2a Mon Sep 17 00:00:00 2001 +From: Szczepan Faber +Date: Fri, 30 Nov 2018 09:25:54 -0800 +Subject: [PATCH] Fixed JaCoCo build cache issue + +Jacoco Gradle plugin breaks cacheability, hence we only configure the plugin on demand. + +Bumped Build Scans plugin so that it is easier to debug build cache issues. + +This PR is needed for #1546 +--- + .travis.yml | 2 +- + build.gradle | 2 +- + gradle/root/coverage.gradle | 8 ++++++++ + 3 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/.travis.yml b/.travis.yml +index 1178b3bdc..2fc50f19a 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -58,5 +58,5 @@ script: + + after_success: + #Generates coverage report: +- - ./gradlew --stacktrace coverageReport && cp build/reports/jacoco/mockitoCoverage/mockitoCoverage.xml jacoco.xml || echo "Code coverage failed" ++ - ./gradlew coverageReport -Pjacoco -s && cp build/reports/jacoco/mockitoCoverage/mockitoCoverage.xml jacoco.xml || echo "Code coverage failed" + - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports" +diff --git a/build.gradle b/build.gradle +index b6f4a2ddc..a4c37d26b 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -16,7 +16,7 @@ buildscript { + } + + plugins { +- id 'com.gradle.build-scan' version '1.15.1' ++ id 'com.gradle.build-scan' version '1.16' + } + + description = 'Mockito mock objects library core API and implementation' +diff --git a/gradle/root/coverage.gradle b/gradle/root/coverage.gradle +index 6b8f0c788..2abed4ad5 100644 +--- a/gradle/root/coverage.gradle ++++ b/gradle/root/coverage.gradle +@@ -1,3 +1,11 @@ ++if (!project.hasProperty("jacoco")) { ++ //JaCoCo plugin prevents using Build Cache. We will enable jacoco configuration only when specific property is supplied ++ logger.info "JaCoCo code coverage will not be configured because 'jacoco' project property is not present." ++ return //don't evaluate this Gradle file any further ++} else { ++ logger.lifecycle "Configuring JaCoCo code coverage because 'jacoco' project property is present." ++} ++ + //TODO: Standard JaCoCo coverage doesn't work in Android module + task mockitoCoverage(type: JacocoReport) { + +-- +2.39.0.windows.2 + diff --git a/mockito.spec b/mockito.spec index 4f7685d..aac96c9 100644 --- a/mockito.spec +++ b/mockito.spec @@ -1,6 +1,6 @@ Name: mockito Version: 2.23.9 -Release: 3 +Release: 4 Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -9,6 +9,7 @@ Source0: https://github.com/mockito/mockito/archive/v%{version}/mock Source1: make-mockito-sourcetarball.sh Source2: mockito-core.pom Patch0: use-unbundled-asm.patch +Patch1: 0001-Fixed-JaCoCo-build-cache-issue.patch BuildRequires: maven-local mvn(junit:junit) mvn(net.bytebuddy:byte-buddy) BuildRequires: mvn(net.bytebuddy:byte-buddy-agent) mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.assertj:assertj-core) mvn(org.codehaus.mojo:exec-maven-plugin) @@ -26,8 +27,7 @@ Summary: Javadocs for %{name} This package contains the API documentation for %{name}. %prep -%setup -q -%patch0 +%autosetup -n %{name}-%{version} -p1 rm -rf src/test/java/org/mockitousage/serialization/DeepStubsSerializableTest.java rm -rf src/test/java/org/mockitousage/serialization/ParallelSerializationTest.java rm -rf src/test/java/org/mockitousage/serialization/AcrossClassLoaderSerializationTest.java @@ -56,6 +56,9 @@ EOF %license LICENSE %changelog +* Sat Jan 07 2023 xingxing - 1.2.16-5 +- Fixed JaCoCo build cache + * Fri Nov 11 2022 xu_ping - 2.23.9-3 - change source and url -- Gitee