Extract consts

getsentry · Jun 14, 2022 · 44b4048 · 44b4048
1 parent fb8e2b4
commit 44b4048
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/...src/main/kotlin/io/sentry/android/gradle/instrumentation/SpanAddingClassVisitorFactory.kt b/...src/main/kotlin/io/sentry/android/gradle/instrumentation/SpanAddingClassVisitorFactory.kt
@@ -14,6 +14,7 @@ import io.sentry.android.gradle.instrumentation.remap.RemappingInstrumentable
 import io.sentry.android.gradle.instrumentation.wrap.WrappingInstrumentable
 import io.sentry.android.gradle.services.SentryModulesService
 import io.sentry.android.gradle.util.SemVer
+import io.sentry.android.gradle.util.SentryModules
 import io.sentry.android.gradle.util.SentryVersions
 import io.sentry.android.gradle.util.debug
 import io.sentry.android.gradle.util.info
@@ -100,21 +101,27 @@ abstract class SpanAddingClassVisitorFactory :
         sentryModules: Map<String, SemVer>,
         parameters: SpanAddingParameters
     ): Boolean =
-        sentryModules.isAtLeast("sentry-android-core", SentryVersions.VERSION_PERFORMANCE) &&
-            parameters.features.get().contains(InstrumentationFeature.DATABASE)
+        sentryModules.isAtLeast(
+            SentryModules.SENTRY_ANDROID_CORE,
+            SentryVersions.VERSION_PERFORMANCE
+        ) && parameters.features.get().contains(InstrumentationFeature.DATABASE)
 
     private fun isFileIOInstrEnabled(
         sentryModules: Map<String, SemVer>,
         parameters: SpanAddingParameters
     ): Boolean =
-        sentryModules.isAtLeast("sentry-android-core", SentryVersions.VERSION_FILE_IO) &&
-            parameters.features.get().contains(InstrumentationFeature.FILE_IO)
+        sentryModules.isAtLeast(
+            SentryModules.SENTRY_ANDROID_CORE,
+            SentryVersions.VERSION_FILE_IO
+        ) && parameters.features.get().contains(InstrumentationFeature.FILE_IO)
 
     private fun isOkHttpInstrEnabled(
         sentryModules: Map<String, SemVer>,
         parameters: SpanAddingParameters
-    ): Boolean = sentryModules.isAtLeast("sentry-android-okhttp", SentryVersions.VERSION_OKHTTP) &&
-        parameters.features.get().contains(InstrumentationFeature.OKHTTP)
+    ): Boolean = sentryModules.isAtLeast(
+        SentryModules.SENTRY_ANDROID_OKHTTP,
+        SentryVersions.VERSION_OKHTTP
+    ) && parameters.features.get().contains(InstrumentationFeature.OKHTTP)
 
     private fun Map<String, SemVer>.isAtLeast(module: String, minVersion: SemVer): Boolean =
         getOrDefault(module, SentryVersions.VERSION_DEFAULT) >= minVersion

diff --git a/plugin-build/src/main/kotlin/io/sentry/android/gradle/util/Versions.kt b/plugin-build/src/main/kotlin/io/sentry/android/gradle/util/Versions.kt
@@ -17,6 +17,11 @@ internal object SentryVersions {
     internal val VERSION_FILE_IO = SemVer(5, 5, 0)
 }
 
+internal object SentryModules {
+    internal const val SENTRY_ANDROID_CORE = "sentry-android-core"
+    internal const val SENTRY_ANDROID_OKHTTP = "sentry-android-okhttp"
+}
+
 /**
  * Adapted from https://github.com/swiftzer/semver/blob/master/src/main/java/net/swiftzer/semver/SemVer.kt
  */