From 58e54ff29fd7d86ddb67cc9620026fc8e07a1585 Mon Sep 17 00:00:00 2001 From: GitHub Date: Wed, 3 Aug 2022 19:45:20 +0000 Subject: [PATCH 1/4] chore: update scripts/update-android.sh to 6.3.1 --- CHANGELOG.md | 3 +++ .../src/main/kotlin/io/sentry/android/gradle/SentryPlugin.kt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94f219a0..f6591729 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ ### Features - Bump AGP to 7.2.1 and Gradle to 7.5.0 ([#363](https://github.com/getsentry/sentry-android-gradle-plugin/pull/363)) +- Bump Android SDK to v6.3.1 ([#365](https://github.com/getsentry/sentry-android-gradle-plugin/pull/365)) + - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#631) + - [diff](https://github.com/getsentry/sentry-java/compare/6.3.0...6.3.1) ## 3.1.3 diff --git a/plugin-build/src/main/kotlin/io/sentry/android/gradle/SentryPlugin.kt b/plugin-build/src/main/kotlin/io/sentry/android/gradle/SentryPlugin.kt index 0b01921f..66586f08 100644 --- a/plugin-build/src/main/kotlin/io/sentry/android/gradle/SentryPlugin.kt +++ b/plugin-build/src/main/kotlin/io/sentry/android/gradle/SentryPlugin.kt @@ -324,7 +324,7 @@ class SentryPlugin : Plugin { companion object { const val SENTRY_ORG_PARAMETER = "sentryOrg" const val SENTRY_PROJECT_PARAMETER = "sentryProject" - internal const val SENTRY_SDK_VERSION = "6.3.0" + internal const val SENTRY_SDK_VERSION = "6.3.1" internal val sep = File.separator From c51ad582b7180b06d455a7033ff364db5e289849 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 3 Aug 2022 21:58:48 +0200 Subject: [PATCH 2/4] Make regex for testing native debung info file upload more flexible --- .github/workflows/test-publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-publish.yaml b/.github/workflows/test-publish.yaml index d500ad4f..e34300a5 100644 --- a/.github/workflows/test-publish.yaml +++ b/.github/workflows/test-publish.yaml @@ -32,5 +32,5 @@ jobs: run: ./gradlew assembleRelease | tee gradle.log - name: Verify that Native Symbols were uploaded - run: grep "Uploaded 4 missing debug information files" gradle.log + run: grep "Uploaded [0-9]+ missing debug information files" gradle.log if: env.SENTRY_AUTH_TOKEN != null From 495eab7dbcfadc4ea1fbf996ad984b648452be0e Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 3 Aug 2022 22:01:18 +0200 Subject: [PATCH 3/4] Make regex not match 0 files --- .github/workflows/test-publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-publish.yaml b/.github/workflows/test-publish.yaml index e34300a5..6975bff7 100644 --- a/.github/workflows/test-publish.yaml +++ b/.github/workflows/test-publish.yaml @@ -32,5 +32,5 @@ jobs: run: ./gradlew assembleRelease | tee gradle.log - name: Verify that Native Symbols were uploaded - run: grep "Uploaded [0-9]+ missing debug information files" gradle.log + run: grep "Uploaded [1-9][0-9]*? missing debug information files" gradle.log if: env.SENTRY_AUTH_TOKEN != null From 151ec06082b99d62953580213d80a2c8639ce120 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 3 Aug 2022 22:10:18 +0200 Subject: [PATCH 4/4] Remove non greedy modifier as it causes regex to not match --- .github/workflows/test-publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-publish.yaml b/.github/workflows/test-publish.yaml index 6975bff7..0d08eaf3 100644 --- a/.github/workflows/test-publish.yaml +++ b/.github/workflows/test-publish.yaml @@ -32,5 +32,5 @@ jobs: run: ./gradlew assembleRelease | tee gradle.log - name: Verify that Native Symbols were uploaded - run: grep "Uploaded [1-9][0-9]*? missing debug information files" gradle.log + run: grep "Uploaded [1-9][0-9]* missing debug information files" gradle.log if: env.SENTRY_AUTH_TOKEN != null