Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(android): Delete sentry-cli-2.31.1.exe during CI builds #11493

Merged
merged 2 commits into from
May 23, 2024
Merged

fix(android): Delete sentry-cli-2.31.1.exe during CI builds #11493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e0c952
chore(android): Update sentry-android-gradle-plugin to 4.6.0
darcywong00 May 21, 2024
e3aaca9
fix(oem/fv/android): Clean build/tmp when building FV app
darcywong00 May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/KMAPro/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
// sentry-android-gradle-plugin 2.1.5+ requires AGP 7.0
classpath 'io.sentry:sentry-android-gradle-plugin:4.5.1'
classpath 'io.sentry:sentry-android-gradle-plugin:4.6.0'
classpath 'name.remal:gradle-plugins:1.5.0'

// From jcenter() which could be sunset in future
Expand Down
2 changes: 1 addition & 1 deletion oem/firstvoices/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {

dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'io.sentry:sentry-android-gradle-plugin:4.5.1'
classpath 'io.sentry:sentry-android-gradle-plugin:4.6.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
10 changes: 2 additions & 8 deletions oem/firstvoices/android/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ builder_describe "Builds FirstVoices for Android app." \
"configure" \
"build" \
"test Runs lint and tests." \
"--ci Don't start the Gradle daemon. For CI" \
"--upload-sentry Upload to sentry"
"--ci Don't start the Gradle daemon. For CI"

# parse before describe_outputs to check debug flags
builder_parse "$@"
Expand Down Expand Up @@ -54,15 +53,10 @@ fi

#### Build action definitions ####

function makeLocalSentryRelease() {
echo "Placeholder for uploading symbols to Sentry"
}

#### Build action definitions ####

# Check about cleaning artifact paths
if builder_start_action clean; then
rm -rf "$KEYMAN_ROOT/oem/firstvoices/android/app/build/outputs"
rm -rf "$KEYMAN_ROOT/oem/firstvoices/android/app/build/tmp"
builder_finish_action success clean
fi

Expand Down
Loading