From 8439c2065798618c33e7c5133ddd6669c1917b16 Mon Sep 17 00:00:00 2001 From: Siddarth Kumar Date: Mon, 20 Mar 2023 11:47:00 +0530 Subject: [PATCH] (0.71.4) Android - fixes `ndkVersion`-> "23.1.7779620" android: fix missing gradle dependencies nix: moar android fixes add dependency for AsyncStorage --- android/app/build.gradle | 4 +- android/build.gradle | 16 --- nix/deps/gradle/deps.list | 214 +++++++++++++++++------------- nix/deps/gradle/generate.sh | 3 + nix/deps/gradle/gradle_parser.awk | 6 +- nix/pkgs/android-sdk/compose.nix | 6 +- 6 files changed, 138 insertions(+), 111 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index e54c4bb6a84..15bc2979b71 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -330,7 +330,9 @@ dependencies { // react-native-screens implementation 'androidx.appcompat:appcompat:1.1.0-rc01' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02' - + implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation 'com.facebook.soloader:soloader:0.10.1' + implementation 'androidx.multidex:multidex:2.0.1' // only needed if minSdkVersion is less than 21 (https://developer.android.com/studio/build/multidex) implementation project(':react-native-dialogs') implementation project(':react-native-blur') diff --git a/android/build.gradle b/android/build.gradle index 1518bf8dcb1..4163318a48d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -59,23 +59,7 @@ allprojects { } repositories { - exclusiveContent { - // We get React Native's Android binaries exclusively through npm, - // from a local Maven repo inside node_modules/react-native/. - // (The use of exclusiveContent prevents looking elsewhere like Maven Central - // and potentially getting a wrong version.) - filter { - includeGroup "com.facebook.react" - } - forRepository { - maven { - url "$rootDir/../node_modules/react-native/android" - } - } - } - mavenLocal() - // For geth, function, and status-go flatDir { dirs "libs", System.env.STATUS_GO_ANDROID_LIBDIR } // Everything Else diff --git a/nix/deps/gradle/deps.list b/nix/deps/gradle/deps.list index acdc438c12e..798131511c1 100644 --- a/nix/deps/gradle/deps.list +++ b/nix/deps/gradle/deps.list @@ -10,7 +10,7 @@ androidx.appcompat:appcompat-resources:1.1.0 androidx.appcompat:appcompat-resources:1.1.0-rc01 androidx.appcompat:appcompat-resources:1.2.0 androidx.appcompat:appcompat-resources:1.3.1 -androidx.appcompat:appcompat:1.0.2 +androidx.appcompat:appcompat:1.0.0 androidx.appcompat:appcompat:1.1.0 androidx.appcompat:appcompat:1.1.0-rc01 androidx.appcompat:appcompat:1.2.0 @@ -21,7 +21,6 @@ androidx.arch.core:core-common:2.1.0-rc01 androidx.arch.core:core-runtime:2.0.0 androidx.arch.core:core-runtime:2.1.0 androidx.asynclayoutinflater:asynclayoutinflater:1.0.0 -androidx.autofill:autofill:1.1.0 androidx.cardview:cardview:1.0.0 androidx.collection:collection:1.0.0 androidx.collection:collection:1.1.0 @@ -31,7 +30,7 @@ androidx.coordinatorlayout:coordinatorlayout:1.0.0 androidx.coordinatorlayout:coordinatorlayout:1.1.0 androidx.core:core-ktx:1.6.0 androidx.core:core-splashscreen:1.0.0 -androidx.core:core:1.0.1 +androidx.core:core:1.0.0 androidx.core:core:1.1.0 androidx.core:core:1.1.0-rc01 androidx.core:core:1.6.0 @@ -40,13 +39,15 @@ androidx.customview:customview:1.0.0 androidx.databinding:databinding-common:3.2.1 androidx.databinding:databinding-common:3.3.1 androidx.databinding:databinding-common:3.5.4 +androidx.databinding:databinding-common:4.1.0 androidx.databinding:databinding-common:7.2.1 -androidx.databinding:databinding-common:7.3.0 +androidx.databinding:databinding-common:7.3.1 androidx.databinding:databinding-compiler-common:3.2.1 androidx.databinding:databinding-compiler-common:3.3.1 androidx.databinding:databinding-compiler-common:3.5.4 +androidx.databinding:databinding-compiler-common:4.1.0 androidx.databinding:databinding-compiler-common:7.2.1 -androidx.databinding:databinding-compiler-common:7.3.0 +androidx.databinding:databinding-compiler-common:7.3.1 androidx.documentfile:documentfile:1.0.0 androidx.drawerlayout:drawerlayout:1.0.0 androidx.exifinterface:exifinterface:1.1.0-beta01 @@ -93,12 +94,13 @@ androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02 androidx.tracing:tracing:1.0.0 +androidx.transition:transition:1.1.0 androidx.transition:transition:1.2.0 androidx.transition:transition:1.2.0-rc01 androidx.vectordrawable:vectordrawable-animated:1.0.0 androidx.vectordrawable:vectordrawable-animated:1.1.0 androidx.vectordrawable:vectordrawable-animated:1.1.0-rc01 -androidx.vectordrawable:vectordrawable:1.0.1 +androidx.vectordrawable:vectordrawable:1.0.0 androidx.vectordrawable:vectordrawable:1.1.0 androidx.vectordrawable:vectordrawable:1.1.0-rc01 androidx.versionedparcelable:versionedparcelable:1.0.0 @@ -123,45 +125,45 @@ com.airbnb.android:lottie:3.4.4 com.android.databinding:baseLibrary:1.0-rc5 com.android.databinding:baseLibrary:3.0.0 com.android.databinding:baseLibrary:3.0.1 -com.android.databinding:baseLibrary:3.1.4 com.android.databinding:baseLibrary:3.2.1 com.android.databinding:baseLibrary:3.3.1 com.android.databinding:baseLibrary:3.5.4 +com.android.databinding:baseLibrary:4.1.0 com.android.databinding:baseLibrary:7.2.1 -com.android.databinding:baseLibrary:7.3.0 +com.android.databinding:baseLibrary:7.3.1 com.android.databinding:compilerCommon:1.0-rc5 com.android.databinding:compilerCommon:3.0.0 com.android.databinding:compilerCommon:3.0.1 -com.android.databinding:compilerCommon:3.1.4 com.android.tools.analytics-library:crash:26.2.1 com.android.tools.analytics-library:crash:26.3.1 com.android.tools.analytics-library:crash:26.5.4 +com.android.tools.analytics-library:crash:27.1.0 com.android.tools.analytics-library:crash:30.2.1 -com.android.tools.analytics-library:crash:30.3.0 +com.android.tools.analytics-library:crash:30.3.1 com.android.tools.analytics-library:protos:26.0.0 com.android.tools.analytics-library:protos:26.0.1 -com.android.tools.analytics-library:protos:26.1.4 com.android.tools.analytics-library:protos:26.2.1 com.android.tools.analytics-library:protos:26.3.1 com.android.tools.analytics-library:protos:26.5.4 +com.android.tools.analytics-library:protos:27.1.0 com.android.tools.analytics-library:protos:30.2.1 -com.android.tools.analytics-library:protos:30.3.0 +com.android.tools.analytics-library:protos:30.3.1 com.android.tools.analytics-library:shared:26.0.0 com.android.tools.analytics-library:shared:26.0.1 -com.android.tools.analytics-library:shared:26.1.4 com.android.tools.analytics-library:shared:26.2.1 com.android.tools.analytics-library:shared:26.3.1 com.android.tools.analytics-library:shared:26.5.4 +com.android.tools.analytics-library:shared:27.1.0 com.android.tools.analytics-library:shared:30.2.1 -com.android.tools.analytics-library:shared:30.3.0 +com.android.tools.analytics-library:shared:30.3.1 com.android.tools.analytics-library:tracker:26.0.0 com.android.tools.analytics-library:tracker:26.0.1 -com.android.tools.analytics-library:tracker:26.1.4 com.android.tools.analytics-library:tracker:26.2.1 com.android.tools.analytics-library:tracker:26.3.1 com.android.tools.analytics-library:tracker:26.5.4 +com.android.tools.analytics-library:tracker:27.1.0 com.android.tools.analytics-library:tracker:30.2.1 -com.android.tools.analytics-library:tracker:30.3.0 +com.android.tools.analytics-library:tracker:30.3.1 com.android.tools.build.jetifier:jetifier-core:1.0.0-alpha10 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta02 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta04 @@ -172,101 +174,102 @@ com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta02 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta04 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10 -com.android.tools.build:aapt2-proto:0.1.0 com.android.tools.build:aapt2-proto:0.3.1 com.android.tools.build:aapt2-proto:0.4.0 +com.android.tools.build:aapt2-proto:4.1.0-6503028 com.android.tools.build:aapt2-proto:7.2.1-7984345 -com.android.tools.build:aapt2-proto:7.3.0-8691043 +com.android.tools.build:aapt2-proto:7.3.1-8691043 +com.android.tools.build:aaptcompiler:4.1.0 com.android.tools.build:aaptcompiler:7.2.1 -com.android.tools.build:aaptcompiler:7.3.0 +com.android.tools.build:aaptcompiler:7.3.1 com.android.tools.build:apksig:3.0.0 com.android.tools.build:apksig:3.0.1 -com.android.tools.build:apksig:3.1.4 com.android.tools.build:apksig:3.2.1 com.android.tools.build:apksig:3.3.1 com.android.tools.build:apksig:3.5.4 +com.android.tools.build:apksig:4.1.0 com.android.tools.build:apksig:7.2.1 -com.android.tools.build:apksig:7.3.0 +com.android.tools.build:apksig:7.3.1 com.android.tools.build:apkzlib:3.2.1 com.android.tools.build:apkzlib:3.3.1 com.android.tools.build:apkzlib:3.5.4 +com.android.tools.build:apkzlib:4.1.0 com.android.tools.build:apkzlib:7.2.1 -com.android.tools.build:apkzlib:7.3.0 +com.android.tools.build:apkzlib:7.3.1 com.android.tools.build:builder-model:1.1.3 com.android.tools.build:builder-model:1.3.1 com.android.tools.build:builder-model:1.5.0 com.android.tools.build:builder-model:3.0.0 com.android.tools.build:builder-model:3.0.1 -com.android.tools.build:builder-model:3.1.4 com.android.tools.build:builder-model:3.2.1 com.android.tools.build:builder-model:3.3.1 com.android.tools.build:builder-model:3.5.4 +com.android.tools.build:builder-model:4.1.0 com.android.tools.build:builder-model:7.2.1 -com.android.tools.build:builder-model:7.3.0 +com.android.tools.build:builder-model:7.3.1 com.android.tools.build:builder-test-api:1.1.3 com.android.tools.build:builder-test-api:1.3.1 com.android.tools.build:builder-test-api:1.5.0 com.android.tools.build:builder-test-api:3.0.0 com.android.tools.build:builder-test-api:3.0.1 -com.android.tools.build:builder-test-api:3.1.4 com.android.tools.build:builder-test-api:3.2.1 com.android.tools.build:builder-test-api:3.3.1 com.android.tools.build:builder-test-api:3.5.4 +com.android.tools.build:builder-test-api:4.1.0 com.android.tools.build:builder-test-api:7.2.1 -com.android.tools.build:builder-test-api:7.3.0 +com.android.tools.build:builder-test-api:7.3.1 com.android.tools.build:builder:1.1.3 com.android.tools.build:builder:1.3.1 com.android.tools.build:builder:1.5.0 com.android.tools.build:builder:3.0.0 com.android.tools.build:builder:3.0.1 -com.android.tools.build:builder:3.1.4 com.android.tools.build:builder:3.2.1 com.android.tools.build:builder:3.3.1 com.android.tools.build:builder:3.5.4 +com.android.tools.build:builder:4.1.0 com.android.tools.build:builder:7.2.1 -com.android.tools.build:builder:7.3.0 -com.android.tools.build:bundletool:0.1.0-alpha01 +com.android.tools.build:builder:7.3.1 com.android.tools.build:bundletool:0.5.0 com.android.tools.build:bundletool:0.6.0 com.android.tools.build:bundletool:0.9.0 +com.android.tools.build:bundletool:0.14.0 com.android.tools.build:bundletool:1.8.2 com.android.tools.build:bundletool:1.9.0 com.android.tools.build:gradle-api:3.0.0 com.android.tools.build:gradle-api:3.0.1 -com.android.tools.build:gradle-api:3.1.4 com.android.tools.build:gradle-api:3.2.1 com.android.tools.build:gradle-api:3.3.1 com.android.tools.build:gradle-api:3.5.4 +com.android.tools.build:gradle-api:4.1.0 com.android.tools.build:gradle-api:7.2.1 -com.android.tools.build:gradle-api:7.3.0 +com.android.tools.build:gradle-api:7.3.1 com.android.tools.build:gradle-core:1.1.3 com.android.tools.build:gradle-core:1.3.1 com.android.tools.build:gradle-core:1.5.0 com.android.tools.build:gradle-core:3.0.0 com.android.tools.build:gradle-core:3.0.1 -com.android.tools.build:gradle-core:3.1.4 com.android.tools.build:gradle:1.1.3 com.android.tools.build:gradle:1.3.1 com.android.tools.build:gradle:1.5.0 com.android.tools.build:gradle:3.0.0 com.android.tools.build:gradle:3.0.1 -com.android.tools.build:gradle:3.1.4 com.android.tools.build:gradle:3.2.1 com.android.tools.build:gradle:3.3.1 com.android.tools.build:gradle:3.5.4 +com.android.tools.build:gradle:4.1.0 com.android.tools.build:gradle:7.2.1 -com.android.tools.build:gradle:7.3.0 +com.android.tools.build:gradle:7.3.1 com.android.tools.build:manifest-merger:24.1.3 com.android.tools.build:manifest-merger:24.3.1 com.android.tools.build:manifest-merger:24.5.0 com.android.tools.build:manifest-merger:26.0.0 com.android.tools.build:manifest-merger:26.0.1 -com.android.tools.build:manifest-merger:26.1.4 com.android.tools.build:manifest-merger:26.2.1 com.android.tools.build:manifest-merger:26.3.1 com.android.tools.build:manifest-merger:26.5.4 +com.android.tools.build:manifest-merger:27.1.0 com.android.tools.build:manifest-merger:30.2.1 -com.android.tools.build:manifest-merger:30.3.0 +com.android.tools.build:manifest-merger:30.3.1 com.android.tools.build:transform-api:1.5.0 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api com.android.tools.ddms:ddmlib:24.1.3 @@ -274,12 +277,12 @@ com.android.tools.ddms:ddmlib:24.3.1 com.android.tools.ddms:ddmlib:24.5.0 com.android.tools.ddms:ddmlib:26.0.0 com.android.tools.ddms:ddmlib:26.0.1 -com.android.tools.ddms:ddmlib:26.1.4 com.android.tools.ddms:ddmlib:26.2.1 com.android.tools.ddms:ddmlib:26.3.1 com.android.tools.ddms:ddmlib:26.5.4 +com.android.tools.ddms:ddmlib:27.1.0 com.android.tools.ddms:ddmlib:30.2.1 -com.android.tools.ddms:ddmlib:30.3.0 +com.android.tools.ddms:ddmlib:30.3.1 com.android.tools.external.com-intellij:intellij-core:26.0.0 com.android.tools.external.com-intellij:intellij-core:26.0.1 com.android.tools.external.lombok:lombok-ast:0.2.3 @@ -292,12 +295,12 @@ com.android.tools.layoutlib:layoutlib-api:24.3.1 com.android.tools.layoutlib:layoutlib-api:24.5.0 com.android.tools.layoutlib:layoutlib-api:26.0.0 com.android.tools.layoutlib:layoutlib-api:26.0.1 -com.android.tools.layoutlib:layoutlib-api:26.1.4 com.android.tools.layoutlib:layoutlib-api:26.2.1 com.android.tools.layoutlib:layoutlib-api:26.3.1 com.android.tools.layoutlib:layoutlib-api:26.5.4 +com.android.tools.layoutlib:layoutlib-api:27.1.0 com.android.tools.layoutlib:layoutlib-api:30.2.1 -com.android.tools.layoutlib:layoutlib-api:30.3.0 +com.android.tools.layoutlib:layoutlib-api:30.3.1 com.android.tools.lint:lint-api:24.1.3 com.android.tools.lint:lint-api:24.3.1 com.android.tools.lint:lint-api:24.5.0 @@ -308,98 +311,101 @@ com.android.tools.lint:lint-checks:24.3.1 com.android.tools.lint:lint-checks:24.5.0 com.android.tools.lint:lint-checks:26.0.0 com.android.tools.lint:lint-checks:26.0.1 -com.android.tools.lint:lint-gradle-api:26.1.4 com.android.tools.lint:lint-gradle-api:26.2.1 com.android.tools.lint:lint-gradle-api:26.3.1 com.android.tools.lint:lint-gradle-api:26.5.4 +com.android.tools.lint:lint-gradle-api:27.1.0 +com.android.tools.lint:lint-model:27.1.0 com.android.tools.lint:lint-model:30.2.1 -com.android.tools.lint:lint-model:30.3.0 +com.android.tools.lint:lint-model:30.3.1 com.android.tools.lint:lint-typedef-remover:30.2.1 -com.android.tools.lint:lint-typedef-remover:30.3.0 +com.android.tools.lint:lint-typedef-remover:30.3.1 com.android.tools.lint:lint:24.1.3 com.android.tools.lint:lint:24.3.1 com.android.tools.lint:lint:24.5.0 com.android.tools.lint:lint:26.0.0 com.android.tools.lint:lint:26.0.1 com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.1 -com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0 +com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.1 com.android.tools.utp:android-device-provider-gradle-proto:30.2.1 -com.android.tools.utp:android-device-provider-gradle-proto:30.3.0 +com.android.tools.utp:android-device-provider-gradle-proto:30.3.1 com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.1 -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0 +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.1 com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.1 -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0 +com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.1 com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.1 -com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0 +com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.1 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.1 -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0 +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.1 com.android.tools:annotations:24.1.3 com.android.tools:annotations:24.3.1 com.android.tools:annotations:24.5.0 com.android.tools:annotations:26.0.0 com.android.tools:annotations:26.0.1 -com.android.tools:annotations:26.1.4 com.android.tools:annotations:26.2.1 com.android.tools:annotations:26.3.1 com.android.tools:annotations:26.5.4 +com.android.tools:annotations:27.1.0 com.android.tools:annotations:30.2.1 -com.android.tools:annotations:30.3.0 +com.android.tools:annotations:30.3.1 com.android.tools:common:24.1.3 com.android.tools:common:24.3.1 com.android.tools:common:24.5.0 com.android.tools:common:26.0.0 com.android.tools:common:26.0.1 -com.android.tools:common:26.1.4 com.android.tools:common:26.2.1 com.android.tools:common:26.3.1 com.android.tools:common:26.5.4 +com.android.tools:common:27.1.0 com.android.tools:common:30.2.1 -com.android.tools:common:30.3.0 +com.android.tools:common:30.3.1 com.android.tools:dvlib:24.1.3 com.android.tools:dvlib:24.3.1 com.android.tools:dvlib:24.5.0 com.android.tools:dvlib:26.0.0 com.android.tools:dvlib:26.0.1 -com.android.tools:dvlib:26.1.4 com.android.tools:dvlib:26.2.1 com.android.tools:dvlib:26.3.1 com.android.tools:dvlib:26.5.4 +com.android.tools:dvlib:27.1.0 com.android.tools:dvlib:30.2.1 -com.android.tools:dvlib:30.3.0 +com.android.tools:dvlib:30.3.1 com.android.tools:repository:26.0.0 com.android.tools:repository:26.0.1 -com.android.tools:repository:26.1.4 com.android.tools:repository:26.2.1 com.android.tools:repository:26.3.1 com.android.tools:repository:26.5.4 +com.android.tools:repository:27.1.0 com.android.tools:repository:30.2.1 -com.android.tools:repository:30.3.0 +com.android.tools:repository:30.3.1 com.android.tools:sdklib:24.1.3 com.android.tools:sdklib:24.3.1 com.android.tools:sdklib:24.5.0 com.android.tools:sdklib:26.0.0 com.android.tools:sdklib:26.0.1 -com.android.tools:sdklib:26.1.4 com.android.tools:sdklib:26.2.1 com.android.tools:sdklib:26.3.1 com.android.tools:sdklib:26.5.4 +com.android.tools:sdklib:27.1.0 com.android.tools:sdklib:30.2.1 -com.android.tools:sdklib:30.3.0 +com.android.tools:sdklib:30.3.1 com.android.tools:sdk-common:24.1.3 com.android.tools:sdk-common:24.3.1 com.android.tools:sdk-common:24.5.0 com.android.tools:sdk-common:26.0.0 com.android.tools:sdk-common:26.0.1 -com.android.tools:sdk-common:26.1.4 com.android.tools:sdk-common:26.2.1 com.android.tools:sdk-common:26.3.1 com.android.tools:sdk-common:26.5.4 +com.android.tools:sdk-common:27.1.0 com.android.tools:sdk-common:30.2.1 -com.android.tools:sdk-common:30.3.0 +com.android.tools:sdk-common:30.3.1 +com.android:signflinger:4.1.0 com.android:signflinger:7.2.1 -com.android:signflinger:7.3.0 +com.android:signflinger:7.3.1 +com.android:zipflinger:4.1.0 com.android:zipflinger:7.2.1 -com.android:zipflinger:7.3.0 +com.android:zipflinger:7.3.1 com.diffplug.durian:durian-collect:1.2.0 com.diffplug.durian:durian-core:1.2.0 com.diffplug.durian:durian-io:1.2.0 @@ -411,33 +417,51 @@ com.diffplug.spotless:spotless-plugin-gradle:6.7.2 com.diffplug.spotless:spotless-plugin-gradle:6.11.0 com.drewnoakes:metadata-extractor:2.9.1 com.facebook.conceal:conceal:1.1.3 -com.facebook.fbjni:fbjni-java-only:0.2.2 +com.facebook.fbjni:fbjni:0.2.2 com.facebook.flipper:flipper-fresco-plugin:0.93.0 +com.facebook.flipper:flipper-network-plugin:0.93.0 com.facebook.flipper:flipper:0.93.0 com.facebook.fresco:animated-base:2.2.0 com.facebook.fresco:animated-drawable:2.2.0 com.facebook.fresco:animated-gif:2.2.0 +com.facebook.fresco:drawee:2.2.0 com.facebook.fresco:drawee:2.5.0 +com.facebook.fresco:fbcore:2.2.0 com.facebook.fresco:fbcore:2.5.0 com.facebook.fresco:flipper:2.5.0 +com.facebook.fresco:fresco:2.2.0 com.facebook.fresco:fresco:2.5.0 +com.facebook.fresco:imagepipeline-base:2.2.0 com.facebook.fresco:imagepipeline-base:2.5.0 +com.facebook.fresco:imagepipeline-native:2.2.0 com.facebook.fresco:imagepipeline-native:2.5.0 -com.facebook.fresco:imagepipeline-okhttp3:2.5.0 +com.facebook.fresco:imagepipeline:2.2.0 com.facebook.fresco:imagepipeline:2.5.0 +com.facebook.fresco:memory-type-ashmem:2.2.0 com.facebook.fresco:memory-type-ashmem:2.5.0 +com.facebook.fresco:memory-type-java:2.2.0 com.facebook.fresco:memory-type-java:2.5.0 +com.facebook.fresco:memory-type-native:2.2.0 com.facebook.fresco:memory-type-native:2.5.0 com.facebook.fresco:middleware:2.5.0 +com.facebook.fresco:nativeimagefilters:2.2.0 com.facebook.fresco:nativeimagefilters:2.5.0 +com.facebook.fresco:nativeimagetranscoder:2.2.0 com.facebook.fresco:nativeimagetranscoder:2.5.0 +com.facebook.fresco:soloader:2.2.0 com.facebook.fresco:soloader:2.5.0 com.facebook.fresco:stetho:2.5.0 +com.facebook.fresco:ui-common:2.2.0 com.facebook.fresco:ui-common:2.5.0 com.facebook.infer.annotation:infer-annotation:0.18.0 -com.facebook.soloader:annotation:0.10.3 -com.facebook.soloader:nativeloader:0.10.3 -com.facebook.soloader:soloader:0.10.3 +com.facebook.react:hermes-android:0.71.4 +com.facebook.react:react-android:0.71.4 +com.facebook.soloader:annotation:0.8.2 +com.facebook.soloader:annotation:0.10.1 +com.facebook.soloader:nativeloader:0.8.2 +com.facebook.soloader:nativeloader:0.10.1 +com.facebook.soloader:soloader:0.8.2 +com.facebook.soloader:soloader:0.10.1 com.facebook.yoga:proguard-annotations:1.19.0 com.fasterxml.jackson.core:jackson-annotations:2.11.1 com.fasterxml.jackson.core:jackson-core:2.11.1 @@ -476,7 +500,6 @@ com.google.code.findbugs:jsr305:1.3.9 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.2.4 com.google.code.gson:gson:2.3 -com.google.code.gson:gson:2.7 com.google.code.gson:gson:2.8.0 com.google.code.gson:gson:2.8.5 com.google.code.gson:gson:2.8.6 @@ -484,9 +507,9 @@ com.google.code.gson:gson:2.8.9 com.google.crypto.tink:tink:1.3.0-rc2 com.google.dagger:dagger:2.28.3 com.google.errorprone:error_prone_annotations:2.0.18 -com.google.errorprone:error_prone_annotations:2.1.2 com.google.errorprone:error_prone_annotations:2.2.0 com.google.errorprone:error_prone_annotations:2.3.1 +com.google.errorprone:error_prone_annotations:2.3.2 com.google.errorprone:error_prone_annotations:2.3.4 com.google.errorprone:error_prone_annotations:2.4.0 com.google.errorprone:error_prone_annotations:2.7.1 @@ -497,6 +520,7 @@ com.google.guava:guava:22.0 com.google.guava:guava:23.0 com.google.guava:guava:26.0-jre com.google.guava:guava:27.0.1-jre +com.google.guava:guava:28.1-jre com.google.guava:guava:29.0-jre com.google.guava:guava:30.1-jre com.google.guava:guava:31.0.1-jre @@ -512,28 +536,34 @@ com.google.protobuf:protobuf-java:3.4.0 com.google.protobuf:protobuf-java:3.10.0 com.google.protobuf:protobuf-java:3.17.2 com.google.testing.platform:core-proto:0.0.8-alpha07 +com.google.test.platform:core-proto:0.0.2-dev com.google.zxing:core:3.3.0 com.intellij:annotations:12.0 com.parse.bolts:bolts-applinks:1.4.0 com.parse.bolts:bolts-tasks:1.4.0 com.squareup.okhttp3:okhttp-tls:4.9.1 -com.squareup.okhttp3:okhttp-urlconnection:4.9.2 -com.squareup.okhttp3:okhttp:4.9.2 -com.squareup.okio:okio:2.9.0 +com.squareup.okhttp3:okhttp:3.9.1 +com.squareup.okhttp3:okhttp:3.12.1 +com.squareup.okhttp3:okhttp:4.9.1 +com.squareup.okio:okio:1.13.0 +com.squareup.okio:okio:1.15.0 +com.squareup.okio:okio:1.17.4 +com.squareup.okio:okio:2.8.0 com.squareup:javapoet:1.8.0 com.squareup:javapoet:1.10.0 com.squareup:javapoet:1.13.0 com.squareup:javawriter:2.5.0 com.sun.activation:javax.activation:1.2.0 com.sun.istack:istack-commons-runtime:2.21 +com.sun.istack:istack-commons-runtime:3.0.7 com.sun.istack:istack-commons-runtime:3.0.8 com.sun.xml.fastinfoset:FastInfoset:1.2.13 +com.sun.xml.fastinfoset:FastInfoset:1.2.15 com.sun.xml.fastinfoset:FastInfoset:1.2.16 com.tunnelvisionlabs:antlr4-annotations:4.5 com.tunnelvisionlabs:antlr4-runtime:4.5 com.tunnelvisionlabs:antlr4:4.5 de.undercouch:gradle-download-task:4.1.1 -de.undercouch:gradle-download-task:4.1.2 de.undercouch:gradle-download-task:5.0.1 io.grpc:grpc-api:1.21.1 io.grpc:grpc-api:1.39.0 @@ -576,9 +606,11 @@ it.unimi.dsi:fastutil:7.2.0 it.unimi.dsi:fastutil:8.4.0 jakarta.activation:jakarta.activation-api:1.2.1 jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 +javax.activation:javax.activation-api:1.2.0 javax.annotation:javax.annotation-api:1.3.2 javax.inject:javax.inject:1 javax.xml.bind:jaxb-api:2.2.12-b140109.1041 +javax.xml.bind:jaxb-api:2.3.1 junit:junit:4.12 me.zhanghai.android.materialprogressbar:library:1.4.2 net.java.dev.jna:jna-platform:5.6.0 @@ -627,6 +659,7 @@ org.bouncycastle:bcprov-jdk15on:1.56 org.bouncycastle:bcprov-jdk15on:1.60 org.bouncycastle:bcprov-jdk15on:1.67 org.checkerframework:checker-qual:2.5.2 +org.checkerframework:checker-qual:2.8.1 org.checkerframework:checker-qual:2.11.1 org.checkerframework:checker-qual:3.5.0 org.checkerframework:checker-qual:3.12.0 @@ -636,6 +669,7 @@ org.codehaus.groovy:groovy:3.0.9 org.codehaus.groovy:groovy:3.0.10 org.codehaus.mojo:animal-sniffer-annotations:1.14 org.codehaus.mojo:animal-sniffer-annotations:1.17 +org.codehaus.mojo:animal-sniffer-annotations:1.18 org.codehaus.mojo:animal-sniffer-annotations:1.19 org.codehaus.woodstox:stax2-api:4.2.1 org.conscrypt:conscrypt-android:2.0.0 @@ -646,8 +680,10 @@ org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r org.eclipse.jgit:org.eclipse.jgit:5.13.1.202206130422-r org.glassfish.jaxb:jaxb-core:2.2.11 org.glassfish.jaxb:jaxb-runtime:2.2.11 +org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:jaxb-runtime:2.3.2 org.glassfish.jaxb:txw2:2.2.11 +org.glassfish.jaxb:txw2:2.3.1 org.glassfish.jaxb:txw2:2.3.2 org.hamcrest:hamcrest-core:1.3 org.jacoco:org.jacoco.agent:0.8.7 @@ -684,6 +720,7 @@ org.jetbrains.kotlin:kotlin-reflect:1.1.3-2 org.jetbrains.kotlin:kotlin-reflect:1.2.0 org.jetbrains.kotlin:kotlin-reflect:1.3.20 org.jetbrains.kotlin:kotlin-reflect:1.3.50 +org.jetbrains.kotlin:kotlin-reflect:1.3.72 org.jetbrains.kotlin:kotlin-reflect:1.5.31 org.jetbrains.kotlin:kotlin-reflect:1.6.20 org.jetbrains.kotlin:kotlin-scripting-common:1.6.20 @@ -694,10 +731,7 @@ org.jetbrains.kotlin:kotlin-script-runtime:1.6.20 org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.20 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 +org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72 org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20 @@ -705,6 +739,7 @@ org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.20 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10 @@ -712,31 +747,23 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.20 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.0 -org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.0 org.jetbrains.kotlin:kotlin-stdlib:1.1.3-2 -org.jetbrains.kotlin:kotlin-stdlib:1.2.0 org.jetbrains.kotlin:kotlin-stdlib:1.2.71 org.jetbrains.kotlin:kotlin-stdlib:1.3.20 org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -org.jetbrains.kotlin:kotlin-stdlib:1.5.10 -org.jetbrains.kotlin:kotlin-stdlib:1.5.30 +org.jetbrains.kotlin:kotlin-stdlib:1.3.72 org.jetbrains.kotlin:kotlin-stdlib:1.5.31 org.jetbrains.kotlin:kotlin-stdlib:1.6.10 org.jetbrains.kotlin:kotlin-stdlib:1.6.20 org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -org.jetbrains.kotlin:kotlin-util-io:1.3.50 -org.jetbrains.kotlin:kotlin-util-io:1.4.31 +org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.20 org.jetbrains.kotlin:kotlin-util-io:1.6.20 -org.jetbrains.kotlin:kotlin-util-klib:1.4.31 org.jetbrains.kotlin:kotlin-util-klib:1.6.20 -org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.20 org.jetbrains.trove4j:trove4j:20160824 org.jetbrains:annotations:13.0 org.jetbrains:markdown-jvm:0.2.1 @@ -744,27 +771,36 @@ org.jetbrains:markdown:0.2.1 org.json:json:20180813 org.jsoup:jsoup:1.13.1 org.jvnet.staxex:stax-ex:1.7.7 +org.jvnet.staxex:stax-ex:1.8 org.jvnet.staxex:stax-ex:1.8.1 org.ow2.asm:asm-analysis:5.0.3 org.ow2.asm:asm-analysis:5.1 org.ow2.asm:asm-analysis:6.0 +org.ow2.asm:asm-analysis:7.0 org.ow2.asm:asm-analysis:9.1 org.ow2.asm:asm-commons:5.1 org.ow2.asm:asm-commons:6.0 +org.ow2.asm:asm-commons:7.0 org.ow2.asm:asm-commons:9.1 org.ow2.asm:asm-debug-all:5.0.1 org.ow2.asm:asm-tree:5.0.3 org.ow2.asm:asm-tree:5.1 org.ow2.asm:asm-tree:6.0 +org.ow2.asm:asm-tree:7.0 org.ow2.asm:asm-tree:9.1 org.ow2.asm:asm-util:5.1 org.ow2.asm:asm-util:6.0 +org.ow2.asm:asm-util:7.0 org.ow2.asm:asm-util:9.1 org.ow2.asm:asm:5.0.3 org.ow2.asm:asm:5.1 org.ow2.asm:asm:6.0 +org.ow2.asm:asm:7.0 org.ow2.asm:asm:9.1 org.slf4j:slf4j-api:1.7.30 +org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1 org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2 xerces:xercesImpl:2.12.0 xml-apis:xml-apis:1.4.01 +org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.10 +com.android.tools.lint:lint-gradle:30.3.1 diff --git a/nix/deps/gradle/generate.sh b/nix/deps/gradle/generate.sh index bb9a2279e6d..ddaa2e08289 100755 --- a/nix/deps/gradle/generate.sh +++ b/nix/deps/gradle/generate.sh @@ -83,6 +83,9 @@ fi # Run each stage in order gen_proj_list gen_deps_list +# FIXME: Temporary fix for missing package. +echo 'org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.10' >> "${DEPS_LIST}" +echo 'com.android.tools.lint:lint-gradle:30.3.1' >> "${DEPS_LIST}" gen_deps_urls gen_deps_json diff --git a/nix/deps/gradle/gradle_parser.awk b/nix/deps/gradle/gradle_parser.awk index cfa96430098..7ab40ce60c3 100644 --- a/nix/deps/gradle/gradle_parser.awk +++ b/nix/deps/gradle/gradle_parser.awk @@ -25,8 +25,10 @@ function findPackage(line, regex) { # Lines after configuration name list packages for (getline line; line != ""; getline line) { - # React Native is provided by node_modules - if (line ~ "com.facebook.react:react-native") { continue } + # Example: +--- com.facebook.react:react-native:+ -> com.facebook.react:react-android:0.71.4 + if (findPackage(line, "--- [^ ]+ -> ([^ :]+):([^ :]+):([^ :]+)$")) { + continue + } # Example: +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 if (findPackage(line, "--- ([^ :]+):([^ :]+):([^ :]+)$")) { diff --git a/nix/pkgs/android-sdk/compose.nix b/nix/pkgs/android-sdk/compose.nix index 27f3da22c87..326a58bbe9e 100644 --- a/nix/pkgs/android-sdk/compose.nix +++ b/nix/pkgs/android-sdk/compose.nix @@ -10,10 +10,10 @@ androidenv.composeAndroidPackages { toolsVersion = "26.1.1"; platformToolsVersion = "33.0.2"; - buildToolsVersions = [ "31.0.0" ]; - platformVersions = [ "31" ]; + buildToolsVersions = [ "33.0.0" ]; + platformVersions = [ "33" ]; cmakeVersions = [ "3.18.1" ]; - ndkVersion = "22.1.7171670"; + ndkVersion = "23.1.7779620"; includeNDK = true; includeExtras = [ "extras;android;m2repository"