Skip to content

Commit

Permalink
[build-properties] Fix android build failure (#17321)
Browse files Browse the repository at this point in the history
(cherry picked from commit f7e7045)
  • Loading branch information
wschurman authored and Kudo committed May 5, 2022
1 parent 6a62fea commit 4cb9822
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/updates-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- packages/expo-updates/**
- packages/expo/android/**
- packages/expo/ios/**
- templates/expo-template-bare-minimum/**
push:
branches: [main, 'sdk-*']
paths:
Expand All @@ -25,6 +26,7 @@ on:
- packages/expo-updates/**
- packages/expo/android/**
- packages/expo/ios/**
- templates/expo-template-bare-minimum/**

concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
Expand Down Expand Up @@ -115,7 +117,7 @@ jobs:
run: sed -i -e "s/UPDATES_PORT/$UPDATES_PORT/" ./App.js
- name: Assemble release APK
working-directory: ../updates-e2e/android
run: ./gradlew assembleRelease
run: ./gradlew assembleRelease --stacktrace
- name: Copy APK to working directory
run: cp -R ../updates-e2e/android/app/build/outputs/apk artifact
- name: Upload test APK artifact
Expand Down
4 changes: 2 additions & 2 deletions templates/expo-template-bare-minimum/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ buildscript {
ext {
buildToolsVersion = findProperty('android.buildToolsVersion') ?: "31.0.0"
minSdkVersion = 21
compileSdkVersion = Integer.parseInt(findProperty('android.compileSdkVersion') ?: 31)
targetSdkVersion = Integer.parseInt(findProperty('android.targetSdkVersion') ?: 31)
compileSdkVersion = Integer.parseInt(findProperty('android.compileSdkVersion') ?: "31")
targetSdkVersion = Integer.parseInt(findProperty('android.targetSdkVersion') ?: "31")
if (hasProperty('android.kotlinVersion')) {
kotlinVersion = findProperty('android.kotlinVersion')
}
Expand Down

0 comments on commit 4cb9822

Please sign in to comment.