Update some dependencies (#942)

* Update some dependencies

* Move to deps.gradle

* update wrapper

* Fix leakcanary

* Fix proguard

* More fixes

.buckconfig

@@ -12,7 +12,7 @@
     port = 0
 
 [intellij]
-    android_module_sdk_name = Android API 27 Platform
+    android_module_sdk_name = Android API 230 Platform
     android_module_sdk_type = AndroidSDK
     jdk_name = 1.8
     jdk_type = JavaSDK

another-app/build.gradle

@@ -12,7 +12,7 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            proguardFiles "proguard-android.txt"
+            proguardFiles "proguard-rules.pro"
         }
     }
 

another-app/proguard-rules.pro

@@ -32,3 +32,7 @@
 -keep class * extends dagger.internal.Binding
 -keep class * extends dagger.internal.ModuleAdapter
 -keep class * extends dagger.internal.StaticInjection
+
+# Androidx
+-dontwarn androidx.tracing.Trace
+-dontwarn androidx.annotation.experimental.**

app/src/main/java/com/uber/okbuck/example/MyApp.java

@@ -4,7 +4,6 @@
 import androidx.appcompat.app.AppCompatDelegate;
 import com.facebook.buck.android.support.exopackage.DefaultApplicationLike;
 import com.github.promeg.xlog_android.lib.XLogConfig;
-import com.squareup.leakcanary.LeakCanary;
 
 public class MyApp extends DefaultApplicationLike {
 
@@ -24,6 +23,5 @@ public void onCreate() {
     if (BuildConfig.XLOG_ENABLED) {
       XLogConfig.config(XLogConfig.newConfigBuilder(mApplication).build());
     }
-    LeakCanary.install(mApplication);
   }
 }

build.gradle

@@ -3,7 +3,7 @@ buildscript {
     repositories {
         google()
         maven { url "https://plugins.gradle.org/m2/" }
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath deps.build.androidPlugin
@@ -12,6 +12,7 @@ buildscript {
         classpath deps.build.kotlinAllOpen
         classpath deps.build.sqlDelightPlugin
         classpath deps.build.shadowJar
+        classpath deps.build.versionsPlugin
     }
     configurations.all {
         exclude group:"com.android.tools.build", module: "transform-api"
@@ -24,10 +25,11 @@ allprojects {
 
 allprojects { project ->
     project.apply from: rootProject.file("dependencies.gradle")
+    apply plugin: "com.github.ben-manes.versions"
     repositories {
         google()
         maven { url "https://plugins.gradle.org/m2/" }
-        jcenter()
+        mavenCentral()
     }
     configurations.all {
         exclude group:"com.android.tools.build", module: "transform-api"

buildSrc/build.gradle

@@ -20,8 +20,9 @@ apply plugin: "net.ltgt.errorprone"
 apply from: "../dependencies.gradle"
 
 repositories {
-    jcenter()
+    mavenCentral()
     google()
+    gradlePluginPortal()
 }
 
 jar {

buildSrc/src/main/java/com/uber/okbuck/core/manager/RobolectricManager.java

@@ -117,7 +117,8 @@ enum API {
     API_27("8.1.0", "4611349"),
     API_P("P", "4651975"),
     API_28("9", "4913185-2"),
-    API_29("10", "5803371");
+    API_29("10", "5803371"),
+    API_30("11", "6757853");
 
     private final String androidVersion;
     private final String frameworkSdkBuildVersion;
@@ -162,6 +163,8 @@ static API from(String apiLevel) {
           return API_28;
         case "29":
           return API_29;
+        case "30":
+          return API_30;
         case "P":
           return API_P;
         default:

buildSrc/src/main/java/com/uber/okbuck/core/model/android/AndroidTarget.java

@@ -55,8 +55,6 @@ public abstract class AndroidTarget extends JvmTarget {
   private static final String DEFAULT_SDK = "1";
   private final String applicationId;
   private final String applicationIdSuffix;
-  private final String versionName;
-  private final Integer versionCode;
   private final String minSdk;
   private final String targetSdk;
   private final boolean debuggable;
@@ -73,6 +71,8 @@ public abstract class AndroidTarget extends JvmTarget {
   @Nullable private List<String> secondaryManifests;
   @Nullable private String originalPackageName;
   @Nullable private String resourceUnionPackageName;
+  @Nullable private final String versionName;
+  @Nullable private final Integer versionCode;
 
   protected AndroidTarget(Project project, String name, boolean isTest) {
     super(project, name);
@@ -626,11 +626,11 @@ public final String getTargetSdk() {
   }
 
   public final String getVersionName() {
-    return versionName;
+    return versionName == null ? "" : versionName;
   }
 
   public final Integer getVersionCode() {
-    return versionCode;
+    return versionCode == null ? 0 : versionCode;
   }
 
   public final boolean getDebuggable() {

dependencies.gradle

@@ -17,21 +17,20 @@ def exclude = { dep, String... excludes  ->
 }
 
 def versions = [
-        androidPlugin      : "3.6.1",
-        androidTools       : "26.6.1",
+        androidPlugin      : "4.1.0",
+        androidTools       : "27.1.0",
         autovalue          : "1.7.4",
-        avro               : "1.10.0",
-        butterKnife        : "10.2.1",
-        dagger             : "2.28.3",
-        jna                : "5.6.0",
+        avro               : "1.10.1",
+        butterKnife        : "10.2.3",
+        dagger             : "2.33",
+        jna                : "5.7.0",
         kotlin             : "1.4.10",
-        leakCanary         : "1.5.4",
+        leakCanary         : "2.6",
         rocker             : "1.3.0",
-        support            : "28.0.0",
         androidx           : "1.1.0",
-        androidxMultidex   : "2.0.0",
+        androidxMultidex   : "2.0.1",
         constraintLayout   : "1.1.0",
-        sqldelight         : "1.4.0",
+        sqldelight         : "1.4.4",
 
 ]
 
@@ -40,36 +39,37 @@ def build = [
         androidPluginApi : "com.android.tools.build:gradle-api:${versions.androidPlugin}",
         bintrayPlugin    : "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5",
         butterKnifePlugin: "com.jakewharton:butterknife-gradle-plugin:${versions.butterKnife}",
-        commonsIo        : "commons-io:commons-io:2.6",
-        commonsLang3     : "org.apache.commons:commons-lang3:3.9",
+        commonsIo        : "commons-io:commons-io:2.8.0",
+        commonsLang3     : "org.apache.commons:commons-lang3:3.12.0",
         erroproneCompiler: "com.google.errorprone:error_prone_core:2.4.0",
         errorproneJavac  : "com.google.errorprone:javac:9+181-r4173-1",
-        errorpronePlugin : "net.ltgt.gradle:gradle-errorprone-plugin:1.2.1",
+        errorpronePlugin : "net.ltgt.gradle:gradle-errorprone-plugin:1.3.0",
         kotlinPlugin     : "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
         kotlinAllOpen    : "org.jetbrains.kotlin:kotlin-allopen:${versions.kotlin}",
         manifestMerger   : "com.android.tools.build:manifest-merger:${versions.androidTools}",
-        nullaway         : "com.uber.nullaway:nullaway:0.7.10",
+        nullaway         : "com.uber.nullaway:nullaway:0.9.0",
         rockerPlugin     : "com.fizzed:rocker-gradle-plugin:${versions.rocker}",
         rockerRuntime    : "com.fizzed:rocker-runtime:${versions.rocker}",
-        shadowJar        : "com.github.jengelman.gradle.plugins:shadow:6.0.0",
+        shadowJar        : "com.github.jengelman.gradle.plugins:shadow:6.1.0",
         sqlDelightPlugin : "com.squareup.sqldelight:gradle-plugin:${versions.sqldelight}",
         jna              : "net.java.dev.jna:jna:${versions.jna}",
         jnaPlatform      : "net.java.dev.jna:jna-platform:${versions.jna}",
-        mavenArtifact    : "org.apache.maven:maven-artifact:3.6.2",
+        mavenArtifact    : "org.apache.maven:maven-artifact:3.6.3",
         proguard         : "net.sf.proguard:proguard-base:6.2.2",
+        versionsPlugin   : "com.github.ben-manes:gradle-versions-plugin:0.38.0",
 ]
 
 def buildConfig = [
-        buildTools: "30.0.0",
-        compileSdk: 29,
+        buildTools: "30.0.3",
+        compileSdk: 30,
         minSdk    : 21,
-        targetSdk : 29,
+        targetSdk : 30,
 ]
 
 def apt = [
         autoValue             : "com.google.auto.value:auto-value:${versions.autovalue}",
         autoValueAnnotations  : "com.google.auto.value:auto-value-annotations:${versions.autovalue}",
-        autoValueGson         : "com.ryanharter.auto.value:auto-value-gson:1.3.0",
+        autoValueGson         : "com.ryanharter.auto.value:auto-value-gson:1.3.1",
         autoValueParcel       : "com.ryanharter.auto.value:auto-value-parcel:0.2.8",
         butterKnifeCompiler   : "com.jakewharton:butterknife-compiler:${versions.butterKnife}",
         daggerCompiler        : "com.google.dagger:dagger-compiler:${versions.dagger}",
@@ -83,22 +83,23 @@ def external = [
         dagger          : "com.google.dagger:dagger:${versions.dagger}",
         daggerAndroid   : "com.google.dagger:dagger-android-support:${versions.dagger}",
         inferAnnotations: "com.facebook.infer.annotation:infer-annotation:0.18.0",
+        groovyAll       : "org.codehaus.groovy:groovy-all:3.0.7",
         gson            : "com.google.code.gson:gson:2.8.6",
         kotlinExtension : "org.jetbrains.kotlin:kotlin-android-extensions:${versions.kotlin}",
         kotlinStdlib    : "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}",
         leakCanary      : "com.squareup.leakcanary:leakcanary-android:${versions.leakCanary}",
         sqldelight      : "com.squareup.sqldelight:android-driver:${versions.sqldelight}",
         rxandroid       : "io.reactivex.rxjava2:rxandroid:2.1.1",
-        rxjava          : "io.reactivex.rxjava2:rxjava:2.2.19",
+        rxjava          : "io.reactivex.rxjava2:rxjava:2.2.21",
         rxPermissions   : "com.tbruyelle.rxpermissions2:rxpermissions:0.9.5",
         sqlite          : "com.pushtorefresh.storio3:sqlite:3.0.0",
         xlogAndroidIdle : "com.github.promeg:xlog-android-idle:2.1.1",
         avroIpc         : "org.apache.avro:avro-ipc:${versions.avro}",
         avroIpcTests    : "org.apache.avro:avro-ipc:${versions.avro}:tests",
-        saxon           : "net.sf.saxon:Saxon-HE:10.1",
-        scalaLibrary    : "org.scala-lang:scala-library:2.13.3",
+        saxon           : "net.sf.saxon:Saxon-HE:10.3",
+        scalaLibrary    : "org.scala-lang:scala-library:2.13.5",
         log4j           : exclude("log4j:log4j:1.2.15", "jline", "jms", "jmxtools", "jmxri"),
-        guava           : "com.google.guava:guava:29.0-jre",
+        guava           : "com.google.guava:guava:30.1-jre",
 ]
 
 def lint = [
@@ -121,16 +122,16 @@ def androidx = [
 ]
 
 def test = [
-        assertj       : "org.assertj:assertj-core:3.16.1",
+        assertj       : "org.assertj:assertj-core:3.19.0",
         espressoCore  : "androidx.test.espresso:espresso-core:3.3.0-rc01",
         espressoRules : "androidx.test:rules:1.3.0-rc01",
         espressoRunner: "androidx.test:runner:1.3.0-rc01",
-        junit         : "junit:junit:4.13",
+        junit         : "junit:junit:4.13.2",
         kotlinTest    : "org.jetbrains.kotlin:kotlin-test-junit:${versions.kotlin}",
-        mockito       : "org.mockito:mockito-core:3.4.0",
-        robolectric   : "org.robolectric:robolectric:4.3.1",
+        mockito       : "org.mockito:mockito-core:3.8.0",
+        robolectric   : "org.robolectric:robolectric:4.5.1",
         scalaTest     : "org.scalatest:scalatest_sjs1_2.13:3.2.0",
-        scalaTestJunit: "org.scalatestplus:junit-4-12_2.13:3.2.0.0",
+        scalaTestJunit: "org.scalatestplus:junit-4-12_2.13:3.2.2.0",
         testExt       : "androidx.test.ext:junit:1.1.2-rc01",
 ]
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell