@xrnjs/app-template 0.0.7 → 0.1.0

package/android/app/src/main/java/com/xrn/template/multibundle/CodePushUtils.kt

@@ -0,0 +1,263 @@
+package com.xrn.template.multibundle
+
+import com.blankj.utilcode.util.ActivityUtils
+import com.blankj.utilcode.util.LogUtils
+import com.blankj.utilcode.util.Utils
+import com.microsoft.codepush.react.CodePush
+import com.microsoft.codepush.react.CodePushUtils
+import com.microsoft.codepush.react.DownloadProgress
+import com.xrn.template.BuildConfig
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import xrn.modules.codepush.CodePushManager
+import xrn.modules.codepush.DownloadProgressCallback
+import xrn.modules.codepush.LocalPackage
+import xrn.modules.codepush.RemotePackage
+import xrn.modules.codepush.SyncOptions
+import xrn.modules.codepush.SyncStatus
+import xrn.modules.codepush.SyncStatusChangedCallback
+import xrn.modules.loading.LoadingManager
+import xrn.modules.loading.R
+import xrn.modules.multibundle.bundle.BundleInfoManager
+import xrn.modules.multibundle.view.RNContainerActivity
+
+
+object CodePushUtils {
+
+    private const val DEFAULT_CHECK_UPDATE_TIMEOUT_MILLIS = 2000
+    val DEFAULT_ROLL_BACK_RETRY_OPTIONS = SyncOptions.RollbackRetryOptions(
+        delayInHours = 24, maxRetryAttempts = 5
+    )
+
+    private val instanceMap by lazy { mutableMapOf<String, CodePushManager>() }
+
+    fun getOrCreate(
+        bundleName: String,
+        codePush: CodePush? = null,
+        forceCreate: Boolean = false
+    ): CodePushManager {
+        val deploymentKey = getDeploymentKey(bundleName)
+
+        if (!instanceMap.contains(deploymentKey) || forceCreate) {
+            val newCodePush = codePush
+                ?: CodePush(
+                    deploymentKey,
+                    Utils.getApp(),
+                    BuildConfig.DEBUG,
+                    BuildConfig.CODEPUSH_URL,
+                    com.xrn.template.R.string.codepush_public_key,
+                )
+
+            val mgr = CodePushManager(
+                codePush = newCodePush
+            ).apply { initialize(XBundleTool.getBizAssetsBundleFileName(bundleName)) }
+            instanceMap[deploymentKey] = mgr
+        }
+
+        return instanceMap.getValue(deploymentKey)
+    }
+
+    fun syncUpdate(
+        bundleName: String,
+        codePushManager: CodePushManager = getOrCreate(bundleName),
+        checkUpdateTimeoutMillis: Int = DEFAULT_CHECK_UPDATE_TIMEOUT_MILLIS,
+        syncOptions: SyncOptions = SyncOptions(rollbackRetryOptions = DEFAULT_ROLL_BACK_RETRY_OPTIONS),
+        completedCallback: (() -> Unit)? = null,
+    ) {
+        var isInvoked = false
+
+        fun oneTimeCompletedCallback() {
+            if (isInvoked) return
+            isInvoked = true
+
+            completedCallback?.invoke()
+        }
+
+        var retryCallback: (() -> Unit)? = null
+
+        var isMandatory = true
+
+        val syncStatusChangedCallback = object : SyncStatusChangedCallback {
+            override fun call(
+                status: SyncStatus,
+                remotePackage: RemotePackage?,
+                localPackage: LocalPackage?,
+                e: Throwable?
+            ) {
+                when (status) {
+                    SyncStatus.UP_TO_DATE -> {
+                        oneTimeCompletedCallback()
+                    }
+
+                    SyncStatus.DOWNLOADING_PACKAGE -> {
+                        if (remotePackage != null) {
+                            isMandatory = remotePackage.isMandatory
+
+                            if (!isMandatory) {
+                                oneTimeCompletedCallback()
+                            }
+                        }
+                    }
+
+                    SyncStatus.UPDATE_INSTALLED -> {
+                        oneTimeCompletedCallback()
+                    }
+
+                    SyncStatus.PATCH_ERROR -> if (e != null) LogUtils.e(e)
+
+                    SyncStatus.UNKNOWN_ERROR -> {
+                        if (e != null) LogUtils.e(e)
+
+                        if (retryCallback != null) {
+                            retryCallback?.invoke()
+                        } else {
+                            oneTimeCompletedCallback()
+                        }
+                    }
+
+                    else -> {}
+                }
+            }
+        }
+
+        val isMainBundle = BundleInfoManager.getBundleInfo(bundleName)?.isMainBundle() ?: false
+        val deploymentKey = getDeploymentKey(bundleName)
+
+        val downloadProgressCallback = object : DownloadProgressCallback {
+            override fun onProgress(downloadProgress: DownloadProgress) {
+                val percent =
+                    (downloadProgress.receivedBytes / downloadProgress.totalBytes.toDouble()) * 100
+
+                CodePushUtils.log("Package download progress: ${percent.toInt()}%")
+
+                if (!isMandatory || percent > 100) return
+
+                /* 当前用户看到 Activity 为对应 bundle 才更新进度 */
+                val topActivity = ActivityUtils.getTopActivity()
+                if (topActivity is RNContainerActivity && topActivity.getBundleName() == bundleName) {
+                    LoadingManager.updateProgress(
+                        ActivityUtils.getTopActivity(),
+                        percent.toInt(),
+                        isMainBundle
+                    )
+                    return
+                }
+            }
+        }
+
+        retryCallback = if (codePushManager.getReactPackage().isBinaryJSBundleFileExists) {
+            null
+        } else {
+            {
+                LoadingManager.showErrorBoundary(
+                    ActivityUtils.getTopActivity(),
+                    Utils.getApp().getString(R.string.error_boundary_network_error),
+                    Utils.getApp().getString(R.string.error_boundary_retry),
+                    {
+                        LoadingManager.hideErrorBoundary()
+
+                        codePushManager.sync(
+                            deploymentKey,
+                            syncOptions,
+                            checkUpdateTimeoutMillis,
+                            false,
+                            null,
+                            syncStatusChangedCallback,
+                            downloadProgressCallback,
+                        )
+                    },
+                    {
+                        val topActivity = ActivityUtils.getTopActivity()
+                        if (topActivity is RNContainerActivity && topActivity.getBundleName() == bundleName) {
+                            topActivity.reactHost.destroy("", null)
+                            topActivity.finish()
+                        }
+                    }
+                )
+            }
+        }
+
+        codePushManager.sync(
+            deploymentKey,
+            syncOptions,
+            checkUpdateTimeoutMillis,
+            false,
+            null,
+            syncStatusChangedCallback,
+            downloadProgressCallback,
+        )
+    }
+
+    fun syncUpdateAsynchronously(
+        bundleName: String,
+        checkUpdateTimeoutMillis: Int = DEFAULT_CHECK_UPDATE_TIMEOUT_MILLIS,
+        rollbackRetryOptions: SyncOptions.RollbackRetryOptions = DEFAULT_ROLL_BACK_RETRY_OPTIONS,
+        completedCallback: (() -> Unit)? = null,
+    ) {
+        syncUpdateAsynchronously(
+            bundleName,
+            getOrCreate(bundleName),
+            checkUpdateTimeoutMillis,
+            rollbackRetryOptions,
+            completedCallback
+        )
+    }
+
+    fun syncUpdateAsynchronously(
+        bundleName: String,
+        codePushManager: CodePushManager,
+        checkUpdateTimeoutMillis: Int = DEFAULT_CHECK_UPDATE_TIMEOUT_MILLIS,
+        rollbackRetryOptions: SyncOptions.RollbackRetryOptions = DEFAULT_ROLL_BACK_RETRY_OPTIONS,
+        completedCallback: (() -> Unit)? = null,
+    ) {
+        CoroutineScope(Dispatchers.Main).launch {
+            withContext(Dispatchers.IO) {
+                syncUpdate(
+                    bundleName,
+                    codePushManager,
+                    checkUpdateTimeoutMillis,
+                    SyncOptions(rollbackRetryOptions = rollbackRetryOptions),
+                    completedCallback
+                )
+            }
+        }
+    }
+
+    fun syncUpdateSilently(
+        bundleName: String,
+        checkUpdateTimeoutMillis: Int = DEFAULT_CHECK_UPDATE_TIMEOUT_MILLIS,
+        rollbackRetryOptions: SyncOptions.RollbackRetryOptions = DEFAULT_ROLL_BACK_RETRY_OPTIONS,
+    ) {
+        syncUpdateSilently(
+            bundleName,
+            getOrCreate(bundleName), checkUpdateTimeoutMillis, rollbackRetryOptions
+        )
+    }
+
+    fun syncUpdateSilently(
+        bundleName: String,
+        codePushManager: CodePushManager,
+        checkUpdateTimeoutMillis: Int = DEFAULT_CHECK_UPDATE_TIMEOUT_MILLIS,
+        rollbackRetryOptions: SyncOptions.RollbackRetryOptions = DEFAULT_ROLL_BACK_RETRY_OPTIONS,
+    ) {
+        syncUpdate(
+            bundleName,
+            codePushManager,
+            checkUpdateTimeoutMillis,
+            SyncOptions(rollbackRetryOptions = rollbackRetryOptions),
+            null
+        )
+    }
+
+    fun onJSBundleLoaded(bundleName: String, jsBundleFile: String) {
+        getOrCreate(bundleName).getReactPackage().onJSBundleLoaded(jsBundleFile)
+    }
+
+    private fun getDeploymentKey(bundleName: String): String {
+        val bundleInfo = BundleInfoManager.getBundleInfo(bundleName) ?: return ""
+        return bundleInfo.getCodePushKey()
+    }
+
+}

package/android/app/src/main/java/com/xrn/template/multibundle/XBundleTool.kt

@@ -0,0 +1,9 @@
+package com.xrn.template.multibundle
+
+object XBundleTool {
+
+    fun getBizAssetsBundleFileName(bundleName: String): String {
+        return "index.${bundleName}.bundle"
+    }
+
+}

package/android/app/src/main/java/com/xrn/template/multibundle/XRNReactHostDelegate.kt

@@ -0,0 +1,56 @@
+package com.xrn.template.multibundle
+
+import android.app.Application
+import com.facebook.react.PackageList
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.JSBundleLoader
+import xrn.modules.keyboard.XRNKeyboardPackage
+import xrn.modules.multibundle.bundle.BundleInfoManager
+import xrn.modules.multibundle.defaults.XRNDefaultReactHostDelegate
+import xrn.modules.multibundle.runtime.JSBundleType
+
+class XRNReactHostDelegate(
+    val application: Application,
+    override var bundleName: String,
+    val commonOnly: Boolean
+) : XRNDefaultReactHostDelegate(bundleName) {
+
+    private val mCodePush by lazy { CodePushUtils.getOrCreate(bundleName, null, true).codePush }
+
+    private val mJSBundleLoader = object : CodePushJSBundleLoader(
+        application, bundleName, commonOnly, this@XRNReactHostDelegate
+    ) {
+        override fun onLoadStart(bundleType: JSBundleType, bundleName: String) {
+            super.onLoadStart(bundleType, bundleName)
+            if (bundleType == JSBundleType.BIZ) {
+                val deploymentKey =
+                    BundleInfoManager.getBundleInfo(bundleName)?.getCodePushKey() ?: return
+                this@XRNReactHostDelegate.mCodePush.resetDeploymentKey(deploymentKey)
+                CodePushUtils.getOrCreate(bundleName, mCodePush)
+            }
+        }
+    }
+    override val jsBundleLoader: JSBundleLoader = mJSBundleLoader
+
+    override val reactPackages: List<ReactPackage>
+        get() {
+            return PackageList(application).packages.apply {
+                //懒加载时，遍历需要放在前面
+                add(0, XRNKeyboardPackage())
+                add(0, mCodePush)
+            }
+        }
+
+    override fun isSplitMode(): Boolean {
+        return false
+    }
+
+    override fun getJSBundleFile(jsBundleType: JSBundleType): String {
+        return when (jsBundleType) {
+            JSBundleType.COMMON -> ""
+            JSBundleType.BIZ -> mCodePush.getJSBundleFile(
+                XBundleTool.getBizAssetsBundleFileName(bundleName)
+            )
+        }
+    }
+}

package/android/app/src/main/java/com/xrn/template/navigation/XBundleActivity.kt

@@ -10,15 +10,15 @@ import com.lzf.easyfloat.EasyFloat
 import com.lzf.easyfloat.enums.ShowPattern
 import com.lzf.easyfloat.enums.SidePattern
 import com.xrn.template.R
+import com.xrn.template.multibundle.CodePushBundleActivity
 import com.xrn.template.utils.DevEntryUtil
 import com.xrn.template.utils.LifecycleAwareRunnable
-import xrn.modules.navigation.kotlin.BaseRNContainerActivity
 
-open class XBundleActivity:BaseRNContainerActivity() {
+open class XBundleActivity: CodePushBundleActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(null)
-        if (mBundleName.isBlank() || mModuleName.isBlank()) {
+        if (getBundleName().isBlank() || getModuleName().isBlank()) {
             ToastUtils.showShort("RN容器初始化失败、bundleName或moduleName不允许为空")
             finish()
             return
@@ -32,12 +32,15 @@ open class XBundleActivity:BaseRNContainerActivity() {
             .setTag(this@XBundleActivity.toString())
             .registerCallback {
                 createResult { isCreated, msg, view ->
+                    val envView = view?.findViewById<TextView>(R.id.tvEnv)
                     view?.setOnClickListener {
-                        getRNHost()?.reactInstanceManager?.currentReactContext?.getJSModule(
-                            DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)?.emit("NATIVE_FLOAT_BAR_CLICK", null)
+                        reactHost.currentReactContext?.getJSModule(
+                            DeviceEventManagerModule.RCTDeviceEventEmitter::class.java
+                        )?.emit("NATIVE_FLOAT_BAR_CLICK", null)
                     }
                     view?.background = drawable
-                    val runnable = LifecycleAwareRunnable(lifecycle) { DevEntryUtil.devEntryAttachSide(view) }
+                    val runnable =
+                        LifecycleAwareRunnable(lifecycle) { DevEntryUtil.devEntryAttachSide(view) }
                     LifecycleAwareRunnable.getHandler().postDelayed(runnable, 500)
                 }
 
@@ -53,4 +56,4 @@ open class XBundleActivity:BaseRNContainerActivity() {
             }
         builder.show()
     }
-}
+}

package/android/app/src/main/res/raw/bundle_config.json

@@ -1,21 +1,17 @@
 {
-  "project": {
-    "name": "XRNTemplate"
-  },
-  "defaultOptions": {
-    "bundleType": "sub"
-  },
   "bundles": [
     {
       "bundleName": "main-bundle",
       "bundlePackageRelativePath": "./main-bundle",
       "bundleType": "main",
+      "checkNativeDep": false,
       "codePushKey": "0NzkdHaOp6RhCDWjD1G3KogLieV54ksvOXqog",
       "port": 8081
     },
     {
       "bundleName": "sub-bundle",
       "bundlePackageRelativePath": "./sub-bundle",
+      "checkNativeDep": false,
       "codePushKey": "KpWDtkf7lssWGGhFVlubzRq9gAg74ksvOXqog",
       "port": 6061
     }

package/android/build.gradle

@@ -2,45 +2,41 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "34.0.0"
-        minSdkVersion = 21
-        compileSdkVersion = 34
-        targetSdkVersion = 34
+        buildToolsVersion = "35.0.0"
+        minSdkVersion = 24
+        compileSdkVersion = 35
+        targetSdkVersion = 35
         supportLibVersion = "29.0.0"
 
-        kotlin_version = '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"
         androidXCore = "1.0.2"
-        glideVersion = "4.16.0"
+        glideVersion = "5.0.5"
         excludeAppGlideModule = true
+
         // gradle,AGP,kotlin 版本必须按照以下文档配置
         // https://kotlinlang.org/docs/gradle-configure-project.html#apply-the-plugin
-        AGPVersion = '7.4.2'
-        kotlin_version = '1.8.20'
+        AGPVersion = '8.7.2'
+        kotlin_version = '2.0.21'
         // 有些第三方库读取的这个配置，比如：async-storage
-        kotlinVersion = '1.8.20'
+        kotlinVersion = "2.0.21"
         // 协程和 kotlin 版本必须按照以下文档配置
         // https://github.com/Kotlin/kotlinx.coroutines/tree/1.7.3
-        kotlin_coroutines_version = '1.7.3'
+        kotlin_coroutines_version = '1.9.0'
 
-        // REACT_NATIVE_NODE_MODULES_DIR = "../node_modules/react-native"
+        ndkVersion = "27.1.12297006"
     }
     repositories {
         // google
         maven { url 'https://maven.aliyun.com/repository/google' }
         // central & jcenter
         maven { url 'https://maven.aliyun.com/repository/public' }
+        google()
         mavenCentral()
-        mavenLocal()
+        maven { url 'https://developer.huawei.com/repo/' }
     }
     dependencies {
         classpath("com.android.tools.build:gradle:$AGPVersion")
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath("com.facebook.react:react-native-gradle-plugin")
-        classpath("de.undercouch:gradle-download-task:5.0.1")
-        classpath "org.jetbrains.kotlin:kotlin-serialization:1.8.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
@@ -55,29 +51,34 @@ allprojects {
         maven { url 'https://maven.aliyun.com/repository/public' }
         mavenCentral()
         mavenLocal()
-        maven {
-            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url("$rootDir/../node_modules/react-native/android")
-        }
-        maven {
-            // Android JSC is installed from npm
-            url("$rootDir/../node_modules/jsc-android/dist")
-        }
+        maven { url 'https://developer.huawei.com/repo/' }
+    }
+}
 
-        // central & jcenter
-        maven {
-            url 'https://maven.aliyun.com/repository/public'
-            content {
-                excludeGroup "com.facebook.react"
-            }
-        }
+apply plugin: "com.facebook.react.rootproject"
+
+// 去除 ReactModalHostView / ReactModalHostManager 的 final 修饰符
+// RN 0.77.x 中这些类从 Java 改为 Kotlin 实现，Kotlin class 默认 final，
+// 导致 @xrnjs/keyboard 的 XTModalHostView / XTModalHostViewManager 无法继承。
+// RemoveFinalPlugin（buildSrc）在编译期修改 classpath 字节码去 final，
+// 并在 app 打包期通过 AGP InstrumentationScope.ALL 确保 APK 中类也是 non-final。
+project(':xrnjs_keyboard') {
+    apply plugin: com.xtapp.RemoveFinalPlugin
+}
 
-        mavenCentral {
-            // We don't want to fetch react-native from Maven Central as there are
-            // older versions over there.
-            content {
-                excludeGroup "com.facebook.react"
+// App 声明了 flavorDimensions "env"、"channel"，但多数第三方 / 二方库的 android
+// 模块没有声明这两个维度，变体匹配会因 "No matching variant" 失败。
+// 给所有非 app 子项目补上 missingDimensionStrategy，让它们回退到 dev/china 默认变体。
+// 用 withId 监听 com.android.library 插件应用时机，确保在 android 扩展就绪后再配置。
+subprojects { subproject ->
+    if (subproject.name != 'app') {
+        subproject.plugins.withId('com.android.library') {
+            subproject.android {
+                defaultConfig {
+                    missingDimensionStrategy 'env', 'dev'
+                    missingDimensionStrategy 'channel', 'china'
+                }
             }
         }
     }
-}
+}

package/android/buildSrc/build.gradle.kts

@@ -0,0 +1,15 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    maven { url = uri("https://maven.aliyun.com/repository/google") }
+    maven { url = uri("https://maven.aliyun.com/repository/public") }
+    google()
+    mavenCentral()
+}
+
+dependencies {
+    implementation("com.android.tools.build:gradle:8.7.2")
+    implementation("org.ow2.asm:asm:9.7.1")
+}

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/gradle.properties

@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=512m -Djava.net.useSystemProxies=false
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
@@ -25,39 +25,46 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.235.0
+FLIPPER_VERSION=0.273.0
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
 # ./gradlew <task> -PreactNativeArchitectures=x86_64
-reactNativeArchitectures=armeabi-v7a,arm64-v8a
+reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 
 # Use this property to enable support to the new architecture.
 # This will allow you to use TurboModules and the Fabric render in
 # your application. You should enable this flag either if you want
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
-newArchEnabled=false
+newArchEnabled=true
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
-hermesEnabled=false
-enableHermes=false
+hermesEnabled=true
+enableHermes=true
 org.gradle.daemon=true
 org.gradle.configureondemand=true
 #### Jenkins auto edit
-VERSIONNAME=1.0.0
-VERSIONCODE=20250702
+VERSIONNAME=0.0.1
+VERSIONCODE=260915143
 
 
 # 解决找不到so文件 split_config.arm64_v8a.apk
-android.bundle.enableUncompressedNativeLibs=false
 
 # ASM Version
 sensorsAnalytics.asmVersion=ASM9
 
 # AsyncStorage
-AsyncStorage_useNextStorage=true
+# useNextStorage stays false (default). The 2.x "next storage" backend pulls in
+# KSP + androidx.room, but async-storage's bundled kspVersion table tops out at
+# 1.9.24-1.0.20 and has no entry for Kotlin 2.0.21, so the KSP task crashes with a
+# getChangedFiles signature mismatch on Gradle 8.10.2. xrngo leaves this off too.
 
 #VisionCamera
 VisionCamera_enableCodeScanner=true
+
+# Disable JDK use of macOS system proxy. The local proxy at 127.0.0.1:8899
+# performs SSL MITM with an untrusted CA, which breaks Gradle dependency
+# downloads (PKIX path building failed).
+systemProp.java.net.useSystemProxies=false

package/android/settings.gradle

@@ -1,18 +1,46 @@
-rootProject.name = 'XRNTemplate'
+pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
+plugins { id("com.facebook.react.settings") }
+
+// Force-clear JVM proxy system properties. The macOS system proxy at
+// 127.0.0.1:8899 performs SSL MITM with an untrusted CA, which breaks Gradle
+// dependency downloads (PKIX path building failed). Cleared here (after the
+// plugins {} block, before autolinking/dependency resolution) so downloads go direct.
+System.clearProperty("http.proxyHost")
+System.clearProperty("http.proxyPort")
+System.clearProperty("https.proxyHost")
+System.clearProperty("https.proxyPort")
+System.clearProperty("http.nonProxyHosts")
+System.clearProperty("https.nonProxyHosts")
+try {
+    java.net.ProxySelector.setDefault(new java.net.ProxySelector() {
+        java.util.List<java.net.Proxy> select(java.net.URI uri) { [java.net.Proxy.NO_PROXY] }
+        void connectFailed(java.net.URI uri, java.net.SocketAddress sa, java.io.IOException ioe) {}
+    })
+} catch (Throwable t) {}
+
+extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
+rootProject.name = 'xrngo'
 
-apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')
 
-include ':xrnjs_react-native-code-push'
-project(':xrnjs_react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/@xrnjs/react-native-code-push/android/app')
+// @xrnjs/multi-bundle is excluded from React Native autolinking (its android
+// platform returns null), so it must be included here manually. Other @xrnjs/*
+// native packages are autolinked as :xrnjs_<name> and need no manual include.
+include(':xrnjs-multi-bundle')
+project(':xrnjs-multi-bundle').projectDir = new File(rootProject.projectDir, '../node_modules/@xrnjs/multi-bundle/android')
 
- include(':xrnjs_multi-bundle')
- project(':xrnjs_multi-bundle').projectDir = new File(rootProject.projectDir, '../node_modules/@xrnjs/multi-bundle/android')
+// CodePush is intentionally excluded from React Native autolinking by @xrnjs/core,
+// while @xrnjs/bundle depends on it as a Gradle project.
+// The package name is scoped (@xrnjs/react-native-code-push) but the Gradle project
+// keeps the autolinking-style name :xrnjs_react-native-code-push (underscore) that
+// app/build.gradle and :xrnjs_bundle reference.
+include(':xrnjs_react-native-code-push')
+project(':xrnjs_react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/@xrnjs/react-native-code-push/android')
 
-if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
-    include(":ReactAndroid")
-    project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
-    include(":ReactAndroid:hermes-engine")
-    project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine')
-}
+def appNodeModulesPath = new File(rootProject.projectDir, '../node_modules').toPath().normalize()
+rootProject.children.each { project ->
+    if (project.projectDir.toPath().normalize().startsWith(appNodeModulesPath)) {
+        project.projectDir = project.projectDir.canonicalFile
+    }
+}

package/harmony/.clang-tidy

@@ -1 +1 @@
-Checks: 'misc-missing-switch-cases,misc-napi-module-name,misc-replace-if-else-with-ternary-operator,misc-unused-local-variable,misc-unused-parameters,modernize-use-auto,readability-system-capabilities'
+Checks: 'misc-missing-switch-cases,misc-napi-module-name,misc-replace-if-else-with-ternary-operator,misc-unused-local-variable,misc-unused-parameters,modernize-use-auto,readability-system-capabilities,misc-napi-macro-module-name,capi-version-validation'