Bump dev deps (#1725)

getsentry · Sep 16, 2021 · 8f54d89 · 8f54d89
1 parent 28667b5
commit 8f54d89
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
@@ -1,7 +1,7 @@
 import java.math.BigDecimal
 
 object Config {
-    val kotlinVersion = "1.4.30"
+    val kotlinVersion = "1.4.32"
     val kotlinStdLib = "stdlib-jdk8"
 
     val springBootVersion = "2.4.4"
@@ -12,13 +12,13 @@ object Config {
         val androidGradle = "com.android.tools.build:gradle:7.0.2"
         val kotlinGradlePlugin = "gradle-plugin"
         val buildConfig = "com.github.gmazzo.buildconfig"
-        val buildConfigVersion = "3.0.0"
+        val buildConfigVersion = "3.0.3"
         val springBoot = "org.springframework.boot"
         val springDependencyManagement = "io.spring.dependency-management"
         val springDependencyManagementVersion = "1.0.11.RELEASE"
         val gretty = "org.gretty"
         val grettyVersion = "3.0.5"
-        val gradleMavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.15.1"
+        val gradleMavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.18.0"
         val dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:$kotlinVersion"
     }
 
@@ -110,9 +110,10 @@ object Config {
         val androidxRunner = "androidx.test:runner:$androidxTestVersion"
         val androidxJunit = "androidx.test.ext:junit:1.1.2"
         val androidxCoreKtx = "androidx.core:core-ktx:1.3.2"
+        // bump to 4.6.1 breaks a few tests due to ShadowFileObserver
         val robolectric = "org.robolectric:robolectric:4.5.1"
         val mockitoKotlin = "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
-        val mockitoInline = "org.mockito:mockito-inline:3.10.0"
+        val mockitoInline = "org.mockito:mockito-inline:3.12.4"
         val awaitility = "org.awaitility:awaitility-kotlin:4.1.0"
         val mockWebserver = "com.squareup.okhttp3:mockwebserver:4.9.0"
         val mockWebserver3 = "com.squareup.okhttp3:mockwebserver:3.14.9"
@@ -122,7 +123,7 @@ object Config {
 
     object QualityPlugins {
         object Jacoco {
-            val version = "0.8.6"
+            val version = "0.8.7"
             val minimumCoverage = BigDecimal.valueOf(0.6)
         }
         val spotless = "com.diffplug.spotless"
@@ -157,12 +158,12 @@ object Config {
     object CompileOnly {
         private val nopenVersion = "1.0.1"
 
-        val jetbrainsAnnotations = "org.jetbrains:annotations:21.0.1"
+        val jetbrainsAnnotations = "org.jetbrains:annotations:22.0.0"
         val nopen = "com.jakewharton.nopen:nopen-annotations:$nopenVersion"
         val nopenChecker = "com.jakewharton.nopen:nopen-checker:$nopenVersion"
-        val errorprone = "com.google.errorprone:error_prone_core:2.7.1"
+        val errorprone = "com.google.errorprone:error_prone_core:2.9.0"
         val errorProneJavac8 = "com.google.errorprone:javac:9+181-r4173-1"
-        val errorProneNullAway = "com.uber.nullaway:nullaway:0.9.1"
+        val errorProneNullAway = "com.uber.nullaway:nullaway:0.9.2"
     }
 
     object NativePlugins {

diff --git a/sentry/src/main/java/io/sentry/vendor/Base64.java b/sentry/src/main/java/io/sentry/vendor/Base64.java
@@ -30,8 +30,8 @@ public class Base64 {
   public static final int URL_SAFE = 8;
 
   /**
-   * Flag to pass to {@link Base64OutputStream} to indicate that it should not close the output
-   * stream it is wrapping when it itself is closed.
+   * Flag to pass to Base64OutputStream to indicate that it should not close the output stream it is
+   * wrapping when it itself is closed.
    */
   public static final int NO_CLOSE = 16;
 

diff --git a/sentry/src/test/java/io/sentry/DiagnosticLoggerTest.kt b/sentry/src/test/java/io/sentry/DiagnosticLoggerTest.kt
@@ -46,7 +46,7 @@ class DiagnosticLoggerTest {
 
     @Test
     fun `when debug is true, a call to log with null level does not throw`() {
-        fixture.getSut().callMethod("log", parameterTypes = arrayOf(SentryLevel::class.java, String::class.java, arrayOf<Object>()::class.java), null, expectedMessage, null)
+        fixture.getSut().callMethod("log", parameterTypes = arrayOf(SentryLevel::class.java, String::class.java, arrayOf<Any>()::class.java), null, expectedMessage, null)
     }
 
     @Test
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,7 +46,7 @@ class DiagnosticLoggerTest { @@
         @Test
         fun `when debug is true, a call to log with null level does not throw`() {
-            fixture.getSut().callMethod("log", parameterTypes = arrayOf(SentryLevel::class.java, String::class.java, arrayOf<Object>()::class.java), null, expectedMessage, null)
+            fixture.getSut().callMethod("log", parameterTypes = arrayOf(SentryLevel::class.java, String::class.java, arrayOf<Any>()::class.java), null, expectedMessage, null)
         }
         @Test
@@ Expand Down @@