Update dependency versions (#26)

DroidsOnRoids · Jan 1, 2020 · 7805861 · 7805861
1 parent 038f1ec
commit 7805861
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 26 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -26,14 +26,14 @@ GEM
       no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
-    danger-android_lint (0.0.7)
+    danger-android_lint (0.0.8)
       danger-plugin-api (~> 1.0)
       oga
     danger-kotlin_detekt (0.0.3)
       danger-plugin-api (~> 1.0)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
-    faraday (0.17.0)
+    faraday (0.17.1)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
@@ -46,11 +46,11 @@ GEM
     no_proxy_fix (0.1.2)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oga (2.15)
+    oga (3.0)
       ast
       ruby-ll (~> 2.1)
     open4 (1.3.4)
-    public_suffix (4.0.1)
+    public_suffix (4.0.2)
     ruby-ll (2.1.2)
       ansi
       ast

diff --git a/build.gradle b/build.gradle
@@ -4,16 +4,16 @@ buildscript {
             compileSdk         : 29,
             targetSdk          : 29,
             kotlin             : '1.3.61',
-            androidGradlePlugin: '3.6.0-beta05',
+            androidGradlePlugin: '4.0.0-alpha07',
             versionsPlugin     : '0.25.0',
             hyperion           : '0.9.27',
             debugDb            : '1.0.6',
             chucker            : '3.0.1',
             hyperionAppInfo    : '1.1.0',
             deviceNames        : '1.1.9',
             autoService        : '1.0-rc6',
-            shipkit            : '5406deb9d1746f963d1b132bccb3cca17021c3e9',
-            detekt             : '1.1.0',
+            shipkit            : '2f776772b70049ab287385aacd7a4313140ec254',
+            detekt             : '1.3.1',
             androidxAnnotations: '1.1.0'
     ]
 
@@ -36,7 +36,6 @@ buildscript {
 
 plugins {
     id 'io.gitlab.arturbosch.detekt' version "1.1.0"
-    id 'com.gradle.build-scan' version '2.4.2'
 }
 
 apply plugin: 'org.shipkit.java'

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-rc-1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,5 @@
+plugins {
+    id "com.gradle.enterprise" version "3.1.1"
+}
+
 include ':foqa', ':device_info_plugin', ':font_scale_plugin', ':chucker_plugin', ':sample'