Revert "Update multiple build dependencies"

This reverts commit 1307ec7.

app/build.gradle

@@ -398,7 +398,7 @@ dependencies {
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     kapt 'com.github.bumptech.glide:compiler:4.11.0'
-    kapt 'androidx.annotation:annotation:1.2.0'
+    kapt 'androidx.annotation:annotation:1.1.0'
     implementation 'com.makeramen:roundedimageview:2.1.0'
     implementation 'com.pnikosis:materialish-progress:1.5'
     implementation 'org.greenrobot:eventbus:3.0.0'
@@ -459,7 +459,8 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
-    implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.12.4"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.12.0"
 }
 
 dependencyVerification {

app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java

@@ -197,7 +197,7 @@ private static String getLocalizedPattern(String template, Locale locale) {
    *
    * @return The timestamp if able to be parsed, otherwise -1.
    */
-  @SuppressLint({ "ObsoleteSdkInt", "NewApi" })
+  @SuppressLint("ObsoleteSdkInt")
   public static long parseIso8601(@Nullable String date) {
     SimpleDateFormat format;
     if (Build.VERSION.SDK_INT == 0 || Build.VERSION.SDK_INT >= 24) {

app/witness-verifications.gradle

@@ -240,17 +240,17 @@ dependencyVerification {
         ['com.davemorrissey.labs:subsampling-scale-image-view:3.6.0',
          '550c5baa07e0bb4ff0a18b705e96d34436d22619248bd8c08c08c730b1f55cfe'],
 
-        ['com.fasterxml.jackson.core:jackson-annotations:2.12.4',
-         'f6aa3706a875689b66cdac3334f65dfdb795ccfad4117bf072893b196ed1ec8e'],
+        ['com.fasterxml.jackson.core:jackson-annotations:2.12.0',
+         'c28fbe62e7be1e29df75953fa8a887ff875d4482291fbfddb1aec5c91191ecda'],
 
-        ['com.fasterxml.jackson.core:jackson-core:2.12.4',
-         '3506ce47ec2604ae2d80d79505f7cb374f718060639415c07d144adadd2d68a3'],
+        ['com.fasterxml.jackson.core:jackson-core:2.12.0',
+         '8acab5ef6e4f332bbb331b3fcd24d716598770d13a47e7215aa5ee625d1fd9c9'],
 
-        ['com.fasterxml.jackson.core:jackson-databind:2.12.4',
-         'e99a7b4b89074bc689aabcd9eb1f2c1318b68cc5c34979daf3e34edc558c7a01'],
+        ['com.fasterxml.jackson.core:jackson-databind:2.12.0',
+         '75d470eda0dd559e43f2ad08209fa09ecd268833492ba93fa46f6f3607acbab7'],
 
-        ['com.fasterxml.jackson.module:jackson-module-kotlin:2.12.4',
-         '73993e2bd00354a9dbcaef547f827cd8ab8a7ff0a1cbc3c5b72b585899fb6be4'],
+        ['com.fasterxml.jackson.module:jackson-module-kotlin:2.12.0',
+         'ee69650831f72ff2411026b507f3583e90ca88b40e9dae3067f87b34088e0ced'],
 
         ['com.github.bumptech.glide:annotations:4.11.0',
          'd219d238006d824962176229d4708abcdddcfe342c6a18a5d0fa48d6f0479b3e'],
@@ -492,12 +492,15 @@ dependencyVerification {
         ['org.greenrobot:eventbus:3.0.0',
          '180d4212467df06f2fbc9c8d8a2984533ac79c87769ad883bc421612f0b4e17c'],
 
-        ['org.jetbrains.kotlin:kotlin-reflect:1.4.21',
-         '7e1ae4f15a7aef746c5b89433f1c5e76b301a635854ef3c6b134b0ca31a36624'],
+        ['org.jetbrains.kotlin:kotlin-reflect:1.4.10',
+         '3ab3413ec945f801448360ad97bc6e14fec6d606889ede3c707cc277b4467f45'],
 
         ['org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32',
          'e1ff6f55ee9e7591dcc633f7757bac25a7edb1cc7f738b37ec652f10f66a4145'],
 
+        ['org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32',
+         '5f801e75ca27d8791c14b07943c608da27620d910a8093022af57f543d5d98b6'],
+
         ['org.jetbrains.kotlin:kotlin-stdlib:1.4.32',
          '13e9fd3e69dc7230ce0fc873a92a4e5d521d179bcf1bef75a6705baac3bfecba'],
 

build.gradle

@@ -3,6 +3,11 @@ buildscript {
     repositories {
         google()
         mavenCentral()
+        jcenter {
+            content {
+                includeVersion 'org.jetbrains.trove4j', 'trove4j', '20160824'
+            }
+        }
         maven {
             url "https://plugins.gradle.org/m2/"
             content {
@@ -11,8 +16,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
-        classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5'
+        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:10.0.0"
@@ -21,7 +26,7 @@ buildscript {
 }
 
 ext {
-    BUILD_TOOL_VERSION = '30.0.3'
+    BUILD_TOOL_VERSION = '30.0.2'
 
     COMPILE_SDK = 30
     TARGET_SDK  = 30
@@ -37,7 +42,7 @@ wrapper {
 allprojects {
     repositories {
         google()
-        mavenCentral()
+        jcenter()
     }
 }
 

core-util/build.gradle

@@ -44,7 +44,7 @@ dependencies {
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
-    api 'androidx.annotation:annotation:1.2.0'
+    api 'androidx.annotation:annotation:1.1.0'
 
     implementation 'com.google.protobuf:protobuf-javalite:3.10.0'
 

core-util/witness-verifications.gradle

@@ -3,8 +3,8 @@
 dependencyVerification {
     verify = [
 
-        ['androidx.annotation:annotation:1.2.0',
-         '9029262bddce116e6d02be499e4afdba21f24c239087b76b3b57d7e98b490a36'],
+        ['androidx.annotation:annotation:1.1.0',
+         'd38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692'],
 
         ['com.google.protobuf:protobuf-javalite:3.10.0',
          '215a94dbe100130295906b531bb72a26965c7ac8fcd9a75bf8054a8ac2abf4b4'],

device-transfer/lib/witness-verifications.gradle

@@ -6,8 +6,8 @@ dependencyVerification {
         ['androidx.activity:activity:1.0.0',
          'd1bc9842455c2e534415d88c44df4d52413b478db9093a1ba36324f705f44c3d'],
 
-        ['androidx.annotation:annotation:1.2.0',
-         '9029262bddce116e6d02be499e4afdba21f24c239087b76b3b57d7e98b490a36'],
+        ['androidx.annotation:annotation:1.1.0',
+         'd38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692'],
 
         ['androidx.appcompat:appcompat-resources:1.2.0',
          'c470297c03ff3de1c3d15dacf0be0cae63abc10b52f021dd07ae28daa3100fe5'],

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 # Note: Check https://gradle.org/release-checksums/ before updating wrapper or distribution
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=22449f5231796abd892c98b2a07c9ceebe4688d192cd2d6763f8e3bf8acbedeb
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionSha256Sum=c9910513d0eed63cd8f5c7fec4cb4a05731144770104a0871234a4edc3ba3cef
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MSYS* | MINGW* )
+  MINGW* )
     msys=true
     ;;
   NONSTOP* )
@@ -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 execute
+if "%ERRORLEVEL%" == "0" goto init
 
 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 execute
+if exist "%JAVA_EXE%" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,14 +64,29 @@ 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 %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell

libnetcipher/witness-verifications.gradle

@@ -3,8 +3,8 @@
 dependencyVerification {
     verify = [
 
-        ['androidx.annotation:annotation:1.2.0',
-         '9029262bddce116e6d02be499e4afdba21f24c239087b76b3b57d7e98b490a36'],
+        ['androidx.annotation:annotation:1.1.0',
+         'd38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692'],
 
         ['com.google.protobuf:protobuf-javalite:3.10.0',
          '215a94dbe100130295906b531bb72a26965c7ac8fcd9a75bf8054a8ac2abf4b4'],

lintchecks/build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'java-library'
 
 repositories {
     google()
+    jcenter()
 }
 
 dependencies {

paging/lib/witness-verifications.gradle

@@ -9,8 +9,8 @@ dependencyVerification {
         ['androidx.annotation:annotation-experimental:1.0.0',
          'b219d2b568e7e4ba534e09f8c2fd242343df6ccbdfbbe938846f5d740e6b0b11'],
 
-        ['androidx.annotation:annotation:1.2.0',
-         '9029262bddce116e6d02be499e4afdba21f24c239087b76b3b57d7e98b490a36'],
+        ['androidx.annotation:annotation:1.1.0',
+         'd38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692'],
 
         ['androidx.appcompat:appcompat-resources:1.2.0',
          'c470297c03ff3de1c3d15dacf0be0cae63abc10b52f021dd07ae28daa3100fe5'],

reproducible-builds/Dockerfile

@@ -3,8 +3,8 @@ ARG DEBIAN_RELEASE=buster
 
 FROM openjdk:${JAVA_UPDATE_RELEASE}-${DEBIAN_RELEASE}
 
-ARG ANDROID_SDK_DIST=commandlinetools-linux-7302050_latest.zip
-ARG ANDROID_SDK_SHA256=7a00faadc0864f78edd8f4908a629a46d622375cbe2e5814e82934aebecdb622
+ARG ANDROID_SDK_DIST=commandlinetools-linux-6858069_latest.zip
+ARG ANDROID_SDK_SHA256=87f6dcf41d4e642e37ba03cb2e387a542aa0bd73cb689a9e7152aad40a6e7a08
 
 RUN apt-get update && apt-get install -y make file
 

video/build.gradle

@@ -24,7 +24,7 @@ dependencyVerification {
 dependencies {
     lintChecks project(':lintchecks')
 
-    api 'androidx.annotation:annotation:1.2.0'
+    api 'androidx.annotation:annotation:1.1.0'
 
     implementation project(':core-util')
 

video/witness-verifications.gradle

@@ -3,8 +3,8 @@
 dependencyVerification {
     verify = [
 
-        ['androidx.annotation:annotation:1.2.0',
-         '9029262bddce116e6d02be499e4afdba21f24c239087b76b3b57d7e98b490a36'],
+        ['androidx.annotation:annotation:1.1.0',
+         'd38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692'],
 
         ['com.google.protobuf:protobuf-javalite:3.10.0',
          '215a94dbe100130295906b531bb72a26965c7ac8fcd9a75bf8054a8ac2abf4b4'],