Merge branch 'fix_aab_bad_request' of https://github.com/Xlopec/flank into fix_aab_bad_request

Author: Xlopec

buildSrc/src/main/kotlin/Versions.kt

@@ -1,6 +1,6 @@
 object Versions {
     // https://github.com/getsentry/sentry-java/releases
-    const val SENTRY = "5.4.1"
+    const val SENTRY = "5.4.3"
 
     // https://github.com/mixpanel/mixpanel-java/releases
     const val MIXPANEL = "1.5.0"
@@ -46,10 +46,10 @@ object Versions {
     const val GOOGLE_AUTH = "1.3.0"
 
     // https://search.maven.org/search?q=a:google-cloud-nio%20g:com.google.cloud
-    const val GOOGLE_NIO = "0.123.16"
+    const val GOOGLE_NIO = "0.123.17"
 
     // https://search.maven.org/search?q=a:google-cloud-storage%20g:com.google.cloud
-    const val GOOGLE_STORAGE = "2.2.1"
+    const val GOOGLE_STORAGE = "2.2.2"
 
     // https://github.com/google/gson/releases
     const val GSON = "2.8.9"
@@ -64,7 +64,7 @@ object Versions {
     const val JSOUP = "1.13.1"
 
     // https://github.com/ktorio/ktor/releases
-    const val KTOR = "1.6.5"
+    const val KTOR = "1.6.7"
 
     // https://github.com/qos-ch/logback/releases
     const val LOGBACK = "1.2.7"
@@ -81,7 +81,7 @@ object Versions {
     // https://github.com/FasterXML/woodstox/releases
     const val WOODSTOX = "6.2.4"
 
-    const val KOTLIN_LOGGING = "2.1.0"
+    const val KOTLIN_LOGGING = "2.1.16"
 
     // https://github.com/mockk/mockk
     const val MOCKK = "1.12.1"
@@ -104,7 +104,7 @@ object Versions {
     const val PROGUARD = "7.1.1"
 
     // https://mvnrepository.com/artifact/org.json/json
-    const val JSON = "20210307"
+    const val JSON = "20211205"
 
     // ============== flank-scripts ==============
     const val KOTLIN_SERIALIZATION = "1.3.1"

firebase_apis/json/testing_v1.json

@@ -375,15 +375,15 @@
           "type": "string"
         },
         "orchestratorOption": {
-          "description": "The option of whether running each test within its own invocation of instrumentation with Android Test Orchestrator or not. ** Orchestrator is only compatible with AndroidJUnitRunner version 1.0 or higher! ** Orchestrator offers the following benefits: - No shared state - Crashes are isolated - Logs are scoped per test See for more information about Android Test Orchestrator. If not set, the test will be run without the orchestrator.",
+          "description": "The option of whether running each test within its own invocation of instrumentation with Android Test Orchestrator or not. ** Orchestrator is only compatible with AndroidJUnitRunner version 1.1 or higher! ** Orchestrator offers the following benefits: - No shared state - Crashes are isolated - Logs are scoped per test See for more information about Android Test Orchestrator. If not set, the test will be run without the orchestrator.",
           "enum": [
             "ORCHESTRATOR_OPTION_UNSPECIFIED",
             "USE_ORCHESTRATOR",
             "DO_NOT_USE_ORCHESTRATOR"
           ],
           "enumDescriptions": [
             "Default value: the server will choose the mode. Currently implies that the test will run without the orchestrator. In the future, all instrumentation tests will be run with the orchestrator. Using the orchestrator is highly encouraged because of all the benefits it offers.",
-            "Run test using orchestrator. ** Only compatible with AndroidJUnitRunner version 1.0 or higher! ** Recommended.",
+            "Run test using orchestrator. ** Only compatible with AndroidJUnitRunner version 1.1 or higher! ** Recommended.",
             "Run test without using orchestrator."
           ],
           "type": "string"
@@ -1841,7 +1841,7 @@
             "The test package and app package are the same.",
             "The test apk does not declare an instrumentation.",
             "The input app apk does not have a signature.",
-            "The test runner class specified by user or in the test APK's manifest file is not compatible with Android Test Orchestrator. Orchestrator is only compatible with AndroidJUnitRunner version 1.0 or higher. Orchestrator can be disabled by using DO_NOT_USE_ORCHESTRATOR OrchestratorOption.",
+            "The test runner class specified by user or in the test APK's manifest file is not compatible with Android Test Orchestrator. Orchestrator is only compatible with AndroidJUnitRunner version 1.1 or higher. Orchestrator can be disabled by using DO_NOT_USE_ORCHESTRATOR OrchestratorOption.",
             "The test APK does not contain the test runner class specified by user or in the manifest file. This can be caused by either of the following reasons: - the user provided a runner class name that's incorrect, or - the test runner isn't built into the test APK (might be in the app APK instead).",
             "A main launcher activity could not be found.",
             "The app declares one or more permissions that are not allowed.",

firebase_apis/test_api/src/main/java/com/google/testing/model/AndroidInstrumentationTest.java

@@ -58,7 +58,7 @@ public final class AndroidInstrumentationTest extends com.google.api.client.json
   /**
    * The option of whether running each test within its own invocation of instrumentation with
    * Android Test Orchestrator or not. ** Orchestrator is only compatible with AndroidJUnitRunner
-   * version 1.0 or higher! ** Orchestrator offers the following benefits: - No shared state -
+   * version 1.1 or higher! ** Orchestrator offers the following benefits: - No shared state -
    * Crashes are isolated - Logs are scoped per test See for more information about Android Test
    * Orchestrator. If not set, the test will be run without the orchestrator.
    * The value may be {@code null}.
@@ -161,7 +161,7 @@ public AndroidInstrumentationTest setAppPackageId(java.lang.String appPackageId)
   /**
    * The option of whether running each test within its own invocation of instrumentation with
    * Android Test Orchestrator or not. ** Orchestrator is only compatible with AndroidJUnitRunner
-   * version 1.0 or higher! ** Orchestrator offers the following benefits: - No shared state -
+   * version 1.1 or higher! ** Orchestrator offers the following benefits: - No shared state -
    * Crashes are isolated - Logs are scoped per test See for more information about Android Test
    * Orchestrator. If not set, the test will be run without the orchestrator.
    * @return value or {@code null} for none
@@ -173,7 +173,7 @@ public java.lang.String getOrchestratorOption() {
   /**
    * The option of whether running each test within its own invocation of instrumentation with
    * Android Test Orchestrator or not. ** Orchestrator is only compatible with AndroidJUnitRunner
-   * version 1.0 or higher! ** Orchestrator offers the following benefits: - No shared state -
+   * version 1.1 or higher! ** Orchestrator offers the following benefits: - No shared state -
    * Crashes are isolated - Logs are scoped per test See for more information about Android Test
    * Orchestrator. If not set, the test will be run without the orchestrator.
    * @param orchestratorOption orchestratorOption or {@code null} for none

flank-scripts/gradle/wrapper/gradle-wrapper.properties

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

gradle/wrapper/gradle-wrapper.properties

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

test_runner/gradle/wrapper/gradle-wrapper.properties

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