From 63486f7725ed19df10f24c0e0a15f823961fab59 Mon Sep 17 00:00:00 2001 From: michaeltout Date: Sun, 20 Oct 2024 00:05:18 +0200 Subject: [PATCH 1/4] Remove react-native-text-input-mask --- ios/Podfile.lock | 11 ----------- package.json | 1 - .../PhoneNumberModal/PhoneNumberModal.render.js | 6 +++--- .../PersonalContact/PersonalContact.render.js | 4 ++-- yarn.lock | 5 ----- 5 files changed, 5 insertions(+), 22 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 083973e4..4a5c8778 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -31,7 +31,6 @@ PODS: - SwiftNIOSSL (< 3.0.0, >= 2.14.0) - SwiftNIOTransportServices (< 2.0.0, >= 1.11.1) - SwiftProtobuf (< 2.0.0, >= 1.9.0) - - InputMask (6.1.0) - Logging (1.4.0) - lottie-ios (3.4.4) - lottie-react-native (5.1.4): @@ -267,10 +266,6 @@ PODS: - React-Core - react-native-safe-area-context (3.2.0): - React-Core - - react-native-text-input-mask (3.1.4): - - InputMask (~> 6.1.0) - - React-Core - - React-RCTText - react-native-udp (4.1.5): - CocoaAsyncSocket - React-Core @@ -575,7 +570,6 @@ DEPENDENCIES: - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)" - react-native-randombytes (from `../node_modules/react-native-randombytes`) - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) - - react-native-text-input-mask (from `../node_modules/react-native-text-input-mask`) - react-native-udp (from `../node_modules/react-native-udp`) - react-native-verus-light-client (from `../node_modules/react-native-verus-light-client`) - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) @@ -625,7 +619,6 @@ SPEC REPOS: - CocoaAsyncSocket - fmt - gRPC-Swift - - InputMask - Logging - lottie-ios - MnemonicSwift @@ -700,8 +693,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-randombytes" react-native-safe-area-context: :path: "../node_modules/react-native-safe-area-context" - react-native-text-input-mask: - :path: "../node_modules/react-native-text-input-mask" react-native-udp: :path: "../node_modules/react-native-udp" react-native-verus-light-client: @@ -791,7 +782,6 @@ SPEC CHECKSUMS: fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 476ee3e89abb49e07f822b48323c51c57124b572 gRPC-Swift: 8426019a9c56401ee1b9ef00f15fb5530eb8cdd2 - InputMask: 71d291dc54d2deaeac6512afb6ec2304228c0bb7 Logging: beeb016c9c80cf77042d62e83495816847ef108b lottie-ios: 8f97d3271e155c2d688875c29cd3c74908aef5f8 lottie-react-native: b702fab740cdb952a8e2354713d3beda63ff97b0 @@ -817,7 +807,6 @@ SPEC CHECKSUMS: react-native-netinfo: 92e6e4476eb8bf6fc2d7c0a6ca0a1406f663d73a react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846 react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79 - react-native-text-input-mask: 36a546b378fadd2efe1b7484a859d34bc2c80395 react-native-udp: 8864b1211857e9d8224ae5cbaf8580970fb99de1 react-native-verus-light-client: ba8400658314adecefa08593e46d9fa69029bea8 React-perflogger: 0458a87ea9a7342079e7a31b0d32b3734fb8415f diff --git a/package.json b/package.json index 61ba6032..730e9b1f 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,6 @@ "react-native-svg-transformer": "0.14.3", "react-native-tab-view": "2.x", "react-native-tcp": "git+https://github.com/VerusCoin/react-native-tcp.git#be5f656ffd3aa4559270e8472ee24a1c36029cf1", - "react-native-text-input-mask": "3.1.4", "react-native-udp": "4.1.5", "react-native-url-polyfill": "1.3.0", "react-native-vector-icons": "git+https://github.com/VerusCoin/react-native-vector-icons.git", diff --git a/src/components/PhoneNumberModal/PhoneNumberModal.render.js b/src/components/PhoneNumberModal/PhoneNumberModal.render.js index b5533b06..420e68ab 100644 --- a/src/components/PhoneNumberModal/PhoneNumberModal.render.js +++ b/src/components/PhoneNumberModal/PhoneNumberModal.render.js @@ -1,6 +1,6 @@ import React from "react"; import { ScrollView, View } from "react-native"; -import TextInputMask from 'react-native-text-input-mask'; +//import TextInputMask from 'react-native-text-input-mask'; import { Text, TextInput, RadioButton, List, Divider } from "react-native-paper"; import Styles from "../../styles/"; import SemiModal from "../SemiModal"; @@ -58,7 +58,7 @@ export const PhoneNumberModalRender = function () { marginTop: 16, }} > - )} - /> + /> */} diff --git a/src/containers/Personal/PersonalContact/PersonalContact.render.js b/src/containers/Personal/PersonalContact/PersonalContact.render.js index 9304024c..e515b58d 100644 --- a/src/containers/Personal/PersonalContact/PersonalContact.render.js +++ b/src/containers/Personal/PersonalContact/PersonalContact.render.js @@ -99,7 +99,7 @@ export const PersonalContactRender = function () { onPress={() => this.openAddEmailModal()} /> - {"Phone numbers"} + {/* {"Phone numbers"} {this.state.contact.phone_numbers == null ? null @@ -133,7 +133,7 @@ export const PersonalContactRender = function () { right={(props) => } onPress={() => this.openAddPhoneModal()} /> - + */} ); diff --git a/yarn.lock b/yarn.lock index a8cb4287..b815f3a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9547,11 +9547,6 @@ react-native-tab-view@2.x: process "^0.11.9" util "^0.12.1" -react-native-text-input-mask@3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/react-native-text-input-mask/-/react-native-text-input-mask-3.1.4.tgz#9b09d97a910ce8c24024d6187256b07c73e173ac" - integrity sha512-XhTPL1/Pv0kyuH8TMJGaxfnq5su9e+4G2PLngiismZ4xbP8+W/1ZEH4KQJQV+QkE2I5Oi+lPJXB2E47s60/OBA== - react-native-udp@4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/react-native-udp/-/react-native-udp-4.1.5.tgz#bd164fa6280fd61c3b19f89e0aff2d2d058c262b" From 9d1cc6e2ee29e1ff875f1ccbc3c1cc22b99563f8 Mon Sep 17 00:00:00 2001 From: michaeltout Date: Sun, 20 Oct 2024 00:54:42 +0200 Subject: [PATCH 2/4] Remove jitpack --- android/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index d870e3d9..317bfc86 100755 --- a/android/build.gradle +++ b/android/build.gradle @@ -52,7 +52,6 @@ allprojects { maven { // Android JSC is installed from npm url("$rootDir/../node_modules/jsc-android/dist") - url 'https://www.jitpack.io' } google() } From c0a10e3e2f6592c8f0f99105ad4764b2b1d4cdcb Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 19 Oct 2024 16:41:59 -0700 Subject: [PATCH 3/4] Bump Android target sdk version --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 317bfc86..e62a05a5 100755 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,8 +4,8 @@ buildscript { ext { buildToolsVersion = "31.0.0" minSdkVersion = 21 - compileSdkVersion = 33 - targetSdkVersion = 33 + compileSdkVersion = 34 + targetSdkVersion = 34 if (System.properties['os.arch'] == "aarch64") { // For M1 Users we need to use the NDK 24 which added support for aarch64 @@ -23,7 +23,7 @@ buildscript { google() } dependencies { - classpath("com.android.tools.build:gradle:7.0.4") + classpath("com.android.tools.build:gradle:7.1.2") classpath("com.facebook.react:react-native-gradle-plugin") classpath("de.undercouch:gradle-download-task:4.1.2") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") From 92d5ef8699d21e1531787ec5e143f08911104cd5 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 19 Oct 2024 16:47:58 -0700 Subject: [PATCH 4/4] Bump build --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 14185ba9..535e0e17 100755 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -5,7 +5,7 @@ import com.android.build.OutputFile def versionMajor = 1 def versionMinor = 0 def versionRevision = 18 -def versionBuild = 0 +def versionBuild = 1 def keystorePropertiesFile = rootProject.file("keystore.properties");