diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index ec1264ef1..c1b6b8348 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -313,7 +313,8 @@ jobs: # Force blank suffix for screenshot tests ORG_GRADLE_PROJECT_ZCASH_DEBUG_APP_NAME_SUFFIX: "" ORG_GRADLE_PROJECT_ZCASH_EMULATOR_WTF_API_KEY: ${{ secrets.EMULATOR_WTF_API_KEY }} - ORG_GRADLE_PROJECT_IS_ANDROID_INSTRUMENTATION_TEST_COVERAGE_ENABLED: true + # Temporarily disabled https://issuetracker.google.com/issues/266109833 + ORG_GRADLE_PROJECT_IS_ANDROID_INSTRUMENTATION_TEST_COVERAGE_ENABLED: false run: | ./gradlew testDebugWithEmulatorWtf :ui-integration-test:testZcashmainnetDebugWithEmulatorWtf - name: Collect Artifacts @@ -452,7 +453,7 @@ jobs: MAPPINGS_ZIP_PATH: ${{ format('{0}/artifacts/mappings.zip', env.home) }} run: | mkdir ${ARTIFACTS_DIR_PATH} - zip -r ${BINARIES_ZIP_PATH} . -i app/build/outputs/apk/\*/\*.apk app/build/outputs/universal_apk/\*/\*.apk app/build/outputs/bundle/\*/\*.aab + zip -r ${BINARIES_ZIP_PATH} . -i app/build/outputs/apk/\*/\*.apk app/build/outputs/apk_from_bundle/\*/\*.apk app/build/outputs/bundle/\*/\*.aab zip -r ${MAPPINGS_ZIP_PATH} . -i *app/build/outputs/mapping/*/mapping.txt - name: Upload Artifacts uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 097e0f8a1..07f34f17e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -318,7 +318,7 @@ fladle { debugApk.set( project.provider { - "${buildDir}/outputs/universal_apk/zcashmainnetRelease/app-zcashmainnet-release-universal.apk" + "${buildDir}/outputs/apk_from_bundle/zcashmainnetRelease/app-zcashmainnet-release-universal.apk" } ) diff --git a/build-conventions-secant/build.gradle.kts b/build-conventions-secant/build.gradle.kts index f43e6be7f..e14e122a9 100644 --- a/build-conventions-secant/build.gradle.kts +++ b/build-conventions-secant/build.gradle.kts @@ -37,12 +37,9 @@ dependencyLocking { } } -// Per conversation in the KotlinLang Slack, Gradle uses Java 8 compatibility internally -// for all build scripts. -// https://kotlinlang.slack.com/archives/C19FD9681/p1636632870122900?thread_ts=1636572288.117000&cid=C19FD9681 java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } dependencies { diff --git a/build-conventions-secant/gradle.lockfile b/build-conventions-secant/gradle.lockfile index aa9ecba88..598bed2d6 100644 --- a/build-conventions-secant/gradle.lockfile +++ b/build-conventions-secant/gradle.lockfile @@ -1,50 +1,51 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.databinding:databinding-common:7.3.0=runtimeClasspath -androidx.databinding:databinding-compiler-common:7.3.0=runtimeClasspath -com.android.databinding:baseLibrary:7.3.0=runtimeClasspath -com.android.tools.analytics-library:crash:30.3.0=runtimeClasspath -com.android.tools.analytics-library:protos:30.3.0=runtimeClasspath -com.android.tools.analytics-library:shared:30.3.0=runtimeClasspath -com.android.tools.analytics-library:tracker:30.3.0=runtimeClasspath +androidx.databinding:databinding-common:7.4.0=runtimeClasspath +androidx.databinding:databinding-compiler-common:7.4.0=runtimeClasspath +com.android.databinding:baseLibrary:7.4.0=runtimeClasspath +com.android.tools.analytics-library:crash:30.4.0=runtimeClasspath +com.android.tools.analytics-library:protos:30.4.0=runtimeClasspath +com.android.tools.analytics-library:shared:30.4.0=runtimeClasspath +com.android.tools.analytics-library:tracker:30.4.0=runtimeClasspath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=runtimeClasspath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=runtimeClasspath -com.android.tools.build:aapt2-proto:7.3.0-8691043=runtimeClasspath -com.android.tools.build:aaptcompiler:7.3.0=runtimeClasspath -com.android.tools.build:apksig:7.3.0=compileClasspath,runtimeClasspath -com.android.tools.build:apkzlib:7.3.0=compileClasspath,runtimeClasspath -com.android.tools.build:builder-model:7.3.0=compileClasspath,runtimeClasspath -com.android.tools.build:builder-test-api:7.3.0=runtimeClasspath -com.android.tools.build:builder:7.3.0=compileClasspath,runtimeClasspath -com.android.tools.build:bundletool:1.9.0=runtimeClasspath -com.android.tools.build:gradle-api:7.3.0=compileClasspath,runtimeClasspath -com.android.tools.build:gradle:7.3.0=compileClasspath,runtimeClasspath -com.android.tools.build:manifest-merger:30.3.0=compileClasspath,runtimeClasspath +com.android.tools.build:aapt2-proto:7.4.0-8841542=runtimeClasspath +com.android.tools.build:aaptcompiler:7.4.0=runtimeClasspath +com.android.tools.build:apksig:7.4.0=compileClasspath,runtimeClasspath +com.android.tools.build:apkzlib:7.4.0=compileClasspath,runtimeClasspath +com.android.tools.build:builder-model:7.4.0=compileClasspath,runtimeClasspath +com.android.tools.build:builder-test-api:7.4.0=runtimeClasspath +com.android.tools.build:builder:7.4.0=compileClasspath,runtimeClasspath +com.android.tools.build:bundletool:1.11.4=runtimeClasspath +com.android.tools.build:gradle-api:7.4.0=compileClasspath,runtimeClasspath +com.android.tools.build:gradle-settings-api:7.4.0=runtimeClasspath +com.android.tools.build:gradle:7.4.0=compileClasspath,runtimeClasspath +com.android.tools.build:manifest-merger:30.4.0=compileClasspath,runtimeClasspath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=runtimeClasspath -com.android.tools.ddms:ddmlib:30.3.0=runtimeClasspath -com.android.tools.layoutlib:layoutlib-api:30.3.0=runtimeClasspath -com.android.tools.lint:lint-model:30.3.0=runtimeClasspath -com.android.tools.lint:lint-typedef-remover:30.3.0=runtimeClasspath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0=runtimeClasspath -com.android.tools.utp:android-device-provider-gradle-proto:30.3.0=runtimeClasspath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0=runtimeClasspath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0=runtimeClasspath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0=runtimeClasspath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0=runtimeClasspath -com.android.tools:annotations:30.3.0=runtimeClasspath -com.android.tools:common:30.3.0=runtimeClasspath -com.android.tools:dvlib:30.3.0=runtimeClasspath -com.android.tools:repository:30.3.0=runtimeClasspath -com.android.tools:sdk-common:30.3.0=runtimeClasspath -com.android.tools:sdklib:30.3.0=runtimeClasspath -com.android:signflinger:7.3.0=runtimeClasspath -com.android:zipflinger:7.3.0=compileClasspath,runtimeClasspath +com.android.tools.ddms:ddmlib:30.4.0=runtimeClasspath +com.android.tools.layoutlib:layoutlib-api:30.4.0=runtimeClasspath +com.android.tools.lint:lint-model:30.4.0=runtimeClasspath +com.android.tools.lint:lint-typedef-remover:30.4.0=runtimeClasspath +com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.0=runtimeClasspath +com.android.tools.utp:android-device-provider-gradle-proto:30.4.0=runtimeClasspath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.0=runtimeClasspath +com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.0=runtimeClasspath +com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.0=runtimeClasspath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.0=runtimeClasspath +com.android.tools:annotations:30.4.0=runtimeClasspath +com.android.tools:common:30.4.0=runtimeClasspath +com.android.tools:dvlib:30.4.0=runtimeClasspath +com.android.tools:repository:30.4.0=runtimeClasspath +com.android.tools:sdk-common:30.4.0=runtimeClasspath +com.android.tools:sdklib:30.4.0=runtimeClasspath +com.android:signflinger:7.4.0=runtimeClasspath +com.android:zipflinger:7.4.0=compileClasspath,runtimeClasspath com.google.android:annotations:4.1.1.4=runtimeClasspath com.google.api.grpc:proto-google-common-protos:2.0.1=runtimeClasspath com.google.auto.value:auto-value-annotations:1.6.2=runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=runtimeClasspath -com.google.code.gson:gson:2.8.6=runtimeClasspath +com.google.code.gson:gson:2.8.9=runtimeClasspath com.google.crypto.tink:tink:1.3.0-rc2=runtimeClasspath com.google.dagger:dagger:2.28.3=runtimeClasspath com.google.errorprone:error_prone_annotations:2.4.0=runtimeClasspath @@ -56,8 +57,7 @@ com.google.j2objc:j2objc-annotations:1.3=runtimeClasspath com.google.jimfs:jimfs:1.1=runtimeClasspath com.google.protobuf:protobuf-java-util:3.17.2=runtimeClasspath com.google.protobuf:protobuf-java:3.17.2=runtimeClasspath -com.google.testing.platform:core-proto:0.0.8-alpha07=runtimeClasspath -com.googlecode.json-simple:json-simple:1.1=runtimeClasspath +com.google.testing.platform:core-proto:0.0.8-alpha08=runtimeClasspath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=runtimeClasspath com.squareup:javapoet:1.10.0=runtimeClasspath com.squareup:javawriter:2.5.0=compileClasspath,runtimeClasspath @@ -86,7 +86,6 @@ io.netty:netty-handler:4.1.52.Final=runtimeClasspath io.netty:netty-resolver:4.1.52.Final=runtimeClasspath io.netty:netty-transport:4.1.52.Final=runtimeClasspath io.perfmark:perfmark-api:0.23.0=runtimeClasspath -it.unimi.dsi:fastutil:8.4.0=runtimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=runtimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=runtimeClasspath javax.annotation:javax.annotation-api:1.3.2=runtimeClasspath @@ -129,8 +128,7 @@ org.jetbrains.kotlin:kotlin-native-utils:1.7.10=kotlinCompilerPluginClasspathMai org.jetbrains.kotlin:kotlin-native-utils:1.8.0=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-project-model:1.7.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-project-model:1.8.0=compileClasspath,runtimeClasspath -org.jetbrains.kotlin:kotlin-reflect:1.5.31=runtimeClasspath -org.jetbrains.kotlin:kotlin-reflect:1.7.10=compileClasspath,kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.7.10=compileClasspath,kotlinCompilerClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-script-runtime:1.7.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=kotlinCompilerPluginClasspathMain @@ -141,14 +139,10 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=kotlinComp org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.0=runtimeClasspath org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.0=runtimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=runtimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=runtimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=runtimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=compileClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.5.31=runtimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-tooling-core:1.8.0=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-util-io:1.7.10=kotlinCompilerPluginClasspathMain @@ -158,11 +152,11 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=runtimeClasspath org.jetbrains:annotations:13.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath org.json:json:20180813=runtimeClasspath org.jvnet.staxex:stax-ex:1.8.1=runtimeClasspath -org.ow2.asm:asm-analysis:9.1=runtimeClasspath -org.ow2.asm:asm-commons:9.1=runtimeClasspath -org.ow2.asm:asm-tree:9.1=runtimeClasspath -org.ow2.asm:asm-util:9.1=runtimeClasspath -org.ow2.asm:asm:9.1=compileClasspath,runtimeClasspath +org.ow2.asm:asm-analysis:9.2=runtimeClasspath +org.ow2.asm:asm-commons:9.2=runtimeClasspath +org.ow2.asm:asm-tree:9.2=runtimeClasspath +org.ow2.asm:asm-util:9.2=runtimeClasspath +org.ow2.asm:asm:9.2=compileClasspath,runtimeClasspath org.slf4j:slf4j-api:1.7.30=runtimeClasspath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=runtimeClasspath wtf.emulator:gradle-plugin:0.0.12=compileClasspath,runtimeClasspath diff --git a/build-conventions-secant/src/main/kotlin/secant.android-build-conventions.gradle.kts b/build-conventions-secant/src/main/kotlin/secant.android-build-conventions.gradle.kts index 8726267b0..cd96414f6 100644 --- a/build-conventions-secant/src/main/kotlin/secant.android-build-conventions.gradle.kts +++ b/build-conventions-secant/src/main/kotlin/secant.android-build-conventions.gradle.kts @@ -32,6 +32,7 @@ pluginManager.withPlugin("com.android.library") { defaultConfig { minSdk = project.property("ANDROID_LIB_MIN_SDK_VERSION").toString().toInt() + // This is deprecated but we don't have a replacement for the instrumentation APKs yet targetSdk = project.property("ANDROID_TARGET_SDK_VERSION").toString().toInt() // The last two are for support of pseudolocales in debug builds. @@ -60,6 +61,7 @@ pluginManager.withPlugin("com.android.test") { defaultConfig { minSdk = project.property("ANDROID_LIB_MIN_SDK_VERSION").toString().toInt() + // This is deprecated but we don't have a replacement for the instrumentation APKs yet targetSdk = project.property("ANDROID_TARGET_SDK_VERSION").toString().toInt() // The last two are for support of pseudolocales in debug builds. diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile index 78f2d1810..1bc158c1f 100644 --- a/buildscript-gradle.lockfile +++ b/buildscript-gradle.lockfile @@ -1,52 +1,53 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.databinding:databinding-common:7.3.0=classpath -androidx.databinding:databinding-compiler-common:7.3.0=classpath -com.android.databinding:baseLibrary:7.3.0=classpath -com.android.tools.analytics-library:crash:30.3.0=classpath -com.android.tools.analytics-library:protos:30.3.0=classpath -com.android.tools.analytics-library:shared:30.3.0=classpath -com.android.tools.analytics-library:tracker:30.3.0=classpath +androidx.databinding:databinding-common:7.4.0=classpath +androidx.databinding:databinding-compiler-common:7.4.0=classpath +com.android.databinding:baseLibrary:7.4.0=classpath +com.android.tools.analytics-library:crash:30.4.0=classpath +com.android.tools.analytics-library:protos:30.4.0=classpath +com.android.tools.analytics-library:shared:30.4.0=classpath +com.android.tools.analytics-library:tracker:30.4.0=classpath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath -com.android.tools.build:aapt2-proto:7.3.0-8691043=classpath -com.android.tools.build:aaptcompiler:7.3.0=classpath -com.android.tools.build:apksig:7.3.0=classpath -com.android.tools.build:apkzlib:7.3.0=classpath -com.android.tools.build:builder-model:7.3.0=classpath -com.android.tools.build:builder-test-api:7.3.0=classpath -com.android.tools.build:builder:7.3.0=classpath -com.android.tools.build:bundletool:1.9.0=classpath -com.android.tools.build:gradle-api:7.3.0=classpath -com.android.tools.build:gradle:7.3.0=classpath -com.android.tools.build:manifest-merger:30.3.0=classpath +com.android.tools.build:aapt2-proto:7.4.0-8841542=classpath +com.android.tools.build:aaptcompiler:7.4.0=classpath +com.android.tools.build:apksig:7.4.0=classpath +com.android.tools.build:apkzlib:7.4.0=classpath +com.android.tools.build:builder-model:7.4.0=classpath +com.android.tools.build:builder-test-api:7.4.0=classpath +com.android.tools.build:builder:7.4.0=classpath +com.android.tools.build:bundletool:1.11.4=classpath +com.android.tools.build:gradle-api:7.4.0=classpath +com.android.tools.build:gradle-settings-api:7.4.0=classpath +com.android.tools.build:gradle:7.4.0=classpath +com.android.tools.build:manifest-merger:30.4.0=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:30.3.0=classpath -com.android.tools.layoutlib:layoutlib-api:30.3.0=classpath -com.android.tools.lint:lint-model:30.3.0=classpath -com.android.tools.lint:lint-typedef-remover:30.3.0=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0=classpath -com.android.tools:annotations:30.3.0=classpath -com.android.tools:common:30.3.0=classpath -com.android.tools:dvlib:30.3.0=classpath -com.android.tools:repository:30.3.0=classpath -com.android.tools:sdk-common:30.3.0=classpath -com.android.tools:sdklib:30.3.0=classpath -com.android:signflinger:7.3.0=classpath -com.android:zipflinger:7.3.0=classpath +com.android.tools.ddms:ddmlib:30.4.0=classpath +com.android.tools.layoutlib:layoutlib-api:30.4.0=classpath +com.android.tools.lint:lint-model:30.4.0=classpath +com.android.tools.lint:lint-typedef-remover:30.4.0=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.0=classpath +com.android.tools.utp:android-device-provider-gradle-proto:30.4.0=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.0=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.0=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.0=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.0=classpath +com.android.tools:annotations:30.4.0=classpath +com.android.tools:common:30.4.0=classpath +com.android.tools:dvlib:30.4.0=classpath +com.android.tools:repository:30.4.0=classpath +com.android.tools:sdk-common:30.4.0=classpath +com.android.tools:sdklib:30.4.0=classpath +com.android:signflinger:7.4.0=classpath +com.android:zipflinger:7.4.0=classpath com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.42.0=classpath,classpathCopy,classpathCopy2 com.github.ben-manes:gradle-versions-plugin:0.42.0=classpath com.google.android:annotations:4.1.1.4=classpath com.google.api.grpc:proto-google-common-protos:2.0.1=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath com.google.code.findbugs:jsr305:3.0.2=classpath -com.google.code.gson:gson:2.8.6=classpath +com.google.code.gson:gson:2.8.9=classpath com.google.crypto.tink:tink:1.3.0-rc2=classpath com.google.dagger:dagger:2.28.3=classpath com.google.errorprone:error_prone_annotations:2.4.0=classpath @@ -58,8 +59,7 @@ com.google.j2objc:j2objc-annotations:1.3=classpath com.google.jimfs:jimfs:1.1=classpath com.google.protobuf:protobuf-java-util:3.17.2=classpath com.google.protobuf:protobuf-java:3.17.2=classpath -com.google.testing.platform:core-proto:0.0.8-alpha07=classpath -com.googlecode.json-simple:json-simple:1.1=classpath +com.google.testing.platform:core-proto:0.0.8-alpha08=classpath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath com.osacky.flank.gradle:fladle:0.17.4=classpath com.osacky.fulladle:com.osacky.fulladle.gradle.plugin:0.17.3=classpathCopy @@ -98,7 +98,6 @@ io.netty:netty-handler:4.1.52.Final=classpath io.netty:netty-resolver:4.1.52.Final=classpath io.netty:netty-transport:4.1.52.Final=classpath io.perfmark:perfmark-api:0.23.0=classpath -it.unimi.dsi:fastutil:8.4.0=classpath jakarta.activation:jakarta.activation-api:1.2.1=classpath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath javax.annotation:javax.annotation-api:1.3.2=classpath @@ -157,11 +156,11 @@ org.jetbrains.kotlinx:kover:0.6.1=classpath org.jetbrains:annotations:13.0=classpath org.json:json:20180813=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath -org.ow2.asm:asm-analysis:9.1=classpath -org.ow2.asm:asm-commons:9.1=classpath -org.ow2.asm:asm-tree:9.1=classpath -org.ow2.asm:asm-util:9.1=classpath -org.ow2.asm:asm:9.1=classpath +org.ow2.asm:asm-analysis:9.2=classpath +org.ow2.asm:asm-commons:9.2=classpath +org.ow2.asm:asm-tree:9.2=classpath +org.ow2.asm:asm-util:9.2=classpath +org.ow2.asm:asm:9.2=classpath org.slf4j:slf4j-api:1.7.30=classpath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath wtf.emulator:gradle-plugin:0.0.12=classpath diff --git a/gradle.properties b/gradle.properties index 75f01ad04..42c1d4906 100644 --- a/gradle.properties +++ b/gradle.properties @@ -102,7 +102,7 @@ ANDROID_COMPILE_SDK_VERSION=33 ANDROID_NDK_VERSION=23.0.7599858 -ANDROID_GRADLE_PLUGIN_VERSION=7.3.0 +ANDROID_GRADLE_PLUGIN_VERSION=7.4.0 DETEKT_VERSION=1.21.0 EMULATOR_WTF_GRADLE_PLUGIN_VERSION=0.0.12 FLANK_VERSION=23.01.0 @@ -138,7 +138,7 @@ ANDROIDX_STARTUP_VERSION=1.1.1 ANDROIDX_TEST_SERVICE_VERSION=1.4.2 ANDROIDX_UI_AUTOMATOR_VERSION=2.2.0-alpha1 ANDROIDX_WORK_MANAGER_VERSION=2.7.1 -CORE_LIBRARY_DESUGARING_VERSION=1.1.6 +CORE_LIBRARY_DESUGARING_VERSION=2.0.0 JACOCO_VERSION=0.8.8 KOTLIN_VERSION=1.8.0 KOTLINX_COROUTINES_VERSION=1.6.4