From d9a51aa5dec3f1ba61f9d1b5272f16ff3a2bc84b Mon Sep 17 00:00:00 2001 From: Mansi Pandya Date: Wed, 14 Jan 2026 11:46:44 -0500 Subject: [PATCH 1/3] ci: remove hardcoded Gradle version and rely on Gradle wrapper --- .github/workflows/android-kit-push.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/android-kit-push.yml b/.github/workflows/android-kit-push.yml index 3f5f83d..cc623b3 100644 --- a/.github/workflows/android-kit-push.yml +++ b/.github/workflows/android-kit-push.yml @@ -31,7 +31,6 @@ jobs: continue-on-error: true uses: gradle/gradle-build-action@v2 with: - gradle-version: 7.5.1 arguments: clean assemble test - name: "Archive Test Results" uses: actions/upload-artifact@v4 @@ -82,7 +81,6 @@ jobs: - name: "Clean and Run Unit Tests" uses: gradle/gradle-build-action@v2 with: - gradle-version: 7.5.1 build-root-directory: kit arguments: clean assemble test -Pversion=${{ steps.core-version.outputs.coreVersion }} - name: "Archive Test Results" @@ -111,7 +109,6 @@ jobs: uses: gradle/gradle-build-action@v2 continue-on-error: true with: - gradle-version: 7.5.1 arguments: lint - name: "Archive Lint Results" uses: actions/upload-artifact@v4 @@ -162,7 +159,6 @@ jobs: - name: "Clean and Run Unit Tests" uses: gradle/gradle-build-action@v2 with: - gradle-version: 7.5.1 build-root-directory: kit arguments: lint -Pversion=${{ steps.core-version.outputs.coreVersion }} - name: "Archive Lint Results" @@ -191,7 +187,6 @@ jobs: uses: gradle/gradle-build-action@v2 continue-on-error: true with: - gradle-version: 7.5.1 arguments: ktlintCheck - name: "Archive Lint Results" uses: actions/upload-artifact@v4 @@ -242,7 +237,6 @@ jobs: - name: "Clean and Run Unit Tests" uses: gradle/gradle-build-action@v2 with: - gradle-version: 7.5.1 build-root-directory: kit arguments: ktlintCheck -Pversion=${{ steps.core-version.outputs.coreVersion }} - name: "Archive Lint Results" From e7dfa78e64b2870a48c51fb1dec3f355c4da5c76 Mon Sep 17 00:00:00 2001 From: Mansi Pandya Date: Wed, 14 Jan 2026 12:43:14 -0500 Subject: [PATCH 2/3] Address review comments --- .github/workflows/android-kit-push.yml | 42 +++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/android-kit-push.yml b/.github/workflows/android-kit-push.yml index cc623b3..5faee48 100644 --- a/.github/workflows/android-kit-push.yml +++ b/.github/workflows/android-kit-push.yml @@ -27,11 +27,11 @@ jobs: distribution: "zulu" java-version: "17" cache: "gradle" + - name: "Setup Gradle" + uses: gradle/actions/setup-gradle@v3 - name: Clean and Run Unit Tests continue-on-error: true - uses: gradle/gradle-build-action@v2 - with: - arguments: clean assemble test + run: ./gradlew clean assemble test - name: "Archive Test Results" uses: actions/upload-artifact@v4 if: ${{ always() }} @@ -62,6 +62,8 @@ jobs: distribution: "zulu" java-version: "17" cache: "gradle" + - name: "Setup Gradle" + uses: gradle/actions/setup-gradle@v3 - name: "Build Core" working-directory: core run: ./gradlew publishLocal -PisRelease=true @@ -79,10 +81,8 @@ jobs: echo $VERSION; echo "coreVersion=$VERSION" >> $GITHUB_OUTPUT - name: "Clean and Run Unit Tests" - uses: gradle/gradle-build-action@v2 - with: - build-root-directory: kit - arguments: clean assemble test -Pversion=${{ steps.core-version.outputs.coreVersion }} + working-directory: kit + run: ./gradlew clean assemble test -Pversion=${{ steps.core-version.outputs.coreVersion }} - name: "Archive Test Results" uses: actions/upload-artifact@v4 if: ${{ always() }} @@ -105,11 +105,11 @@ jobs: distribution: "zulu" java-version: "17" cache: "gradle" + - name: "Setup Gradle" + uses: gradle/actions/setup-gradle@v3 - name: "Run Lint" - uses: gradle/gradle-build-action@v2 continue-on-error: true - with: - arguments: lint + run: ./gradlew lint - name: "Archive Lint Results" uses: actions/upload-artifact@v4 if: ${{ always() }} @@ -140,6 +140,8 @@ jobs: distribution: "zulu" java-version: "17" cache: "gradle" + - name: "Setup Gradle" + uses: gradle/actions/setup-gradle@v3 - name: "Build Core" working-directory: core run: ./gradlew publishLocal -PisRelease=true @@ -157,10 +159,8 @@ jobs: echo $VERSION; echo "coreVersion=$VERSION" >> $GITHUB_OUTPUT - name: "Clean and Run Unit Tests" - uses: gradle/gradle-build-action@v2 - with: - build-root-directory: kit - arguments: lint -Pversion=${{ steps.core-version.outputs.coreVersion }} + working-directory: kit + run: ./gradlew lint -Pversion=${{ steps.core-version.outputs.coreVersion }} - name: "Archive Lint Results" uses: actions/upload-artifact@v4 if: ${{ always() }} @@ -183,11 +183,11 @@ jobs: distribution: "zulu" java-version: "17" cache: "gradle" + - name: "Setup Gradle" + uses: gradle/actions/setup-gradle@v3 - name: "Run Kotlin Lint" - uses: gradle/gradle-build-action@v2 continue-on-error: true - with: - arguments: ktlintCheck + run: ./gradlew ktlintCheck - name: "Archive Lint Results" uses: actions/upload-artifact@v4 if: ${{ always() }} @@ -218,6 +218,8 @@ jobs: distribution: "zulu" java-version: "17" cache: "gradle" + - name: "Setup Gradle" + uses: gradle/actions/setup-gradle@v3 - name: "Build Core" working-directory: core run: ./gradlew publishLocal -PisRelease=true @@ -235,10 +237,8 @@ jobs: echo $VERSION; echo "coreVersion=$VERSION" >> $GITHUB_OUTPUT - name: "Clean and Run Unit Tests" - uses: gradle/gradle-build-action@v2 - with: - build-root-directory: kit - arguments: ktlintCheck -Pversion=${{ steps.core-version.outputs.coreVersion }} + working-directory: kit + run: ./gradlew ktlintCheck -Pversion=${{ steps.core-version.outputs.coreVersion }} - name: "Archive Lint Results" uses: actions/upload-artifact@v4 if: ${{ always() }} From 1e97ada2090269b017cfa853574ce337bf8c3a13 Mon Sep 17 00:00:00 2001 From: Mansi Pandya Date: Wed, 14 Jan 2026 13:40:15 -0500 Subject: [PATCH 3/3] Update gradle action version --- .github/workflows/android-kit-push.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android-kit-push.yml b/.github/workflows/android-kit-push.yml index 5faee48..dc283f2 100644 --- a/.github/workflows/android-kit-push.yml +++ b/.github/workflows/android-kit-push.yml @@ -28,7 +28,7 @@ jobs: java-version: "17" cache: "gradle" - name: "Setup Gradle" - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v5 - name: Clean and Run Unit Tests continue-on-error: true run: ./gradlew clean assemble test @@ -63,7 +63,7 @@ jobs: java-version: "17" cache: "gradle" - name: "Setup Gradle" - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v5 - name: "Build Core" working-directory: core run: ./gradlew publishLocal -PisRelease=true @@ -106,7 +106,7 @@ jobs: java-version: "17" cache: "gradle" - name: "Setup Gradle" - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v5 - name: "Run Lint" continue-on-error: true run: ./gradlew lint @@ -141,7 +141,7 @@ jobs: java-version: "17" cache: "gradle" - name: "Setup Gradle" - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v5 - name: "Build Core" working-directory: core run: ./gradlew publishLocal -PisRelease=true @@ -184,7 +184,7 @@ jobs: java-version: "17" cache: "gradle" - name: "Setup Gradle" - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v5 - name: "Run Kotlin Lint" continue-on-error: true run: ./gradlew ktlintCheck @@ -219,7 +219,7 @@ jobs: java-version: "17" cache: "gradle" - name: "Setup Gradle" - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v5 - name: "Build Core" working-directory: core run: ./gradlew publishLocal -PisRelease=true