Merge pull request #947 from LcTerry/master

升级适配RN0.74 版本
jpush · May 31, 2024 · 482c9f7 · 482c9f7
2 parents 316e442 + 133ef7f
commit 482c9f7
Show file tree

Hide file tree

Showing 62 changed files with 1,338 additions and 1,571 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -5,10 +5,13 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 27)
+    compileSdkVersion safeExtGet('compileSdkVersion', 34)
+
+    namespace 'cn.jiguang.plugins.push'
+
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 16)
-        targetSdkVersion safeExtGet('targetSdkVersion', 27)
+        minSdkVersion safeExtGet('minSdkVersion', 23)
+        targetSdkVersion safeExtGet('targetSdkVersion', 34)
         versionCode 1
         versionName "1.0"
 
@@ -17,5 +20,5 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.facebook.react:react-native:0.63.0'
+    implementation 'com.facebook.react:react-native:+'
 }
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cn.jiguang.plugins.push">
+    >
 
     <permission
         android:name="${applicationId}.permission.JPUSH_MESSAGE"

diff --git a/example/.buckconfig b/example/.buckconfig
diff --git a/example/.bundle/config b/example/.bundle/config
@@ -0,0 +1,2 @@
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: 1
diff --git a/example/.eslintrc.js b/example/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: '@react-native-community',
+  extends: '@react-native',
 };
diff --git a/example/.flowconfig b/example/.flowconfig
diff --git a/example/.gitattributes b/example/.gitattributes
diff --git a/example/.gitignore b/example/.gitignore
@@ -20,7 +20,7 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-project.xcworkspace
+**/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -29,31 +29,46 @@ build/
 .gradle
 local.properties
 *.iml
+*.hprof
+.cxx/
+*.keystore
+!debug.keystore
 
 # node.js
 #
 node_modules/
 npm-debug.log
 yarn-error.log
 
-# BUCK
-buck-out/
-\.buckd/
-*.keystore
-
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
 # https://docs.fastlane.tools/best-practices/source-control/
 
-*/fastlane/report.xml
-*/fastlane/Preview.html
-*/fastlane/screenshots
+**/fastlane/report.xml
+**/fastlane/Preview.html
+**/fastlane/screenshots
+**/fastlane/test_output
 
 # Bundle artifact
 *.jsbundle
 
-# CocoaPods
-/ios/Pods/
+# Ruby / CocoaPods
+**/Pods/
+/vendor/bundle/
+
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*
+
+# testing
+/coverage
+
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
diff --git a/example/.prettierrc.js b/example/.prettierrc.js
@@ -1,6 +1,7 @@
 module.exports = {
+  arrowParens: 'avoid',
+  bracketSameLine: true,
   bracketSpacing: false,
-  jsxBracketSameLine: true,
   singleQuote: true,
   trailingComma: 'all',
 };
diff --git a/example/.watchmanconfig b/example/.watchmanconfig
@@ -1 +1 @@
-{}
+{}
diff --git a/example/App.js b/example/App.js
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		BUNDLE_PATH: "vendor/bundle"
		BUNDLE_FORCE_RUBY_PLATFORM: 1