chore: remove patch-package in favor of native yarn patches

This commit is contained in:
Mo
2022-06-12 11:13:39 -05:00
parent a3627a69da
commit 6de06265f0
4 changed files with 22 additions and 145 deletions

View File

@@ -17,7 +17,6 @@
"tsc": "tsc --noEmit",
"start": "react-native start",
"install:pods": "yarn pod-install ios",
"postinstall": "patch-package",
"android:bundle": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/build/intermediates/res/merged/release/",
"upgrade:snjs": "ncu -u '@standardnotes/*' && yarn"
},
@@ -56,7 +55,7 @@
"react-native-fs": "^2.19.0",
"react-native-gesture-handler": "2.3.2",
"react-native-image-picker": "^4.7.3",
"react-native-keychain": "^8.0.0",
"react-native-keychain": "patch:react-native-keychain@8.0.0#./patches/react-native-keychain+8.0.0.patch",
"react-native-mail": "standardnotes/react-native-mail#fd26119e67a2ffc5eaa95a9c17049743e39ce2d3",
"react-native-privacy-snapshot": "standardnotes/react-native-privacy-snapshot#653e904c90fc6f2b578da59138f2bfe5d7f942fe",
"react-native-reanimated": "^2.8.0",
@@ -66,7 +65,7 @@
"react-native-search-box": "standardnotes/react-native-search-box#8c46369912cba78dca718588aca9c16926953ff7",
"react-native-share": "^7.3.7",
"react-native-sodium-jsi": "1.2.0",
"react-native-static-server": "standardnotes/react-native-static-server#d0c4cb0feae233634ef26fc33118f258192c7b7d",
"react-native-static-server": "standardnotes/react-native-static-server#6b5baab43f11f8b2072d17183f9f35b08fa0707b",
"react-native-store-review": "^0.2.0",
"react-native-svg": "^12.3.0",
"react-native-svg-transformer": "^1.0.0",
@@ -108,7 +107,6 @@
"jest-circus": "^27.5.1",
"metro-react-native-babel-preset": "^0.70.1",
"npm-check-updates": "^12.5.9",
"patch-package": "^6.4.7",
"pod-install": "^0.1.33",
"prettier": "^2.6.0",
"prettier-plugin-organize-imports": "^2.3.4",

View File

@@ -1,10 +1,10 @@
Fixes Android on launch performance issue
https://github.com/oblador/react-native-keychain/issues/314#issuecomment-736640077
diff --git a/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/KeychainModule.java b/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/KeychainModule.java
diff --git a/android/src/main/java/com/oblador/keychain/KeychainModule.java b/android/src/main/java/com/oblador/keychain/KeychainModule.java
index 6ca68cb..a600f38 100644
--- a/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/KeychainModule.java
+++ b/node_modules/react-native-keychain/android/src/main/java/com/oblador/keychain/KeychainModule.java
--- a/android/src/main/java/com/oblador/keychain/KeychainModule.java
+++ b/android/src/main/java/com/oblador/keychain/KeychainModule.java
@@ -140,13 +140,7 @@ public class KeychainModule extends ReactContextBaseJavaModule {
super(reactContext);
prefsStorage = new PrefsStorage(reactContext);

View File

@@ -1,61 +0,0 @@
diff --git a/node_modules/react-native-static-server/android/build.gradle b/node_modules/react-native-static-server/android/build.gradle
index 0c7bca6..6de3115 100644
--- a/node_modules/react-native-static-server/android/build.gradle
+++ b/node_modules/react-native-static-server/android/build.gradle
@@ -20,7 +20,7 @@ def safeExtGet(prop, fallback) {
}
apply plugin: 'com.android.library'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
buildscript {
// The Android Gradle plugin is only required when opening the android folder stand-alone.
@@ -39,7 +39,7 @@ buildscript {
}
apply plugin: 'com.android.library'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
android {
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
@@ -108,17 +108,6 @@ def configureReactNativePom(def pom) {
afterEvaluate { project ->
// some Gradle build hooks ref:
// https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
- task androidJavadoc(type: Javadoc) {
- source = android.sourceSets.main.java.srcDirs
- classpath += files(android.bootClasspath)
- classpath += files(project.getConfigurations().getByName('compile').asList())
- include '**/*.java'
- }
-
- task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
- classifier = 'javadoc'
- from androidJavadoc.destinationDir
- }
task androidSourcesJar(type: Jar) {
classifier = 'sources'
@@ -137,15 +126,13 @@ afterEvaluate { project ->
artifacts {
archives androidSourcesJar
- archives androidJavadocJar
}
+}
- task installArchives(type: Upload) {
- configuration = configurations.archives
- repositories.mavenDeployer {
- // Deploy to react-native-event-bridge/maven, ready to publish to npm
- repository url: "file://${projectDir}/../android/maven"
- configureReactNativePom pom
+publishing {
+ repositories {
+ maven {
+ url = uri("file://${projectDir}/../android/maven")
}
}
}