Skip to content

Commit dc859b6

Browse files
ci: remove hardcoded Gradle version and rely on Gradle wrapper (#92)
1 parent c461d39 commit dc859b6

1 file changed

Lines changed: 21 additions & 27 deletions

File tree

.github/workflows/android-kit-push.yml

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,11 @@ jobs:
2727
distribution: "zulu"
2828
java-version: "17"
2929
cache: "gradle"
30+
- name: "Setup Gradle"
31+
uses: gradle/actions/setup-gradle@v5
3032
- name: Clean and Run Unit Tests
3133
continue-on-error: true
32-
uses: gradle/gradle-build-action@v2
33-
with:
34-
gradle-version: 7.5.1
35-
arguments: clean assemble test
34+
run: ./gradlew clean assemble test
3635
- name: "Archive Test Results"
3736
uses: actions/upload-artifact@v4
3837
if: ${{ always() }}
@@ -63,6 +62,8 @@ jobs:
6362
distribution: "zulu"
6463
java-version: "17"
6564
cache: "gradle"
65+
- name: "Setup Gradle"
66+
uses: gradle/actions/setup-gradle@v5
6667
- name: "Build Core"
6768
working-directory: core
6869
run: ./gradlew publishLocal -PisRelease=true
@@ -80,11 +81,8 @@ jobs:
8081
echo $VERSION;
8182
echo "coreVersion=$VERSION" >> $GITHUB_OUTPUT
8283
- name: "Clean and Run Unit Tests"
83-
uses: gradle/gradle-build-action@v2
84-
with:
85-
gradle-version: 7.5.1
86-
build-root-directory: kit
87-
arguments: clean assemble test -Pversion=${{ steps.core-version.outputs.coreVersion }}
84+
working-directory: kit
85+
run: ./gradlew clean assemble test -Pversion=${{ steps.core-version.outputs.coreVersion }}
8886
- name: "Archive Test Results"
8987
uses: actions/upload-artifact@v4
9088
if: ${{ always() }}
@@ -107,12 +105,11 @@ jobs:
107105
distribution: "zulu"
108106
java-version: "17"
109107
cache: "gradle"
108+
- name: "Setup Gradle"
109+
uses: gradle/actions/setup-gradle@v5
110110
- name: "Run Lint"
111-
uses: gradle/gradle-build-action@v2
112111
continue-on-error: true
113-
with:
114-
gradle-version: 7.5.1
115-
arguments: lint
112+
run: ./gradlew lint
116113
- name: "Archive Lint Results"
117114
uses: actions/upload-artifact@v4
118115
if: ${{ always() }}
@@ -143,6 +140,8 @@ jobs:
143140
distribution: "zulu"
144141
java-version: "17"
145142
cache: "gradle"
143+
- name: "Setup Gradle"
144+
uses: gradle/actions/setup-gradle@v5
146145
- name: "Build Core"
147146
working-directory: core
148147
run: ./gradlew publishLocal -PisRelease=true
@@ -160,11 +159,8 @@ jobs:
160159
echo $VERSION;
161160
echo "coreVersion=$VERSION" >> $GITHUB_OUTPUT
162161
- name: "Clean and Run Unit Tests"
163-
uses: gradle/gradle-build-action@v2
164-
with:
165-
gradle-version: 7.5.1
166-
build-root-directory: kit
167-
arguments: lint -Pversion=${{ steps.core-version.outputs.coreVersion }}
162+
working-directory: kit
163+
run: ./gradlew lint -Pversion=${{ steps.core-version.outputs.coreVersion }}
168164
- name: "Archive Lint Results"
169165
uses: actions/upload-artifact@v4
170166
if: ${{ always() }}
@@ -187,12 +183,11 @@ jobs:
187183
distribution: "zulu"
188184
java-version: "17"
189185
cache: "gradle"
186+
- name: "Setup Gradle"
187+
uses: gradle/actions/setup-gradle@v5
190188
- name: "Run Kotlin Lint"
191-
uses: gradle/gradle-build-action@v2
192189
continue-on-error: true
193-
with:
194-
gradle-version: 7.5.1
195-
arguments: ktlintCheck
190+
run: ./gradlew ktlintCheck
196191
- name: "Archive Lint Results"
197192
uses: actions/upload-artifact@v4
198193
if: ${{ always() }}
@@ -223,6 +218,8 @@ jobs:
223218
distribution: "zulu"
224219
java-version: "17"
225220
cache: "gradle"
221+
- name: "Setup Gradle"
222+
uses: gradle/actions/setup-gradle@v5
226223
- name: "Build Core"
227224
working-directory: core
228225
run: ./gradlew publishLocal -PisRelease=true
@@ -240,11 +237,8 @@ jobs:
240237
echo $VERSION;
241238
echo "coreVersion=$VERSION" >> $GITHUB_OUTPUT
242239
- name: "Clean and Run Unit Tests"
243-
uses: gradle/gradle-build-action@v2
244-
with:
245-
gradle-version: 7.5.1
246-
build-root-directory: kit
247-
arguments: ktlintCheck -Pversion=${{ steps.core-version.outputs.coreVersion }}
240+
working-directory: kit
241+
run: ./gradlew ktlintCheck -Pversion=${{ steps.core-version.outputs.coreVersion }}
248242
- name: "Archive Lint Results"
249243
uses: actions/upload-artifact@v4
250244
if: ${{ always() }}

0 commit comments

Comments
 (0)