Эх сурвалжийг харах

Merge pull request #7690 from nextcloud/dependabot/gradle/com.karumi-shot-5.5.0

Bump shot from 5.3.0 to 5.5.0
Tobias Kaminsky 4 жил өмнө
parent
commit
7e100e5a80
1 өөрчлөгдсөн 12 нэмэгдсэн , 5 устгасан
  1. 12 5
      build.gradle

+ 12 - 5
build.gradle

@@ -24,7 +24,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.15.0"
         classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
-        classpath 'com.karumi:shot:5.3.0'
+        classpath 'com.karumi:shot:5.5.1'
     }
 }
 
@@ -47,7 +47,10 @@ configurations {
         exclude group: 'org.jetbrains', module: 'annotations-java5' // via prism4j, already using annotations explicitly
 
         // check for updates every build
-        resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+        resolutionStrategy {
+            cacheChangingModulesFor 0, 'seconds'
+            exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug"
+        }
     }
 }
 
@@ -64,7 +67,7 @@ ext {
     byteBuddyVersion = "1.10.19"
     espressoVersion = "3.3.0"
 
-    travisBuild = System.getenv("TRAVIS") == "true"
+    ciBuild = System.getenv("CI") == "true"
 
     // allows for -D pre-dex=false to be set
     preDexEnabled = "true" == System.getProperty("pre-dex", "true")
@@ -191,8 +194,8 @@ android {
     // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure
 
     dexOptions {
-        // Skip pre-dexing when running on Travis CI or when disabled via -D pre-dex=false.
-        preDexLibraries = preDexEnabled && !travisBuild
+        // Skip pre-dexing when running on CI or when disabled via -D pre-dex=false.
+        preDexLibraries = preDexEnabled && !ciBuild
     }
 
     packagingOptions {
@@ -470,3 +473,7 @@ detekt {
     config = files("detekt.yml")
     input = files("src/")
 }
+
+shot {
+    showOnlyFailingTestsInReports = ciBuild
+}