From 236bbff493ca20b95cb1ecfd18fd09681e8c012c Mon Sep 17 00:00:00 2001 From: Parvesh Monu Date: Thu, 14 Jul 2022 17:27:04 +0530 Subject: [PATCH] Implement react-native-blur for android (#13663) --- android/app/build.gradle | 1 + .../im/status/ethereum/MainApplication.java | 2 + android/build.gradle | 1 + android/settings.gradle | 2 + nix/deps/gradle/deps.json | 194 +++++++++++++----- nix/deps/gradle/deps.list | 1 + nix/deps/gradle/deps.urls | 31 +-- nix/deps/gradle/proj.list | 1 + package.json | 2 +- yarn.lock | 13 +- 10 files changed, 180 insertions(+), 68 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 9f315f76c0..fb0996cb85 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -325,6 +325,7 @@ dependencies { 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') // Force using exact RN version instead of relying on gradle dependency resolution // https://docs.gradle.org/current/userguide/introduction_dependency_management.html#sec:dependency_resolution // NOTE: Uncomment if building RN from a fork diff --git a/android/app/src/main/java/im/status/ethereum/MainApplication.java b/android/app/src/main/java/im/status/ethereum/MainApplication.java index ef93456092..eb613980c7 100644 --- a/android/app/src/main/java/im/status/ethereum/MainApplication.java +++ b/android/app/src/main/java/im/status/ethereum/MainApplication.java @@ -16,6 +16,7 @@ import com.reactnativenavigation.react.NavigationReactNativeHost; import com.facebook.react.ReactPackage; import com.facebook.react.ReactInstanceManager; import com.facebook.react.modules.network.OkHttpClientProvider; +import com.cmcewen.blurview.BlurViewPackage; import java.util.List; @@ -44,6 +45,7 @@ public class MainApplication extends NavigationApplication { packages.add(new ReactNativeDialogsPackage()); packages.add(new RNStatusKeycardPackage()); packages.add(new PushNotificationPackage()); + packages.add(new BlurViewPackage()); return packages; } diff --git a/android/build.gradle b/android/build.gradle index 646ec8089f..761a4e2c75 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -59,6 +59,7 @@ allprojects { flatDir { dirs "libs", System.env.STATUS_GO_ANDROID_LIBDIR } // Everything Else google() + jcenter() // Required for @react-native-community/blur:3.6.1, can be removed after updating to 3.6.1+ mavenCentral() maven { url "https://www.jitpack.io" } } diff --git a/android/settings.gradle b/android/settings.gradle index b7e21aeb2c..44da77afb1 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -18,3 +18,5 @@ include ':react-native-status' project(':react-native-status').projectDir = new File(rootProject.projectDir, '../modules/react-native-status/android') include ':react-native-status-keycard' project(':react-native-status-keycard').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-status-keycard/android') +include ':react-native-blur' +project(':react-native-blur').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/blur/android') diff --git a/nix/deps/gradle/deps.json b/nix/deps/gradle/deps.json index fa5829d38f..9852c3cb72 100644 --- a/nix/deps/gradle/deps.json +++ b/nix/deps/gradle/deps.json @@ -4059,6 +4059,20 @@ } }, + { + "path": "com/eightbitlab/blurview/1.6.6/blurview-1.6.6", + "host": "https://plugins.gradle.org/m2", + "type": "aar", + "pom": { + "sha1": "489f224c45b0b1de96491381bdaa181ccae964a2", + "sha256": "0xjrxz13zkw789npq0d96bxsi5w6f6mjnh9cbnlk3i8gc4c4906q" + }, + "jar": { + "sha1": "6457c0c2928b4580764fafa88ae67a9b451ff0ef", + "sha256": "03y7j7vjyjhqw9imk5wzqghanqh8q541dlhzrmpbdk2sp8hy3cnq" + } + }, + { "path": "com/facebook/fresco/drawee/2.2.0/drawee-2.2.0", "host": "https://plugins.gradle.org/m2", @@ -6052,16 +6066,16 @@ }, { - "path": "com/google/errorprone/error_prone_annotations/2.13.1/error_prone_annotations-2.13.1", + "path": "com/google/errorprone/error_prone_annotations/2.14.0/error_prone_annotations-2.14.0", "host": "https://repo.maven.apache.org/maven2", "type": "jar", "pom": { - "sha1": "74208eaa5abfb59f4b22c80e166120307fa8209b", - "sha256": "1b7xm2kvj6nxr1k296vc2s9p2697ycr85s4lzbwc8jac3gajnzcj" + "sha1": "b8f9d8ab8a705d8deef57834335e49b791b91024", + "sha256": "0vc8606lhppliqp9nw79a9zb4z3pvn1y752b89phi49ri26grzwx" }, "jar": { - "sha1": "0c11e02ad8f1fadf72cd94bdd92cd27d156c7cc4", - "sha256": "1lg6rnhiiy9w7zc4xxcii33z7n9m7ipgkq6yw64kfi765sn2mvpm" + "sha1": "9f01b3654d3c536859705f09f8d267ee977b4004", + "sha256": "0d3zfr8cln2a1g34zsl2p3piq226vpfnjlbhdxynwjfmgd7f550l" } }, @@ -6106,12 +6120,12 @@ }, { - "path": "com/google/errorprone/error_prone_parent/2.13.1/error_prone_parent-2.13.1", + "path": "com/google/errorprone/error_prone_parent/2.14.0/error_prone_parent-2.14.0", "host": "https://repo.maven.apache.org/maven2", "type": "pom", "pom": { - "sha1": "300c99246b98927fe446b3414666fd7cfce3895f", - "sha256": "0x7i271223jlbpqjnanzcbr65mwjyvrqbvhy1sv8kwxiawaxj5s9" + "sha1": "8b8370c00c3adf054df4006bfc3ac73baabd8084", + "sha256": "1dmjlh1sl8hxmw4abv614sj36x91384ngq8b8bl86iaqg9gqjv1r" } }, @@ -6587,6 +6601,20 @@ } }, + { + "path": "com/squareup/okhttp3/okhttp-jvm/5.0.0-alpha.10/okhttp-jvm-5.0.0-alpha.10", + "host": "https://repo.maven.apache.org/maven2", + "type": "jar", + "pom": { + "sha1": "3bb222ca233ea82dbb53cbafeda8742ae18d82d5", + "sha256": "0a6isgq2q71y8dg06wy145ib54r0zpq2rhpp9jlscx9mdj5hxp4b" + }, + "jar": { + "sha1": "27e6e9807cb38ce2f05145ce58ec79eb7c761004", + "sha256": "12a6p4x081cy21r1faps50syrrxlm6wyfi3kq9wkxb72vp2bsph4" + } + }, + { "path": "com/squareup/okhttp3/okhttp-tls/3.12.12/okhttp-tls-3.12.12", "host": "https://repo.maven.apache.org/maven2", @@ -6658,16 +6686,16 @@ }, { - "path": "com/squareup/okhttp3/okhttp/5.0.0-alpha.7/okhttp-5.0.0-alpha.7", + "path": "com/squareup/okhttp3/okhttp/5.0.0-alpha.10/okhttp-5.0.0-alpha.10", "host": "https://repo.maven.apache.org/maven2", "type": "jar", "pom": { - "sha1": "29efdb280f4e785ab0327b5ef111523ee3e742bf", - "sha256": "1hb34971gskba2d7fpz08m4g9gd8a9z3nwl0pgdzx9v6linrfc8d" + "sha1": "fafc3d889175af9dbd5f94eaaaa153cfdfe902dd", + "sha256": "1klkbcnwv09y7blx5aqb9lfkbcc44wi26cpcgz4ralmrbj1xm9vz" }, "jar": { - "sha1": "13e7ffc7e5cc50073da2c67461f182bdd34db407", - "sha256": "0dsgw3sih3v63ici6zicfr8j9m8h0kl57drz6xlak8qgdlk3fsmj" + "sha1": "e23242be21a6110a025a72297ecc02246b189768", + "sha256": "01m2i0jgx21rv119rb51zkdql2zqhf3pprdfhdd6sjw0wcqdkzw0" } }, @@ -6701,6 +6729,20 @@ } }, + { + "path": "com/squareup/okio/okio-jvm/3.2.0/okio-jvm-3.2.0", + "host": "https://repo.maven.apache.org/maven2", + "type": "jar", + "pom": { + "sha1": "749720d97fe3dc16e0d84a05628f4c818b375a85", + "sha256": "17a85p5cf4zdvymmarf8d1cm803jypl89gzjdqdqdskblya1yiaw" + }, + "jar": { + "sha1": "332d1c5dc82b0241cb1d35bb0901d28470cc89ca", + "sha256": "1915c2h1lsb3l12n61pq3y8fvp0n5dxndldk9kg5a02p9kpvlhmn" + } + }, + { "path": "com/squareup/okio/okio-parent/1.15.0/okio-parent-1.15.0", "host": "https://repo.maven.apache.org/maven2", @@ -6726,16 +6768,16 @@ }, { - "path": "com/squareup/okio/okio/3.1.0/okio-3.1.0", + "path": "com/squareup/okio/okio/3.2.0/okio-3.2.0", "host": "https://repo.maven.apache.org/maven2", "type": "jar", "pom": { - "sha1": "7dad37d36cc575776b6a4a2a1a3743a8f6e67964", - "sha256": "11nml30fkdbh3niblx34fahbwy6cyhyiwhcfpv4ajgncm4n744z8" + "sha1": "85284557b21661be1c4983910fef4e35532e1e34", + "sha256": "18bjm7rix9msw1appzy561cndbadby3acn0x6rw13swskf6zailb" }, "jar": { - "sha1": "d8e26d75081f2849ff89922725992b4bcf17d6d5", - "sha256": "0yxii987ymks6if9xwbahp3m2g1nhydkbyjv2vl03jxj7d2amdvq" + "sha1": "afd4b7185a6976c2ac6bfb7b126c257ee9b3e765", + "sha256": "0bafpq8mqf52d7rmj6hkx3zq3m0lifq7vy3hczickdi9435k5afw" } }, @@ -6822,12 +6864,12 @@ }, { - "path": "com/sun/xml/bind/jaxb-bom-ext/4.0.0-M4/jaxb-bom-ext-4.0.0-M4", + "path": "com/sun/xml/bind/jaxb-bom-ext/4.0.0/jaxb-bom-ext-4.0.0", "host": "https://repo.maven.apache.org/maven2", "type": "pom", "pom": { - "sha1": "2be12b54da56c9145f420ce6a202ebbd4300e283", - "sha256": "0ssi1xzcia31pai0s7x9a5cjp4jq4nsrs5psjp56nsgx86jc9lc0" + "sha1": "d2303dfd6470d2818a64d07ed969f9a471774235", + "sha256": "0nzmw546aqn4wixciv3j9wfp9l072vv0p90jm4l9i22vi3rgr87m" } }, @@ -6842,12 +6884,12 @@ }, { - "path": "com/sun/xml/bind/mvn/jaxb-parent/4.0.0-M4/jaxb-parent-4.0.0-M4", + "path": "com/sun/xml/bind/mvn/jaxb-parent/4.0.0/jaxb-parent-4.0.0", "host": "https://repo.maven.apache.org/maven2", "type": "pom", "pom": { - "sha1": "fc66eebd989d4cf9b1ba417fdbaa0853d060a887", - "sha256": "04a9jvm7xmjr1hbw36pl62mkxbvxvzd5vyzyww7av3lxq2by6k1b" + "sha1": "4a804d0d195e0c7676e2d53a945e5565dbd3b619", + "sha256": "07c3rg958m5a6z4ah4cf2a4lr3wcrpvrfp7x18pdb0q3llixk82r" } }, @@ -6872,12 +6914,12 @@ }, { - "path": "com/sun/xml/bind/mvn/jaxb-txw-parent/4.0.0-M4/jaxb-txw-parent-4.0.0-M4", + "path": "com/sun/xml/bind/mvn/jaxb-txw-parent/4.0.0/jaxb-txw-parent-4.0.0", "host": "https://repo.maven.apache.org/maven2", "type": "pom", "pom": { - "sha1": "d3d61c6d1729975b8700a276f4b9b701adc1aeb0", - "sha256": "1v67pnh5yp1z15xdbcvfyk01dvnd9xlk8gsq5n4g4hrcmxfnx19v" + "sha1": "0cb0239b1a0c5443e33444be9b9259185161d62c", + "sha256": "0pwxa7rprjz756vfcr9njrvrrcial81l0cdq309gg4rgf9xmi42z" } }, @@ -8432,16 +8474,16 @@ }, { - "path": "org/checkerframework/checker-qual/3.22.0/checker-qual-3.22.0", + "path": "org/checkerframework/checker-qual/3.23.0/checker-qual-3.23.0", "host": "https://repo.maven.apache.org/maven2", "type": "jar", "pom": { - "sha1": "f0ce7638b341b958d3eca3ab7acfc79bdc097121", - "sha256": "1m9lz0hkvpinj9g35rp55ma1cnwvgq32paf3cwnzsgg5xlzal3bh" + "sha1": "b9a2f1e2a93dfc7a5af2fc2ebf177ac0282dd501", + "sha256": "1y77jdchmmpn1jiq95h8cfnw7zfz3nlsygdzmsv5yszla3x2q56w" }, "jar": { - "sha1": "8e37f79d2cfe45a670e13f728b5e536ba65ac3ef", - "sha256": "13hng8akqhyk96427d36956xpr1rad2n702ivnyfbr935g2h1740" + "sha1": "2ce274da87ae21d940ded7b827d9069206ea3001", + "sha256": "0yvdlv5icnsdsgng470jqq685cdslf0gz94l69f6kc1gza5922da" } }, @@ -8720,12 +8762,12 @@ }, { - "path": "org/glassfish/jaxb/jaxb-bom/4.0.0-M4/jaxb-bom-4.0.0-M4", + "path": "org/glassfish/jaxb/jaxb-bom/4.0.0/jaxb-bom-4.0.0", "host": "https://repo.maven.apache.org/maven2", "type": "pom", "pom": { - "sha1": "0291256d850a2d788d27f5fb2b89830db2197048", - "sha256": "1h56kkph23f3mp7wjqynvpwk2v1drj53r0a7vc41g71gl95kn5l0" + "sha1": "c249a1dfc5c37ce7c23960ea4937731d06050701", + "sha256": "0179i75g2fg1xa8m9y95gxvq005lc0q7v2i7q85x1vgsqq1vmgvh" } }, @@ -8744,16 +8786,16 @@ }, { - "path": "org/glassfish/jaxb/jaxb-core/4.0.0-M4/jaxb-core-4.0.0-M4", + "path": "org/glassfish/jaxb/jaxb-core/4.0.0/jaxb-core-4.0.0", "host": "https://repo.maven.apache.org/maven2", "type": "jar", "pom": { - "sha1": "416e6d2571238ea5fdb6243ae14ea2acb1cd8376", - "sha256": "1gk0w6w05zdas9wf6n44xj6mjj3diw8pl226772jwmckwnsr729p" + "sha1": "a2776aadba768ae99d9cb688f0f8a229d8761069", + "sha256": "1i2fr7qgj9wi6m0z762z1l6hrrx76zlz705bjg78yikzm1mjwcch" }, "jar": { - "sha1": "8a7d7446b1d5a536934e1aed615ae4ff098fe063", - "sha256": "111ibgvawwzvmcg39c20nlr1sp7z4f92snrxan0b01l75wyvn32f" + "sha1": "83ab64d327198b2facd4071415d782ebc69469a1", + "sha256": "0fy1iyr000gri5aa8813ryym3mk5j6fykh37y6flwpq2ab54s4f0" } }, @@ -8786,16 +8828,16 @@ }, { - "path": "org/glassfish/jaxb/txw2/4.0.0-M4/txw2-4.0.0-M4", + "path": "org/glassfish/jaxb/txw2/4.0.0/txw2-4.0.0", "host": "https://repo.maven.apache.org/maven2", "type": "jar", "pom": { - "sha1": "82f537cc1c8c611780d0b86fca322870fd91038a", - "sha256": "16aby2ff9y8akgygpb0wq6g99hn30xa268ikaxq897p0jm5xv0dm" + "sha1": "3d7f129889ba97cc55976365c1458703226416a6", + "sha256": "0cpknc59szlz7i9ql94xlxgaw4fpr3fpbnbimfc918pny8n28ls1" }, "jar": { - "sha1": "0576be0271331ec16e6b004d17ad6b4343c06c2c", - "sha256": "1a980m4xbw6dpr19sczfqs0dpwqjvw9d3k7ylg3lmdxbd210a8g6" + "sha1": "afa5e81b5a9a390c98651a3da71c7f4cde14bcf0", + "sha256": "1hk3b5w556wzckk05fdbjr03v5swygwyr4ayvf72hx0qclpf869q" } }, @@ -9767,6 +9809,20 @@ } }, + { + "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.20/kotlin-stdlib-jdk7-1.6.20", + "host": "https://repo.maven.apache.org/maven2", + "type": "jar", + "pom": { + "sha1": "4476b8c551258e66dc12bd68eb03159b80c81f63", + "sha256": "08dxmrf4aj27jpw7d30szajsqi4g4vrlx2s20f7f51kh4f5dw6w8" + }, + "jar": { + "sha1": "f8629f336bad4001c89e9cffa5ef3d4b5d0f5e22", + "sha256": "083nsraii88sxb5v3xbq2ck45y01yjdid8kxv66xki2m2gla4bxa" + } + }, + { "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.2.71/kotlin-stdlib-jdk8-1.2.71", "host": "https://repo.maven.apache.org/maven2", @@ -9823,6 +9879,20 @@ } }, + { + "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.20/kotlin-stdlib-jdk8-1.6.20", + "host": "https://repo.maven.apache.org/maven2", + "type": "jar", + "pom": { + "sha1": "6207ba2d7a89316eafea7f135ef1fc17e41c424b", + "sha256": "02f3lg4hli4s5cnn4zs2g41740l9knyvsa113b3y22sbc3wajihq" + }, + "jar": { + "sha1": "dab8089bca6ac0e394c37281ea8cff2f99acd421", + "sha256": "159n455n7asx76b14di9ly66pv14q3myk23qdnmygdg243qipazx" + } + }, + { "path": "org/jetbrains/kotlin/kotlin-stdlib-jre7/1.2.0/kotlin-stdlib-jre7-1.2.0", "host": "https://repo.maven.apache.org/maven2", @@ -10019,6 +10089,34 @@ } }, + { + "path": "org/jetbrains/kotlin/kotlin-stdlib/1.6.20/kotlin-stdlib-1.6.20", + "host": "https://repo.maven.apache.org/maven2", + "type": "jar", + "pom": { + "sha1": "a7c1d39b812c8867eca579245d797bbfa16a27c9", + "sha256": "16bg2vdj87y8y8q7bix13srxsxk48hkda8nyfyc5167jn3f873m0" + }, + "jar": { + "sha1": "6cedc143badbb4f1c6b7f5a340b04edff1743208", + "sha256": "16dp5hga717xxwy7c189i4c9g17c8j04zg6hh7yk6qmjcwmirdgf" + } + }, + + { + "path": "org/jetbrains/kotlin/kotlin-stdlib/1.6.21/kotlin-stdlib-1.6.21", + "host": "https://repo.maven.apache.org/maven2", + "type": "jar", + "pom": { + "sha1": "f44be76009ce4253eaa59b914f4dccc384442016", + "sha256": "0d0zmvx7znha69ir50z72n7nzgw4yr6rfzb6mb6kdn0vl1dp4hnf" + }, + "jar": { + "sha1": "11ef67f1900634fd951bad28c53ec957fabbe5b8", + "sha256": "14m428q4m7y8srb7z5m0qfq8ic3f62layqwgn9rpacxvf9k5573k" + } + }, + { "path": "org/jetbrains/kotlin/kotlin-util-io/1.3.50/kotlin-util-io-1.3.50", "host": "https://repo.maven.apache.org/maven2", @@ -10076,12 +10174,12 @@ }, { - "path": "org/junit/junit-bom/5.9.0-M1/junit-bom-5.9.0-M1", + "path": "org/junit/junit-bom/5.9.0-RC1/junit-bom-5.9.0-RC1", "host": "https://repo.maven.apache.org/maven2", "type": "pom", "pom": { - "sha1": "713c5d49ce56b50cb83ad1902b17e98e4b2e68fe", - "sha256": "1ybmmhq2hsqbi6j1b45d743vif9kfdc0hyd6slm5jqgws65xi0jq" + "sha1": "9f1db8b600bdd70516762c3106bab90ac849ccef", + "sha256": "1iivcgfli7m371p9wrjys0n8nmpdhgsnrv2sq0046mmh8f7jvyb3" } }, diff --git a/nix/deps/gradle/deps.list b/nix/deps/gradle/deps.list index 411e121ccb..928d661eaa 100644 --- a/nix/deps/gradle/deps.list +++ b/nix/deps/gradle/deps.list @@ -309,6 +309,7 @@ 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.drewnoakes:metadata-extractor:2.9.1 +com.eightbitlab:blurview:1.6.6 com.facebook.conceal:conceal:1.1.3 com.facebook.fbjni:fbjni-java-only:0.0.3 com.facebook.flipper:flipper-fresco-plugin:0.54.0 diff --git a/nix/deps/gradle/deps.urls b/nix/deps/gradle/deps.urls index b467c3d6e3..2dd82d793f 100644 --- a/nix/deps/gradle/deps.urls +++ b/nix/deps/gradle/deps.urls @@ -288,6 +288,7 @@ https://jitpack.io/com/github/status-im/status-keycard-java/lib/3.0.4/lib-3.0.4. https://jitpack.io/com/github/wix-playground/ahbottomnavigation/3.3.0/ahbottomnavigation-3.3.0.pom https://jitpack.io/com/github/wix-playground/reflow-animator/1.0.6/reflow-animator-1.0.6.pom https://jitpack.io/com/github/yalantis/ucrop/2.2.6-native/ucrop-2.2.6-native.pom +https://plugins.gradle.org/m2/com/eightbitlab/blurview/1.6.6/blurview-1.6.6.pom https://plugins.gradle.org/m2/com/facebook/fresco/drawee/2.2.0/drawee-2.2.0.pom https://plugins.gradle.org/m2/com/facebook/fresco/fbcore/2.2.0/fbcore-2.2.0.pom https://plugins.gradle.org/m2/com/facebook/fresco/fresco/2.2.0/fresco-2.2.0.pom @@ -432,12 +433,12 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotatio https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.1.2/error_prone_annotations-2.1.2.pom https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.2.0/error_prone_annotations-2.2.0.pom https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.3.1/error_prone_annotations-2.3.1.pom -https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.13.1/error_prone_annotations-2.13.1.pom +https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.14.0/error_prone_annotations-2.14.0.pom https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.1.2/error_prone_parent-2.1.2.pom https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1.pom -https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.13.1/error_prone_parent-2.13.1.pom +https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.14.0/error_prone_parent-2.14.0.pom https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/17.0/guava-parent-17.0.pom @@ -476,18 +477,20 @@ https://repo.maven.apache.org/maven2/com/parse/bolts/bolts-applinks/1.4.0/bolts- https://repo.maven.apache.org/maven2/com/parse/bolts/bolts-tasks/1.4.0/bolts-tasks-1.4.0.pom https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.8.0/javapoet-1.8.0.pom https://repo.maven.apache.org/maven2/com/squareup/javawriter/2.5.0/javawriter-2.5.0.pom +https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-jvm/5.0.0-alpha.10/okhttp-jvm-5.0.0-alpha.10.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-tls/3.12.12/okhttp-tls-3.12.12.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/3.12.12/okhttp-urlconnection-3.12.12.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.9.1/okhttp-3.9.1.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.1.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.12/okhttp-3.12.12.pom -https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/5.0.0-alpha.7/okhttp-5.0.0-alpha.7.pom +https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/5.0.0-alpha.10/okhttp-5.0.0-alpha.10.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.9.1/parent-3.9.1.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.1/parent-3.12.1.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.12/parent-3.12.12.pom +https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.2.0/okio-jvm-3.2.0.pom https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.15.0/okio-parent-1.15.0.pom https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.15.0/okio-1.15.0.pom -https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.1.0/okio-3.1.0.pom +https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.2.0/okio-3.2.0.pom https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.0/all-1.2.0.pom https://repo.maven.apache.org/maven2/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.pom https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/2.21/istack-commons-runtime-2.21.pom @@ -495,12 +498,12 @@ https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/4.1.1 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/2.21/istack-commons-2.21.pom https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/4.1.1/istack-commons-4.1.1.pom https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.2.11/jaxb-bom-ext-2.2.11.pom -https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/4.0.0-M4/jaxb-bom-ext-4.0.0-M4.pom +https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/4.0.0/jaxb-bom-ext-4.0.0.pom https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/2.2.11/jaxb-parent-2.2.11.pom -https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/4.0.0-M4/jaxb-parent-4.0.0-M4.pom +https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/4.0.0/jaxb-parent-4.0.0.pom https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.2.11/jaxb-runtime-parent-2.2.11.pom https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/2.2.11/jaxb-txw-parent-2.2.11.pom -https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/4.0.0-M4/jaxb-txw-parent-4.0.0-M4.pom +https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/4.0.0/jaxb-txw-parent-4.0.0.pom https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/1.2.13/FastInfoset-1.2.13.pom https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/2.1.0/FastInfoset-2.1.0.pom https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/fastinfoset-project/1.2.13/fastinfoset-project-1.2.13.pom @@ -628,7 +631,7 @@ https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.60/bcprov-jdk15on-1.60.pom https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.70/bcprov-jdk15on-1.70.pom https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.5.2/checker-qual-2.5.2.pom -https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.22.0/checker-qual-3.22.0.pom +https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.23.0/checker-qual-3.23.0.pom https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-all/2.4.15/groovy-all-2.4.15.pom https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.pom @@ -652,12 +655,12 @@ https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4.2/ecj https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4.pom https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6.1.pom https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.2.11/jaxb-bom-2.2.11.pom -https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/4.0.0-M4/jaxb-bom-4.0.0-M4.pom +https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/4.0.0/jaxb-bom-4.0.0.pom https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/2.2.11/jaxb-core-2.2.11.pom -https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/4.0.0-M4/jaxb-core-4.0.0-M4.pom +https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/4.0.0/jaxb-core-4.0.0.pom https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-runtime/2.2.11/jaxb-runtime-2.2.11.pom https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.2.11/txw2-2.2.11.pom -https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/4.0.0-M4/txw2-4.0.0-M4.pom +https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/4.0.0/txw2-4.0.0.pom https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.pom https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom @@ -728,10 +731,12 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.2 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.20/kotlin-stdlib-jdk7-1.3.20.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.50/kotlin-stdlib-jdk7-1.3.50.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.30/kotlin-stdlib-jdk7-1.5.30.pom +https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.20/kotlin-stdlib-jdk7-1.6.20.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.2.71/kotlin-stdlib-jdk8-1.2.71.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.20/kotlin-stdlib-jdk8-1.3.20.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.50/kotlin-stdlib-jdk8-1.3.50.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.30/kotlin-stdlib-jdk8-1.5.30.pom +https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.20/kotlin-stdlib-jdk8-1.6.20.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jre7/1.2.0/kotlin-stdlib-jre7-1.2.0.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jre8/1.2.0/kotlin-stdlib-jre8-1.2.0.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotlin-stdlib-1.1.3-2.pom @@ -746,11 +751,13 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.71/k https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.31/kotlin-stdlib-1.4.31.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.5.10/kotlin-stdlib-1.5.10.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.5.30/kotlin-stdlib-1.5.30.pom +https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.20/kotlin-stdlib-1.6.20.pom +https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.21/kotlin-stdlib-1.6.21.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.3.50/kotlin-util-io-1.3.50.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.4.31/kotlin-util-io-1.4.31.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.4.31/kotlin-util-klib-1.4.31.pom https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom -https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.9.0-M1/junit-bom-5.9.0-M1.pom +https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.9.0-RC1/junit-bom-5.9.0-RC1.pom https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7.pom https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/2.1.0/stax-ex-2.1.0.pom https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.2/objenesis-parent-3.2.pom diff --git a/nix/deps/gradle/proj.list b/nix/deps/gradle/proj.list index db01c1319b..f31fd3c839 100644 --- a/nix/deps/gradle/proj.list +++ b/nix/deps/gradle/proj.list @@ -1,6 +1,7 @@ app react-native-background-timer react-native-blob-util +react-native-blur react-native-camera-kit react-native-community_async-storage react-native-community_audio-toolkit diff --git a/package.json b/package.json index d4223bf6a0..3109d87179 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@babel/preset-typescript": "^7.17.12", "@react-native-community/async-storage": "^1.11.0", "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6", - "@react-native-community/blur": "^3.6.0", + "@react-native-community/blur": "git+https://github.com/Kureev/react-native-blur#refs/tags/v3.6.1", "@react-native-community/cameraroll": "git+https://github.com/status-im/react-native-cameraroll.git#refs/tags/v4.0.4-status.0", "@react-native-community/clipboard": "^1.2.2", "@react-native-community/hooks": "^2.5.1", diff --git a/yarn.lock b/yarn.lock index 3510190a07..ac64b659a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1473,10 +1473,9 @@ eventemitter3 "^1.2.0" lodash "^4.17.15" -"@react-native-community/blur@^3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@react-native-community/blur/-/blur-3.6.0.tgz#31c9e0f2770519c9b5c4f99418f192246f0d4db8" - integrity sha512-GtDBhpX2pQcjl4VopOC8FktrVufrEfYRwVeMQ2WWckqKIv2BdwvlvWvj88L1WmEdBr9UNcm3rtgz+d+YXkmirA== +"@react-native-community/blur@git+https://github.com/Kureev/react-native-blur#refs/tags/v3.6.1": + version "3.6.1" + resolved "git+https://github.com/Kureev/react-native-blur#9d2d744a5171f3a77564a43f87c2cfb3fbcf597e" dependencies: prop-types "^15.5.10" @@ -7773,9 +7772,9 @@ prop-types@15.x.x, prop-types@^15.6.2, prop-types@^15.7.2: react-is "^16.8.1" prop-types@^15.5.10: - version "15.8.0" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.0.tgz#d237e624c45a9846e469f5f31117f970017ff588" - integrity sha512-fDGekdaHh65eI3lMi5OnErU6a8Ighg2KjcjQxO7m8VHyWjcPyj5kiOgV1LQDOOOgVy3+5FgjXvdSSX7B8/5/4g== + version "15.8.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== dependencies: loose-envify "^1.4.0" object-assign "^4.1.1"