Skip to content

Commit d54ced2

Browse files
Merge pull request #126 from stewartbryson/stewart
Gradle and plugin upgrades.
2 parents a5c01da + 9544599 commit d54ced2

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

.github/workflows/gradle-pr.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ jobs:
6363
with:
6464
credentials_json: ${{ secrets.GOOGLE_CREDENTIALS }}
6565

66+
- name: Setup Gradle
67+
uses: gradle/actions/setup-gradle@v4
68+
6669
- name: Gradle build and test
6770
id: gradle-build
68-
uses: gradle/gradle-build-action@v3
69-
with:
70-
arguments: build validatePlugin functionalTest integrationTest buildDashboard --scan -S
71-
cache-read-only: ${{ github.base_ref == 'main' }}
71+
run: ./gradlew build validatePlugin functionalTest integrationTest buildDashboard --scan -S
7272

7373
- name: Publish tests
7474
id: publish-tests
@@ -121,8 +121,9 @@ jobs:
121121
env:
122122
SNOW_CONFIG: ${{secrets.SNOW_CONFIG}}
123123

124+
- name: Setup Gradle
125+
uses: gradle/actions/setup-gradle@v4
126+
124127
- name: ${{ matrix.directory }}
125-
uses: gradle/gradle-build-action@v3
126-
with:
127-
arguments: matrixStrategy -Psnowflake.useEphemeral=true -S
128-
build-root-directory: examples/${{ matrix.directory }}
128+
working-directory: examples/${{ matrix.directory }}
129+
run: ./gradlew matrixStrategy -Psnowflake.useEphemeral=true -S

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.github.ben-manes.versions" version "0.51.0"
2+
id "com.github.ben-manes.versions" version "0.52.0"
33
id "build-dashboard"
44
id 'idea'
55
}

gradle/wrapper/gradle-wrapper.jar

79 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum

plugin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'com.gradle.plugin-publish' version '1.3.0'
2+
id 'com.gradle.plugin-publish' version '1.3.1'
33
id 'groovy'
44
id 'java-library'
55
id 'com.adarshr.test-logger' version '4.0.0'

src/examples/java-testing/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'groovy' // needed for Spock testing framework
44
id 'io.github.stewartbryson.snowflake' version '@version@'
55
id 'com.adarshr.test-logger' version '4.0.0' // added for testing
6-
id 'com.github.ben-manes.versions' version '0.51.0'
6+
id 'com.github.ben-manes.versions' version '0.52.0'
77
}
88

99
repositories {

src/examples/scala/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'scala'
3-
id 'com.github.ben-manes.versions' version '0.51.0'
3+
id 'com.github.ben-manes.versions' version '0.52.0'
44
id 'io.github.stewartbryson.snowflake' version '@version@'
55
}
66

0 commit comments

Comments
 (0)