Fix Sentry

humphreye · Apr 5, 2022 · 99884b5 · 99884b5
1 parent 86a3ecb
commit 99884b5
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,14 +1,19 @@
 plugins {
-    id 'io.sentry.android.gradle'
+    id("io.sentry.android.gradle") version "3.0.1"
     id 'com.android.application'
     id 'kotlin-android'
     id 'kotlin-android-extensions'
     id 'kotlin-kapt'
 }
 
+sentry {
+    includeProguardMapping = true
+    autoUploadProguardMapping = true
+}
+
 android {
     compileSdkVersion 31
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.example.barcodescanner"
@@ -56,11 +61,6 @@ android {
             buildConfigField "boolean", "ERROR_REPORTS_ENABLED_BY_DEFAULT", "false"
         }
     }
-
-    sentry {
-        autoProguardConfig true
-        autoUpload true
-    }
 }
 
 dependencies {
@@ -77,7 +77,7 @@ dependencies {
     implementation 'androidx.multidex:multidex:2.0.1'
 
     // Room
-    final roomVersion = "2.2.5"
+    final roomVersion = "2.4.2"
     kapt "androidx.room:room-compiler:$roomVersion"
     implementation "androidx.room:room-runtime:$roomVersion"
     implementation "androidx.room:room-rxjava2:$roomVersion"
@@ -114,5 +114,5 @@ dependencies {
     implementation 'com.github.florent37:singledateandtimepicker:2.2.6'
 
     // Sentry
-    implementation 'io.sentry:sentry-android:2.3.1'
+    implementation 'io.sentry:sentry-android:5.7.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,7 @@
             android:name=".feature.tile.QuickSettingsTileService"
             android:icon="@drawable/ic_scan"
             android:label="@string/app_name"
+            android:exported="true"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
                 <action
@@ -58,6 +59,7 @@
             android:name=".feature.tabs.BottomTabsActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="true"
             >
 
             <intent-filter>
@@ -81,6 +83,7 @@
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
             tools:ignore="AppLinkUrlError"
+            android:exported="true"
             >
 
             <intent-filter android:label="@string/intent_filter_scan_image">
@@ -102,6 +105,7 @@
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateVisible"
+            android:exported="true"
             >
             <intent-filter android:label="@string/intent_filter_create_qr_code_text">
                 <action android:name="android.intent.action.SEND"/>
@@ -119,69 +123,82 @@
             android:name=".feature.tabs.create.qr.CreateQrCodeAllActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name=".feature.tabs.create.barcode.CreateBarcodeAllActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
 
         <activity
             android:name="com.example.barcodescanner.feature.barcode.BarcodeActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name="com.example.barcodescanner.feature.barcode.BarcodeImageActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name=".feature.barcode.otp.OtpActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name=".feature.barcode.save.SaveBarcodeAsTextActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name=".feature.barcode.save.SaveBarcodeAsImageActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
 
         <activity
             android:name=".feature.tabs.history.export.ExportHistoryActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
 
         <activity
             android:name=".feature.tabs.settings.theme.ChooseThemeActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name=".feature.tabs.settings.camera.ChooseCameraActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name=".feature.tabs.settings.formats.SupportedFormatsActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name=".feature.tabs.settings.search.ChooseSearchEngineActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
         <activity
             android:name=".feature.tabs.settings.permissions.AllPermissionsActivity"
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|screenSize"
+            android:exported="false"
             />
 
     </application>

diff --git a/app/src/main/java/com/example/barcodescanner/usecase/Logger.kt b/app/src/main/java/com/example/barcodescanner/usecase/Logger.kt
@@ -1,7 +1,7 @@
 package com.example.barcodescanner.usecase
 
 import com.example.barcodescanner.BuildConfig
-import io.sentry.core.Sentry
+import io.sentry.Sentry
 
 object Logger {
     var isEnabled = BuildConfig.ERROR_REPORTS_ENABLED_BY_DEFAULT

diff --git a/build.gradle b/build.gradle
@@ -9,9 +9,8 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'io.sentry:sentry-android-gradle-plugin:1.7.28'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,8 @@
-#Sun Jul 26 01:41:08 MSK 2020
+#Tue Apr 05 16:05:22 MSK 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
 android.enableJetifier=true
 android.useAndroidX=true