From 750844a8d327f8dd907681dff554b45b0a8bd0e1 Mon Sep 17 00:00:00 2001 From: bobbylight Date: Sat, 26 Oct 2024 11:05:22 -0400 Subject: [PATCH 1/5] Bumping gradle and junit versions --- build.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index d60ee78e5..941fc1a46 100755 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ allprojects { } wrapper { - gradleVersion = '8.10' + gradleVersion = '8.10.2' } } @@ -74,10 +74,10 @@ subprojects { } dependencies { - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2' - testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.3' testImplementation 'org.mockito:mockito-inline:4.11.0' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.3' } compileJava { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b4155..df97d72b8 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From a376dd112d87418065b1d1c3711283e4608b098a Mon Sep 17 00:00:00 2001 From: bobbylight Date: Sat, 26 Oct 2024 12:14:11 -0400 Subject: [PATCH 2/5] Preparing for 3.5.2 release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 69115b42f..860b3a9d5 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Note that Maven- and signing-related properties are in /gradle.properties javaVersion=1.8 -version=3.5.2-SNAPSHOT +version=3.5.2 # Ugh, see https://github.com/gradle/gradle/issues/11308 systemProp.org.gradle.internal.publish.checksums.insecure=true From 0aa03d24884c4f44c8ae0a491bfb3b189118e15d Mon Sep 17 00:00:00 2001 From: bobbylight Date: Sun, 10 Nov 2024 16:04:55 -0500 Subject: [PATCH 3/5] Add gradle wrapper validation to CI --- .github/workflows/gradle.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 54735c274..65b110bad 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -21,6 +21,10 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Verify gradle wrapper + uses: gradle/actions/wrapper-validation@v3 + if: matrix.java == '8' + - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v4 with: @@ -30,6 +34,7 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + # Run gradle with xvfb to run the unit tests headlessly - name: Build with Gradle #run: ./gradlew build --warning-mode all uses: hankolsen/xvfb-action@master From bfd5f54914758aa11365b10139d2f27120376329 Mon Sep 17 00:00:00 2001 From: bobbylight Date: Sun, 10 Nov 2024 16:19:11 -0500 Subject: [PATCH 4/5] Remove xvfb-action since it's bundled in Ubuntu CI images --- .github/workflows/gradle.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 65b110bad..c8e7c2d92 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -34,13 +34,10 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - # Run gradle with xvfb to run the unit tests headlessly + # Note: Assumes we're running on Ubuntu + # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md - name: Build with Gradle - #run: ./gradlew build --warning-mode all - uses: hankolsen/xvfb-action@master - with: - run: ./gradlew build jacocoTestReport -xsign -xpublish --warning-mode all - working-directory: ./ #optional + run: xvfb-run ./gradlew build jacocoTestReport -xsign -xpublish --warning-mode all - name: Submit coverage data to codecov uses: codecov/codecov-action@v4 From 69b3c7d91e1cf32480e806334ae69f5e9adb4a36 Mon Sep 17 00:00:00 2001 From: bobbylight Date: Sun, 10 Nov 2024 16:28:42 -0500 Subject: [PATCH 5/5] Bumping version to 3.5.3-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 860b3a9d5..62c1a58ea 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Note that Maven- and signing-related properties are in /gradle.properties javaVersion=1.8 -version=3.5.2 +version=3.5.3-SNAPSHOT # Ugh, see https://github.com/gradle/gradle/issues/11308 systemProp.org.gradle.internal.publish.checksums.insecure=true