Merge branch 'feat/new-arch' into develop

Author: hebertcisco

.gitignore

@@ -150,9 +150,6 @@ proguard/
 # Android Studio captures folder
 captures/
 
-# Remove after this framework is published on NPM
-code-push-plugin-testing-framework/node_modules
-
 # Windows
 windows/.vs/
 windows/obj/
@@ -192,4 +189,4 @@ Examples/testapp_rn
 
 # Android debug build files (conflict ignoring #Visual Studio files)
 !android/app/src/debug/
-.temp/
+.temp/

.npmignore

@@ -34,10 +34,8 @@ Recipes/
 bin/
 test/
 
-# Remove after this framework is published on NPM
-code-push-plugin-testing-framework/
-
 # Android build artifacts and Android Studio bits
+android/build
 android/app/build
 android/local.properties
 android/.gradle

AlertAdapter.js

@@ -2,7 +2,22 @@ import React, { Platform } from "react-native";
 let { Alert } = React;
 
 if (Platform.OS === "android") {
-  const { NativeModules: { CodePushDialog } } = React;
+  function resolveNativeModule(name) {
+    const ReactNative = require("react-native");
+    try {
+      const turboModule =
+        ReactNative.TurboModuleRegistry && ReactNative.TurboModuleRegistry.get
+          ? ReactNative.TurboModuleRegistry.get(name)
+          : null;
+      if (turboModule) return turboModule;
+    } catch (_e) {
+      // Ignore and fall back to legacy NativeModules.
+    }
+
+    return ReactNative.NativeModules ? ReactNative.NativeModules[name] : null;
+  }
+
+  const CodePushDialog = resolveNativeModule("CodePushDialog");
 
   Alert = {
     alert(title, message, buttons) {
@@ -13,6 +28,10 @@ if (Platform.OS === "android") {
       const button1Text = buttons[0] ? buttons[0].text : null,
             button2Text = buttons[1] ? buttons[1].text : null;
 
+      if (!CodePushDialog) {
+        throw "CodePushDialog native module is not installed.";
+      }
+
       CodePushDialog.showDialog(
         title, message, button1Text, button2Text,
         (buttonId) => { buttons[buttonId].onPress && buttons[buttonId].onPress(); }, 
@@ -21,4 +40,4 @@ if (Platform.OS === "android") {
   };
 }
 
-module.exports = { Alert };
+module.exports = { Alert };

CodePush.js

@@ -5,7 +5,22 @@ import { AppState, Platform } from "react-native";
 import log from "./logging";
 import hoistStatics from 'hoist-non-react-statics';
 
-let NativeCodePush = require("react-native").NativeModules.CodePush;
+function resolveNativeModule(name) {
+  const ReactNative = require("react-native");
+  try {
+    const turboModule =
+      ReactNative.TurboModuleRegistry && ReactNative.TurboModuleRegistry.get
+        ? ReactNative.TurboModuleRegistry.get(name)
+        : null;
+    if (turboModule) return turboModule;
+  } catch (_e) {
+    // Ignore and fall back to legacy NativeModules.
+  }
+
+  return ReactNative.NativeModules ? ReactNative.NativeModules[name] : null;
+}
+
+let NativeCodePush = resolveNativeModule("CodePush");
 const PackageMixins = require("./package-mixins")(NativeCodePush);
 
 async function checkForUpdate(deploymentKey = null, handleBinaryVersionMismatchCallback = null) {

CodePush.podspec

@@ -10,8 +10,8 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.homepage       = package['homepage']
   s.source         = { :git => 'https://github.com/srcpush/react-native-code-push.git', :tag => "v#{s.version}"}
-  s.ios.deployment_target = '15.5'
-  s.tvos.deployment_target = '15.5'
+  s.ios.deployment_target = '11.0'
+  s.tvos.deployment_target = '11.0'
   s.preserve_paths = '*.js'
   s.library        = 'z'
   s.source_files = 'ios/CodePush/*.{h,m}'

android/app/build.gradle

@@ -1,48 +1,98 @@
-apply plugin: "com.android.library"
-
-def isNewArchitectureEnabled() {
-    // To opt-in for the New Architecture, you can either:
-    // - Set `newArchEnabled` to true inside the `gradle.properties` file
-    // - Invoke gradle with `-newArchEnabled=true`
-    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
-    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
-}
+import groovy.json.JsonSlurper
 
-def IS_NEW_ARCHITECTURE_ENABLED = isNewArchitectureEnabled()
+apply plugin: "com.android.library"
 
-if (IS_NEW_ARCHITECTURE_ENABLED) {
-    apply plugin: "com.facebook.react"
+def safeExtGet(prop, fallback) {
+    return rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
 def DEFAULT_COMPILE_SDK_VERSION = 26
-def DEFAULT_BUILD_TOOLS_VERSION = "26.0.3"
 def DEFAULT_TARGET_SDK_VERSION = 26
 def DEFAULT_MIN_SDK_VERSION = 16
 
+def findReactNativePackageJson() {
+    File currentDir = projectDir
+
+    while (currentDir != null) {
+        File packageJson = new File(currentDir, "node_modules/react-native/package.json")
+        if (packageJson.exists()) {
+            return packageJson
+        }
+
+        currentDir = currentDir.parentFile
+    }
+
+    return null
+}
+
+def getReactNativeVersion() {
+    File packageJson = findReactNativePackageJson()
+    if (packageJson == null) {
+        return null
+    }
+
+    def version = new JsonSlurper().parseText(packageJson.text).version
+    return version.tokenize("-")[0]
+}
+
+def getReactNativeMinorVersion() {
+    def reactNativeVersion = getReactNativeVersion()
+    if (reactNativeVersion == null) {
+        return null
+    }
+
+    def versionParts = reactNativeVersion.tokenize(".")
+    if (versionParts.size() < 2) {
+        return null
+    }
+
+    return versionParts[1].toInteger()
+}
+
+def reactNativeVersion = getReactNativeVersion()
+def reactNativeMinorVersion = getReactNativeMinorVersion()
+def reactNativeDependency = reactNativeMinorVersion != null && reactNativeMinorVersion < 71
+    ? "com.facebook.react:react-native:${reactNativeVersion ?: '+'}"
+    : "com.facebook.react:react-android:${reactNativeVersion ?: '+'}"
+
 android {
-    namespace "com.microsoft.codepush.react"
+    if (project.android.hasProperty("namespace")) {
+        namespace "com.microsoft.codepush.react"
+    }
 
-    compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
-    buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
+    compileSdkVersion safeExtGet("compileSdkVersion", DEFAULT_COMPILE_SDK_VERSION)
 
     defaultConfig {
-        minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION
-        targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
+        minSdkVersion safeExtGet("minSdkVersion", DEFAULT_MIN_SDK_VERSION)
+        targetSdkVersion safeExtGet("targetSdkVersion", DEFAULT_TARGET_SDK_VERSION)
         versionCode 1
         versionName "1.0"
-        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", IS_NEW_ARCHITECTURE_ENABLED.toString()
+        consumerProguardFiles "../proguard-rules.pro"
+    }
+
+    sourceSets {
+        main {
+            java.srcDirs = ["../src/main/java"]
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     lintOptions {
         abortOnError false
     }
+}
 
-    defaultConfig {
-        consumerProguardFiles 'proguard-rules.pro'
-    }
+repositories {
+    google()
+    mavenCentral()
+    mavenLocal()
 }
 
 dependencies {
-    implementation "com.facebook.react:react-native:+"
-    implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3'
+    implementation(reactNativeDependency)
+    implementation "com.nimbusds:nimbus-jose-jwt:9.37.3"
 }

android/app/src/debug/AndroidManifest.xml

@@ -1,9 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
     <uses-permission android:name="android.permission.INTERNET" />
-
-    <application>
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-    </application>
-
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.microsoft.codepush.react" />

android/app/src/main/java/com/microsoft/codepush/react/ReactHostHolder.java

@@ -1,18 +1,109 @@
-apply plugin: 'com.android.library'
+import groovy.json.JsonSlurper
+
+buildscript {
+    ext {
+        kotlinVersion = "1.9.24"
+    }
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("com.android.tools.build:gradle:8.2.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+    }
+}
+
+apply plugin: "com.android.library"
+
+def safeExtGet(prop, fallback) {
+    return rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
+def DEFAULT_COMPILE_SDK_VERSION = 26
+def DEFAULT_TARGET_SDK_VERSION = 26
+def DEFAULT_MIN_SDK_VERSION = 16
+
+def findReactNativePackageJson() {
+    File currentDir = projectDir
+
+    while (currentDir != null) {
+        File packageJson = new File(currentDir, "node_modules/react-native/package.json")
+        if (packageJson.exists()) {
+            return packageJson
+        }
+
+        currentDir = currentDir.parentFile
+    }
+
+    return null
+}
+    }
+
+    return null
+}
+
+def getReactNativeVersion() {
+    File packageJson = findReactNativePackageJson()
+    if (packageJson == null) {
+        return null
+    }
+
+    def version = new JsonSlurper().parseText(packageJson.text).version
+    return version.tokenize("-")[0]
+}
+
+def getReactNativeMinorVersion() {
+    def reactNativeVersion = getReactNativeVersion()
+    if (reactNativeVersion == null) {
+        return null
+    }
+
+    def versionParts = reactNativeVersion.tokenize(".")
+    if (versionParts.size() < 2) {
+        return null
+    }
+
+    return versionParts[1].toInteger()
+}
+
+def reactNativeVersion = getReactNativeVersion()
+def reactNativeMinorVersion = getReactNativeMinorVersion()
+def reactNativeDependency = reactNativeMinorVersion != null && reactNativeMinorVersion < 71
+    ? "com.facebook.react:react-native:${reactNativeVersion ?: '+'}"
+    : "com.facebook.react:react-android:${reactNativeVersion ?: '+'}"
 
 android {
-    namespace "com.microsoft.codepush.react"
-    compileSdkVersion 33
+    if (project.android.hasProperty("namespace")) {
+        namespace "com.microsoft.codepush.react"
+    }
+
+    compileSdkVersion safeExtGet("compileSdkVersion", DEFAULT_COMPILE_SDK_VERSION)
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdkVersion safeExtGet("minSdkVersion", DEFAULT_MIN_SDK_VERSION)
+        targetSdkVersion safeExtGet("targetSdkVersion", DEFAULT_TARGET_SDK_VERSION)
         versionCode 1
         versionName "1.0"
+        consumerProguardFiles "proguard-rules.pro"
     }
-}
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+}
 repositories {
-    mavenLocal()
+    google()
     mavenCentral()
+    mavenLocal()
+}
+
+dependencies {
+    implementation(reactNativeDependency)
+    implementation "com.nimbusds:nimbus-jose-jwt:9.37.3"
 }