fix(react-native): fix android keystore not generated correctly (#17074)

nrwl · May 19, 2023 · b0b531a · kevindice · May 24, 2023 · xiongemi
1 parent 4896126
commit b0b531a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 12 deletions.
diff --git a/packages/devkit/src/utils/binary-extensions.ts b/packages/devkit/src/utils/binary-extensions.ts
@@ -102,6 +102,7 @@ const binaryExtensions = new Set([
   '.jpm',
   '.jxr',
   '.key',
+  '.keystore',
   '.ktx',
   '.lha',
   '.lib',

diff --git a/packages/react-native/project.json b/packages/react-native/project.json
@@ -11,11 +11,6 @@
       "options": {
         "assets": [
           "packages/react-native/*.md",
-          {
-            "input": "packages/react-native",
-            "glob": "**/files/**/.babelrc__tmpl__",
-            "output": "/"
-          },
           {
             "input": "packages/react-native",
             "glob": "**/files/**/.babelrc.template",
@@ -26,11 +21,6 @@
             "glob": "**/*.!(ts)",
             "output": "/src"
           },
-          {
-            "input": "packages/react-native",
-            "glob": "*.rb",
-            "output": "/"
-          },
           {
             "input": "packages/react-native",
             "glob": "**/*.json",

diff --git a/...n/files/app/android/app/src/main/java/com/__lowerCaseName__/MainApplication.java.template b/...n/files/app/android/app/src/main/java/com/__lowerCaseName__/MainApplication.java.template
@@ -9,7 +9,6 @@ import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
 import com.facebook.react.defaults.DefaultReactNativeHost;
 import com.facebook.soloader.SoLoader;
 import java.util.List;
-import com.lugg.RNCConfig.RNCConfigPackage;
 
 public class MainApplication extends Application implements ReactApplication {
 

diff --git a/packages/react-native/src/generators/application/files/app/android/build.gradle.template b/packages/react-native/src/generators/application/files/app/android/build.gradle.template
@@ -6,7 +6,7 @@ buildscript {
         minSdkVersion = 21
         compileSdkVersion = 33
         targetSdkVersion = 33
-        kotlinVersion = "1.7.21"
+        kotlinVersion = "1.8.20"
 
         // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
         ndkVersion = "23.1.7779620"
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,6 +102,7 @@ const binaryExtensions = new Set([ @@
       '.jpm',
       '.jxr',
       '.key',
+      '.keystore',
       '.ktx',
       '.lha',
       '.lib',
@@ Expand Down @@