Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade gradle version to 6.9.2 #107

Merged
merged 9 commits into from
Dec 21, 2023
Merged

Upgrade gradle version to 6.9.2 #107

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4403a12
Test github actions for CI
andrewmains12 Jun 5, 2022
dec09d0
Merge branch 'uber-java:master' into master
andrewmains12 Jun 5, 2022
123165b
Update gradle.yml
andrewmains12 Jun 5, 2022
c479da3
Add junit reporting
andrewmains12 Jun 5, 2022
c5fe6f5
Upgrade gradle version to 6.9.2
andrewmains12 Jun 5, 2022
eed7f6a
WIP: fail test
andrewmains12 Jun 5, 2022
3a075fb
Merge branch 'master' into amains/build/upgrade_gradle
SokolAndrey Dec 21, 2023
3f04ea6
Remove action to publish test results
SokolAndrey Dec 21, 2023
fcf4d5f
Remove failing test
SokolAndrey Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '8'
distribution: 'temurin'
- name: Build with Gradle
uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
with:
arguments: build
11 changes: 6 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,10 @@ subprojects {

ext."signing.secretKeyRingFile" = "ci/${ext.secretKeyRingFileName}"

task wrapper(type: Wrapper) {

wrapper {
// Gradle version 4+ required for JMH benchmarking, otherwise v3.5+ is sufficient
gradleVersion = '4.0'
gradleVersion = '6.9'
}

// --------------------------------------
Expand All @@ -183,9 +184,9 @@ coveralls {

task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
dependsOn = subprojects.test
sourceDirectories = files(subprojects.sourceSets.main.allSource.srcDirs)
classDirectories = files(subprojects.sourceSets.main.output.classesDirs)
executionData = files(subprojects.jacocoTestReport.executionData)
sourceDirectories.setFrom(files(subprojects.sourceSets.main.allSource.srcDirs))
classDirectories.setFrom(files(subprojects.sourceSets.main.output.classesDirs))
executionData.setFrom(files(subprojects.jacocoTestReport.executionData))

reports {
xml.enabled = true
Expand Down
1 change: 1 addition & 0 deletions core/src/test/java/com/uber/m3/tally/BucketPairImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public void bucketPairs() {
expectedPairs,
BucketPairImpl.bucketPairs(ValueBuckets.linear(0, 50, 3))
);
throw new RuntimeException("amainsd: intentional");
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Fri Dec 25 03:30:51 CET 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down
Loading