Fix obfuscated libs instrumentation (gms) (#303)

getsentry · Mar 30, 2022 · fb01cc5 · fb01cc5
1 parent 2a7d91d
commit fb01cc5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,6 +8,9 @@ on:
       force:
         description: Force a release even when there are release-blockers (optional)
         required: false
+      merge_target:
+        description: Target branch to merge into. Uses the default branch as a fallback (optional)
+        required: false
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -23,4 +26,5 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
         with:
           version: ${{ github.event.inputs.version }}
-          force: ${{ github.event.inputs.force }}
+          force: ${{ github.event.inputs.force }}
+          merge_target: ${{ github.event.inputs.merge_target }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 ## Unreleased
 
-## Unreleased
+## 3.0.1
+
+* Fix: obfuscated libs instrumentation (gms) (#303)
 
 ## 3.1.0-alpha.1
 

diff --git a/.../src/main/kotlin/io/sentry/android/gradle/instrumentation/wrap/visitor/WrappingVisitor.kt b/.../src/main/kotlin/io/sentry/android/gradle/instrumentation/wrap/visitor/WrappingVisitor.kt
@@ -177,7 +177,7 @@ class WrappingVisitor(
             replacement.descriptor,
             false
         )
-        if (newWithoutDupInsn && varIndex > 0) { // 0 is reserved for "this"
+        if (newWithoutDupInsn && varIndex >= 0) {
             mv.visitVarInsn(Opcodes.ASTORE, varIndex)
             varIndex = -1
             newWithoutDupInsn = false

diff --git a/...id/gradle/SentryPluginWithPlayCoreTest.kt → ...radle/SentryPluginWithMinifiedLibsTest.kt b/...id/gradle/SentryPluginWithPlayCoreTest.kt → ...radle/SentryPluginWithMinifiedLibsTest.kt
@@ -3,7 +3,7 @@ package io.sentry.android.gradle
 import kotlin.test.assertTrue
 import org.junit.Test
 
-class SentryPluginWithPlayCoreTest :
+class SentryPluginWithMinifiedLibsTest :
     BaseSentryPluginTest(androidGradlePluginVersion = "7.1.2", gradleVersion = "7.4") {
 
     @Test
@@ -19,6 +19,8 @@ class SentryPluginWithPlayCoreTest :
             dependencies {
               implementation 'io.sentry:sentry-android-core:5.6.0'
               implementation 'com.google.android.play:core-ktx:1.8.1'
+              implementation 'com.google.android.gms:play-services-vision:20.1.3'
+              implementation 'com.google.android.gms:play-services-mlkit-text-recognition:18.0.0'
             }
             """.trimIndent()
         )