diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 2cbfd4a15..6553eb648 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -12,9 +12,9 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'temurin' @@ -43,13 +43,13 @@ jobs: # Login to Google using Firebase Admin SDK Service Agent Key - id: 'auth' name: Login to Google Cloud - uses: 'google-github-actions/auth@v1' + uses: 'google-github-actions/auth@v2' with: credentials_json: ${{ secrets.GCP_CREDENTIALS }} # Set up Cloud SDK - name: 'Set up Cloud SDK' - uses: 'google-github-actions/setup-gcloud@v1' + uses: 'google-github-actions/setup-gcloud@v2' # Set Firebase Project ID - name: Set current project @@ -65,7 +65,7 @@ jobs: ########################################## # Upload APK for Java version - name: Upload APK Debug for Java - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Java-Debug-APK path: ${{ env.module_app }}/build/outputs/apk/debug/${{ env.module_app }}-debug.apk diff --git a/.github/workflows/deploy-alpha.yml b/.github/workflows/deploy-alpha.yml index db01972b2..384e85cc0 100644 --- a/.github/workflows/deploy-alpha.yml +++ b/.github/workflows/deploy-alpha.yml @@ -12,7 +12,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 ################################ # Update Version Code # @@ -71,6 +71,13 @@ jobs: - name: Build with Gradle run: ./gradlew assemble + - name: Setup build tool version variable + shell: bash + run: | + BUILD_TOOL_VERSION=$(ls /usr/local/lib/android/sdk/build-tools/ | tail -n 1) + echo "BUILD_TOOL_VERSION=$BUILD_TOOL_VERSION" >> $GITHUB_ENV + echo Last build tool version is: $BUILD_TOOL_VERSION + - name: Sign app APK uses: r0adkll/sign-android-release@v1 # ID used to access action output @@ -83,7 +90,7 @@ jobs: keyPassword: ${{ secrets.SIGN_APP_KEYPASS }} env: # override default build-tools version (29.0.3) -- optional - BUILD_TOOLS_VERSION: "30.0.2" + BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }} - name: Push to google play uses: r0adkll/upload-google-play@v1 diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 2ca772b8c..c4e6d3ca7 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -12,7 +12,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: develop fetch-depth: 0 #To Fetch All Tags and Branches @@ -114,6 +114,13 @@ jobs: - name: Build with Gradle run: ./gradlew build + - name: Setup build tool version variable + shell: bash + run: | + BUILD_TOOL_VERSION=$(ls /usr/local/lib/android/sdk/build-tools/ | tail -n 1) + echo "BUILD_TOOL_VERSION=$BUILD_TOOL_VERSION" >> $GITHUB_ENV + echo Last build tool version is: $BUILD_TOOL_VERSION + - name: Sign app APK uses: r0adkll/sign-android-release@v1 # ID used to access action output @@ -126,7 +133,7 @@ jobs: keyPassword: ${{ secrets.SIGN_APP_KEYPASS }} env: # override default build-tools version (29.0.3) -- optional - BUILD_TOOLS_VERSION: "30.0.2" + BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }} - name: Push to google play uses: r0adkll/upload-google-play@v1 diff --git a/app/build.gradle b/app/build.gradle index 82c1b6ee4..213cf8e54 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,9 +56,7 @@ dependencies { androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.androidx', module: 'support-annotations' }) - androidTestImplementation('tools.fastlane:screengrab:1.1.0', { - exclude group: 'com.androidx', module: 'support-annotations' - }) + androidTestImplementation 'tools.fastlane:screengrab:2.1.1' testImplementation 'org.mockito:mockito-core:2.18.3' androidTestImplementation 'org.mockito:mockito-android:2.18.3'