@norcy/react-native-toolkit 0.1.154 → 0.1.156

package/android/dependencies.gradle

@@ -1,26 +1,23 @@
-/**
- * Norcy Toolkit - Common Android Build Configuration
- * 提供通用的 Android 构建配置和依赖管理函数
- */
-
-ext.applyNorcyDefaultConfig = { targetProject, options = [:] ->
-    def enableSeparateBuildPerCPUArchitecture = options.enableSeparateBuildPerCPUArchitecture ?: false
-    def abiFiltersList = options.abiFilters ?: ["armeabi-v7a", "arm64-v8a"]
-    
+ext.applyDefaultConfig = { targetProject ->
     targetProject.android {
+        compileSdkVersion targetProject.rootProject.ext.compileSdkVersion
+        
         defaultConfig {
+            minSdkVersion targetProject.rootProject.ext.minSdkVersion
+            targetSdkVersion targetProject.rootProject.ext.targetSdkVersion
             multiDexEnabled true
+            missingDimensionStrategy 'store', 'play'
             ndk {
-                abiFilters(*abiFiltersList)
+                abiFilters "armeabi-v7a", "arm64-v8a"
             }
         }
         
         splits {
             abi {
                 reset()
-                enable enableSeparateBuildPerCPUArchitecture
+                enable false
                 universalApk true
-                include(*abiFiltersList)
+                include "armeabi-v7a", "arm64-v8a"
             }
         }
         
@@ -31,11 +28,22 @@ ext.applyNorcyDefaultConfig = { targetProject, options = [:] ->
                 keyAlias 'androiddebugkey'
                 keyPassword 'android'
             }
+            release {
+                if (targetProject.hasProperty('MYAPP_RELEASE_STORE_FILE')) {
+                    storeFile targetProject.file(targetProject.MYAPP_RELEASE_STORE_FILE)
+                    storePassword targetProject.MYAPP_RELEASE_STORE_PASSWORD
+                    keyAlias targetProject.MYAPP_RELEASE_KEY_ALIAS
+                    keyPassword targetProject.MYAPP_RELEASE_KEY_PASSWORD
+                }
+            }
         }
     }
 }
 
-ext.applyNorcyCommonDependencies = { targetProject, enableHermes, jscFlavor ->
+ext.applyCommonDependencies = { targetProject ->
+    def enableHermes = targetProject.ext.react.get("enableHermes", false)
+    def jscFlavor = 'org.webkit:android-jsc:+'
+    
     targetProject.dependencies {
         implementation fileTree(dir: "libs", include: ["*.jar"])
         
@@ -61,24 +69,25 @@ ext.applyNorcyCommonDependencies = { targetProject, enableHermes, jscFlavor ->
     }
 }
 
-ext.applyNorcyBuildTypes = { targetProject, options = [:] ->
-    def enableProguardInReleaseBuilds = options.enableProguardInReleaseBuilds ?: false
-    
+ext.applyBuildTypes = { targetProject ->
     targetProject.android {
         buildTypes {
             debug {
                 signingConfig signingConfigs.debug
+                resValue "string", "app_name", "@string/app_name_debug"
             }
             release {
-                minifyEnabled enableProguardInReleaseBuilds
+                signingConfig signingConfigs.debug
+                minifyEnabled false
                 proguardFiles targetProject.android.getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
                 crunchPngs false
+                resValue "string", "app_name", "@string/app_name_release"
             }
         }
     }
 }
 
-ext.applyNorcyCommonAndroidConfig = { targetProject ->
+ext.applyCommonAndroidConfig = { targetProject ->
     targetProject.android {
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8
@@ -114,9 +123,7 @@ ext.applyNorcyCommonAndroidConfig = { targetProject ->
     }
 }
 
-ext.applyNorcyCommonPlugins = { targetProject, options = [:] ->
-    def sentryPropertiesPath = options.sentryPropertiesPath ?: "../sentry.properties"
-    
+ext.applyCommonPlugins = { targetProject ->
     targetProject.apply from: targetProject.file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle")
     targetProject.applyNativeModulesAppBuildGradle(targetProject)
     
@@ -125,7 +132,17 @@ ext.applyNorcyCommonPlugins = { targetProject, options = [:] ->
     
     targetProject.ext.sentryCli = [
         logLevel: "debug",
-        sentryProperties: sentryPropertiesPath
+        sentryProperties: "../sentry.properties"
     ]
 }
 
+ext.applyAll = { targetProject ->
+    targetProject.ext.react = [enableHermes: false]
+    targetProject.apply from: targetProject.file("../../node_modules/react-native/react.gradle")
+    
+    applyDefaultConfig(targetProject)
+    applyBuildTypes(targetProject)
+    applyCommonAndroidConfig(targetProject)
+    applyCommonPlugins(targetProject)
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norcy/react-native-toolkit",
-  "version": "0.1.154",
+  "version": "0.1.156",
   "description": "My Toolkit",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",