@norcy/react-native-toolkit 0.2.37 → 0.3.1

package/android/buildscript.gradle

@@ -1,10 +1,10 @@
 ext.applyBuildscriptExt = {
-    ext.buildToolsVersion = "33.0.0"
-    ext.minSdkVersion = 21
-    ext.compileSdkVersion = 33
-    ext.targetSdkVersion = 33
-    ext.ndkVersion = "23.1.7779620"
-    ext.kotlinVersion = "1.8.0"
+    ext.buildToolsVersion = "34.0.0"
+    ext.minSdkVersion = 23
+    ext.compileSdkVersion = 34
+    ext.targetSdkVersion = 34
+    ext.ndkVersion = "26.1.10909125"
+    ext.kotlinVersion = "1.9.22"
 }
 
 ext.applyBuildscriptRepos = { handler ->

package/android/dependencies.gradle

@@ -1,6 +1,6 @@
 ext.applyDefaultConfig = { targetProject ->
     targetProject.android {
-        compileSdkVersion targetProject.rootProject.ext.compileSdkVersion
+        compileSdk targetProject.rootProject.ext.compileSdkVersion
         ndkVersion targetProject.rootProject.ext.ndkVersion
         
         defaultConfig {
@@ -88,8 +88,8 @@ ext.applyBuildTypes = { targetProject ->
 ext.applyCommonAndroidConfig = { targetProject ->
     targetProject.android {
         compileOptions {
-            sourceCompatibility JavaVersion.VERSION_11
-            targetCompatibility JavaVersion.VERSION_11
+            sourceCompatibility JavaVersion.VERSION_17
+            targetCompatibility JavaVersion.VERSION_17
         }
         
         packagingOptions {
@@ -130,20 +130,17 @@ ext.applyCommonPlugins = { targetProject ->
 }
 
 ext.fixBundleResourcesDependency = { targetProject ->
-    // AGP 7.3.1 + Gradle 8.0 的 addGeneratedSourceDirectory 对 res 未正确建立任务依赖，
-    // 也未将生成目录注册为资源来源，导致 require() 的图片无法打入 release APK
+    // release 打包时须把 Metro 生成的 drawable 注册进 AGP，否则 JS 里 require 的本地图不会进 APK。
+    // 当前 RN Gradle 插件里声明的 resourcesDir 与 Metro 实际写入目录不一致，需用 registerGeneratedResFolders 指向真实路径。
+    // 可删除时机：升级 RN / @react-native/gradle-plugin 后，若官方已对齐路径或资源合并已正确，assembleRelease 验证本地图正常即可整段删掉。
     targetProject.afterEvaluate {
         targetProject.android.applicationVariants.all { variant ->
-            def variantName = variant.name.capitalize()
-            def bundleTaskName = "createBundle${variantName}JsAndAssets"
-            def mergeTaskName = "merge${variantName}Resources"
+            def variantCap = variant.name.capitalize()
+            def bundleTaskName = "createBundle${variantCap}JsAndAssets"
             def bundleTask = targetProject.tasks.findByName(bundleTaskName)
             if (bundleTask) {
-                def resDir = bundleTask.resourcesDir.get().asFile
-                targetProject.android.sourceSets[variant.name].res.srcDirs += [resDir]
-                targetProject.tasks.named(mergeTaskName).configure {
-                    dependsOn(bundleTask)
-                }
+                def resDir = new File(targetProject.buildDir, "RES/createBundle${variantCap}JsAndAssets")
+                variant.registerGeneratedResFolders(targetProject.files(resDir).builtBy(bundleTask))
             }
         }
     }

package/android/root.gradle

@@ -25,11 +25,13 @@ allprojects {
         if (project.hasProperty("android")) {
             android {
                 compileOptions {
-                    sourceCompatibility JavaVersion.VERSION_11
-                    targetCompatibility JavaVersion.VERSION_11
+                    sourceCompatibility JavaVersion.VERSION_17
+                    targetCompatibility JavaVersion.VERSION_17
                 }
             }
         }
     }
 }
 
+apply plugin: "com.facebook.react.rootproject"
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norcy/react-native-toolkit",
-  "version": "0.2.37",
+  "version": "0.3.1",
   "private": false,
   "description": "My Toolkit",
   "main": "lib/commonjs/index",
@@ -47,6 +47,7 @@
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@babel/preset-env": "^7.20.0",
+    "@react-native/babel-preset": "0.74.88",
     "@commitlint/cli": "^19.5.0",
     "@commitlint/config-conventional": "^19.5.0",
     "@invertase/react-native-apple-authentication": "^2.1.2",
@@ -61,7 +62,6 @@
     "@sentry/react-native": "^6.12.0",
     "@types/jest": "^29.5.13",
     "@types/react": "^18.2.0",
-    "@types/react-native": "0.72.5",
     "baseline-browser-mapping": "^2.10.7",
     "eslint": "^8.57.1",
     "eslint-config-prettier": "^9.1.0",
@@ -75,7 +75,7 @@
     "prettier": "^3.3.3",
     "query-string": "^8.0.0",
     "react": "18.2.0",
-    "react-native": "0.72.5",
+    "react-native": "0.74.6",
     "react-native-blob-util": "^0.19.11",
     "react-native-builder-bob": "^0.30.2",
     "react-native-device-info": "^11.1.0",
@@ -187,16 +187,6 @@
     ]
   },
   "resolutions": {
-    "@react-native-community/cli": "~11.3.10",
-    "@react-native-community/cli-tools": "11.3.10",
-    "@react-native-community/cli-platform-android": "~11.3.10",
-    "@react-native-community/cli-platform-ios": "~11.3.10",
-    "@react-native-community/cli-plugin-metro": "~11.3.10",
-    "@react-native-community/cli-config": "~11.3.10",
-    "@react-native-community/cli-doctor": "~11.3.10",
-    "@react-native-community/cli-hermes": "~11.3.10",
-    "@react-native-community/cli-server-api": "~11.3.10",
-    "@react-native-community/cli-clean": "~11.3.10",
     "@types/react": "18.2.0",
     "del": "^5.1.0",
     "glob": "^8.1.0",