Skip to content

Commit

Permalink
nix: moar android fixes
Browse files Browse the repository at this point in the history 
Signed-off-by: Jakub Sokołowski <[email protected]>
  • Loading branch information
@jakubgs
jakubgs committed Mar 21, 2023
1 parent fdd40a7 commit a8be1a6
Show file tree
Hide file tree
Showing 5 changed files with 123 additions and 86 deletions.
180 changes: 105 additions & 75 deletions nix/deps/gradle/deps.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4694,6 +4694,36 @@
}
},

{
"path": "com/android/tools/external/com-intellij/intellij-core/30.3.1",
"repo": "https://dl.google.com/dl/android/maven2",
"files": {
"intellij-core-30.3.1.pom": {
"sha1": "318bd7c093f3afce10ac773b585a3f176104292e",
"sha256": "0lis99ira6id1m378hcmwidf2adx5kvxklk82n9h4a6kaikilzvg"
},
"intellij-core-30.3.1.jar": {
"sha1": "7756210606d11ce9a9e8c628de79c4bbbea2d6fe",
"sha256": "0204vs9v9spivy19ni0jkjc3zj4y9b21lwqs6kz0h8nxp37sxclb"
}
}
},

{
"path": "com/android/tools/external/com-intellij/kotlin-compiler/30.3.1",
"repo": "https://dl.google.com/dl/android/maven2",
"files": {
"kotlin-compiler-30.3.1.pom": {
"sha1": "4ff44581d5e7ee3e1231e5593c798c298b687bd6",
"sha256": "1bd71ik4rpxpv22hm4f2bm1ybapkm8xc6j4dsrvjm9c5x4yk06cb"
},
"kotlin-compiler-30.3.1.jar": {
"sha1": "5d74e769b865cff40e7ecfb691782bbe21941a73",
"sha256": "1n3gpgjiv4pdsivw4vxh4m4ki89hcans58wk9wgwgpmgpwd9xp6c"
}
}
},

{
"path": "com/android/tools/external/org-jetbrains/uast/26.0.0",
"repo": "https://dl.google.com/dl/android/maven2",
Expand Down Expand Up @@ -4724,6 +4754,21 @@
}
},

{
"path": "com/android/tools/external/org-jetbrains/uast/30.3.1",
"repo": "https://dl.google.com/dl/android/maven2",
"files": {
"uast-30.3.1.pom": {
"sha1": "3c3071e33877317524e158b3669729b3a6f286d0",
"sha256": "1x5gnj27nd8hlx22askq4yhfff3c8pi2vpp602qf8nyasjxqin2c"
},
"uast-30.3.1.jar": {
"sha1": "82347eff1a38a5f13919854f58ec0f13eeb92e19",
"sha256": "1n3nc1bwvdyzhw8cd7yvijfvs6il6f88d3kq53vhkam9lv13zgs7"
}
}
},

{
"path": "com/android/tools/layoutlib/layoutlib-api/26.0.0",
"repo": "https://dl.google.com/dl/android/maven2",
Expand Down Expand Up @@ -4874,6 +4919,21 @@
}
},

{
"path": "com/android/tools/lint/lint-api/30.3.1",
"repo": "https://dl.google.com/dl/android/maven2",
"files": {
"lint-api-30.3.1.pom": {
"sha1": "d8475accd9a6840b126703ea6757d043246eda9c",
"sha256": "049braardidrmw164kzdrf5i50llady0p1bg8hkbiiffasvk7abl"
},
"lint-api-30.3.1.jar": {
"sha1": "b6f7f7e9453b4a62fcd49d60c56076a3236d3748",
"sha256": "0b283mlvw196avmvy790qfd0fag3sc84mfwblcx3c9k22ixbsvnc"
}
}
},

{
"path": "com/android/tools/lint/lint-checks/26.0.0",
"repo": "https://dl.google.com/dl/android/maven2",
Expand Down Expand Up @@ -4904,6 +4964,21 @@
}
},

{
"path": "com/android/tools/lint/lint-checks/30.3.1",
"repo": "https://dl.google.com/dl/android/maven2",
"files": {
"lint-checks-30.3.1.pom": {
"sha1": "c6f724e60dca93134ade5f74e08baa371872e8ec",
"sha256": "1z9klri49fhchszcxpy6y8xrf7gxdzc4arcbjq5svn0j5by65zjx"
},
"lint-checks-30.3.1.jar": {
"sha1": "3de62d61661ad665e8561a1186654889fc4cdda8",
"sha256": "13my0wfj9rkpzwjy3yz0kfc50d11z0czaxrz6dhwpqdlcsz2i9x6"
}
}
},

{
"path": "com/android/tools/lint/lint-gradle-api/26.2.1",
"repo": "https://dl.google.com/dl/android/maven2",
Expand Down Expand Up @@ -4964,6 +5039,21 @@
}
},

{
"path": "com/android/tools/lint/lint-gradle/30.3.1",
"repo": "https://dl.google.com/dl/android/maven2",
"files": {
"lint-gradle-30.3.1.pom": {
"sha1": "918d6da1cdb8267624ef3ca208df65e5a603c8d1",
"sha256": "1hp59vcgs66jxmxqbgi5r65037mm01zm9k162mrh6bv6mw5qfgvf"
},
"lint-gradle-30.3.1.jar": {
"sha1": "db2f578c8c1dbf3be7888fb5f923fae7db1fdcb7",
"sha256": "0xj6qxi0mpblyqgxpsds5zz67jirqvf1kckxcn8by9lwfv0ll71k"
}
}
},

{
"path": "com/android/tools/lint/lint-model/27.1.0",
"repo": "https://dl.google.com/dl/android/maven2",
Expand Down Expand Up @@ -5069,6 +5159,21 @@
}
},

{
"path": "com/android/tools/lint/lint/30.3.1",
"repo": "https://dl.google.com/dl/android/maven2",
"files": {
"lint-30.3.1.pom": {
"sha1": "13efd4230c81446b85dd47d18f3c0c00ad177472",
"sha256": "0192nw4dg8mfci6h5i9hz5adq6w2ca018smxbhlakpy2k0ag2zq1"
},
"lint-30.3.1.jar": {
"sha1": "e84f007751bfbc68dad10bbc79ecb9cc484c6e5b",
"sha256": "0r5qa59457n35sz39p4r4p4djnaw9idhdnvlmilcqs335xw80l38"
}
}
},

{
"path": "com/android/tools/repository/26.0.0",
"repo": "https://dl.google.com/dl/android/maven2",
Expand Down Expand Up @@ -7199,21 +7304,6 @@
}
},

{
"path": "com/facebook/fbjni/fbjni/0.3.0",
"repo": "https://repo.maven.apache.org/maven2",
"files": {
"fbjni-0.3.0.pom": {
"sha1": "bf4bf68c915ef1ee5e22e945e6c27c2f28c388fe",
"sha256": "17sn87z6w38fkiw6mllcv3gwdkshd8vgmijl0yirjkpan3lmq23f"
},
"fbjni-0.3.0.aar": {
"sha1": "17fe26833dbdcebabc70764ded55c4f60665f486",
"sha256": "1zbmycrcyh457ygvqks14j4nclqqvc36icjdxdcabcg038qxjwz5"
}
}
},

{
"path": "com/facebook/flipper/flipper-fresco-plugin/0.93.0",
"repo": "https://repo.maven.apache.org/maven2",
Expand Down Expand Up @@ -7686,21 +7776,6 @@
}
},

{
"path": "com/facebook/soloader/annotation/0.10.4",
"repo": "https://repo.maven.apache.org/maven2",
"files": {
"annotation-0.10.4.pom": {
"sha1": "63dcb923870f47fafc10b0890cab4e82a7ef7323",
"sha256": "0dp74jwh51159yh40l50c7rg5l30a1pjygckghxaqmz5w8cg5wqw"
},
"annotation-0.10.4.jar": {
"sha1": "dc58463712cb3e5f03d8ee5ac9743b9ced9afa77",
"sha256": "1syln51ijdd207wb4lwlyh2msb9v2i5r1l3zyk4n96q2yyp8f35d"
}
}
},

{
"path": "com/facebook/soloader/nativeloader/0.8.2",
"repo": "https://repo.maven.apache.org/maven2",
Expand Down Expand Up @@ -7731,36 +7806,6 @@
}
},

{
"path": "com/facebook/soloader/nativeloader/0.10.3",
"repo": "https://repo.maven.apache.org/maven2",
"files": {
"nativeloader-0.10.3.pom": {
"sha1": "05a2d26157377c5bd8e1c77bcd00ba34f07dd488",
"sha256": "17sqni46gc6hig7jf79mbyz28477ccgk961i84x8c01bzc2xa0wy"
},
"nativeloader-0.10.3.jar": {
"sha1": "171783d0f3f525fb9e18eb3af758c0b3aaeaed69",
"sha256": "0i173j7zri6wsbkj9ag5h2kwc3lygkv3jbk6fsmcl93rybynqb27"
}
}
},

{
"path": "com/facebook/soloader/nativeloader/0.10.4",
"repo": "https://repo.maven.apache.org/maven2",
"files": {
"nativeloader-0.10.4.pom": {
"sha1": "039619fbfa885c79b361ac86ca013264a51bc539",
"sha256": "0c9nh3vnpqqpfrzq1fy2j3c950mx6aip67kvn6mdk45hhygydi9k"
},
"nativeloader-0.10.4.jar": {
"sha1": "171783d0f3f525fb9e18eb3af758c0b3aaeaed69",
"sha256": "0i173j7zri6wsbkj9ag5h2kwc3lygkv3jbk6fsmcl93rybynqb27"
}
}
},

{
"path": "com/facebook/soloader/soloader/0.8.2",
"repo": "https://repo.maven.apache.org/maven2",
Expand Down Expand Up @@ -7791,21 +7836,6 @@
}
},

{
"path": "com/facebook/soloader/soloader/0.10.4",
"repo": "https://repo.maven.apache.org/maven2",
"files": {
"soloader-0.10.4.pom": {
"sha1": "9900e94663f5848e6b3eaf0e2556a4b703455a6e",
"sha256": "0c1jp14hsfjbdj7hsyjyqb25j8ha6m80cpazz3rq11kii76g46px"
},
"soloader-0.10.4.aar": {
"sha1": "3fda45c99faf58310107fb8c0857e6a671b89854",
"sha256": "1y96bys9hr0yv3237fx773bf20icajfxq8riaxmy2j83k2rsrjwd"
}
}
},

{
"path": "com/facebook/stetho/stetho/1.3.1",
"repo": "https://repo.maven.apache.org/maven2",
Expand Down
12 changes: 8 additions & 4 deletions nix/deps/gradle/deps.list
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ 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:0.3.0
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
Expand Down Expand Up @@ -456,9 +456,12 @@ com.facebook.fresco:ui-common:2.5.0
com.facebook.infer.annotation:infer-annotation:0.18.0
com.facebook.react:hermes-android:0.71.4
com.facebook.react:react-android:0.71.4
com.facebook.soloader:annotation:0.10.4
com.facebook.soloader:nativeloader:0.10.4
com.facebook.soloader:soloader:0.10.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
Expand Down Expand Up @@ -800,3 +803,4 @@ 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
12 changes: 7 additions & 5 deletions nix/deps/gradle/deps.urls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,11 @@ https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.2.1/dvlib-30.
https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.3.1/dvlib-30.3.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.0/intellij-core-26.0.0.pom
https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.1/intellij-core-26.0.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/30.3.1/intellij-core-30.3.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/kotlin-compiler/30.3.1/kotlin-compiler-30.3.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.0.0/uast-26.0.0.pom
https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.0.1/uast-26.0.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/30.3.1/uast-30.3.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.0/layoutlib-api-26.0.0.pom
https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.1/layoutlib-api-26.0.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.2.1/layoutlib-api-26.2.1.pom
Expand All @@ -323,19 +326,23 @@ https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-ap
https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.3.1/layoutlib-api-30.3.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.0/lint-api-26.0.0.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.1/lint-api-26.0.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/30.3.1/lint-api-30.3.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.0/lint-checks-26.0.0.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.1/lint-checks-26.0.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/30.3.1/lint-checks-30.3.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.2.1/lint-gradle-api-26.2.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.3.1/lint-gradle-api-26.3.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.5.4/lint-gradle-api-26.5.4.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/27.1.0/lint-gradle-api-27.1.0.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/30.3.1/lint-gradle-30.3.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/27.1.0/lint-model-27.1.0.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.2.1/lint-model-30.2.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.3.1/lint-model-30.3.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.2.1/lint-typedef-remover-30.2.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.3.1/lint-typedef-remover-30.3.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.0/lint-26.0.0.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/lint-26.0.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/30.3.1/lint-30.3.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.0/repository-26.0.0.pom
https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1/repository-26.0.1.pom
https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.2.1/repository-26.2.1.pom
Expand Down Expand Up @@ -478,7 +485,6 @@ https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-plugin-gradl
https://repo.maven.apache.org/maven2/com/drewnoakes/metadata-extractor/2.9.1/metadata-extractor-2.9.1.pom
https://repo.maven.apache.org/maven2/com/facebook/conceal/conceal/1.1.3/conceal-1.1.3.pom
https://repo.maven.apache.org/maven2/com/facebook/fbjni/fbjni/0.2.2/fbjni-0.2.2.pom
https://repo.maven.apache.org/maven2/com/facebook/fbjni/fbjni/0.3.0/fbjni-0.3.0.pom
https://repo.maven.apache.org/maven2/com/facebook/flipper/flipper-fresco-plugin/0.93.0/flipper-fresco-plugin-0.93.0.pom
https://repo.maven.apache.org/maven2/com/facebook/flipper/flipper-network-plugin/0.93.0/flipper-network-plugin-0.93.0.pom
https://repo.maven.apache.org/maven2/com/facebook/flipper/flipper/0.93.0/flipper-0.93.0.pom
Expand Down Expand Up @@ -511,14 +517,10 @@ https://repo.maven.apache.org/maven2/com/facebook/react/hermes-android/0.71.4/he
https://repo.maven.apache.org/maven2/com/facebook/react/react-android/0.71.4/react-android-0.71.4.pom
https://repo.maven.apache.org/maven2/com/facebook/soloader/annotation/0.8.2/annotation-0.8.2.pom
https://repo.maven.apache.org/maven2/com/facebook/soloader/annotation/0.10.1/annotation-0.10.1.pom
https://repo.maven.apache.org/maven2/com/facebook/soloader/annotation/0.10.4/annotation-0.10.4.pom
https://repo.maven.apache.org/maven2/com/facebook/soloader/nativeloader/0.8.2/nativeloader-0.8.2.pom
https://repo.maven.apache.org/maven2/com/facebook/soloader/nativeloader/0.10.1/nativeloader-0.10.1.pom
https://repo.maven.apache.org/maven2/com/facebook/soloader/nativeloader/0.10.3/nativeloader-0.10.3.pom
https://repo.maven.apache.org/maven2/com/facebook/soloader/nativeloader/0.10.4/nativeloader-0.10.4.pom
https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.8.2/soloader-0.8.2.pom
https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.1/soloader-0.10.1.pom
https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.4/soloader-0.10.4.pom
https://repo.maven.apache.org/maven2/com/facebook/stetho/stetho/1.3.1/stetho-1.3.1.pom
https://repo.maven.apache.org/maven2/com/facebook/yoga/proguard-annotations/1.19.0/proguard-annotations-1.19.0.pom
https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1.pom
Expand Down
1 change: 1 addition & 0 deletions nix/deps/gradle/generate.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ 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

Expand Down
4 changes: 2 additions & 2 deletions nix/pkgs/android-sdk/compose.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
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 = "23.1.7779620";
includeNDK = true;
Expand Down

0 comments on commit a8be1a6

Please sign in to comment.