🔀 fix: 병합 충돌 수정

Author: chlee1001

.github/ISSUE_TEMPLATE.md

@@ -16,7 +16,7 @@ What actually happens?
 
 ### Reproducible Demo
 
-* Download https://github.com/microsoft/react-native-code-push/archive/master.zip and unzip. From `Examples` folder run `node create-app.js appName react-native@0.71.19 react-native-code-push@9.0.0` command to generate plain CodePushified React Native app. Please see description on top of `create-app.js` file content if needed
+* Download https://github.com/microsoft/react-native-code-push/archive/master.zip and unzip. From `Examples` folder run `node create-app.js appName react-native@0.71.19 react-native-code-push@9.0.1` command to generate plain CodePushified React Native app. Please see description on top of `create-app.js` file content if needed
 * If you can't reproduce the bug on it, provide us as much info as possible about your project
 
 ### Environment

CodePush.podspec

@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
   s.author         = package['author']
   s.license        = package['license']
   s.homepage       = package['homepage']
-  s.source         = { :git => 'https://github.com/microsoft/react-native-code-push.git', :tag => "v#{s.version}"}
+  s.source         = { :git => 'https://github.com/CodePushNext/react-native-code-push.git', :tag => "v#{s.version}"}
   s.ios.deployment_target = '15.5'
   s.tvos.deployment_target = '15.5'
   s.preserve_paths = '*.js'

Examples/CodePushDemoApp/App.js

@@ -9,7 +9,7 @@ import {
   View,
 } from 'react-native';
 
-import CodePush from "react-native-code-push";
+import CodePush from "@chlee1001/react-native-code-push";
 
 class App extends Component<{}> {
   constructor() {

Examples/CodePushDemoApp/android/settings.gradle

@@ -1,4 +1,3 @@
 rootProject.name = 'CodePushDemoApp'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
-include ':app', ':react-native-code-push'
-project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
+include ':app'

Examples/CodePushDemoApp/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "react": "17.0.2",
     "react-native": "0.68.5",
-    "react-native-code-push": "8.1.0"
+    "@chlee1001/react-native-code-push": "8.1.0"
   },
   "resolutions": {
     "strip-ansi": "^6.0.1",

Examples/CodePushDemoAppCpp/App.js

@@ -11,7 +11,7 @@ import {
   View,
 } from 'react-native';
 
-import CodePush from "react-native-code-push";
+import CodePush from "@chlee1001/react-native-code-push";
 
 class App extends Component<{}> {
   constructor() {
@@ -86,7 +86,7 @@ class App extends Component<{}> {
       this.codePushDownloadDidProgress.bind(this)
     );
   }
-  
+
   restartApp() {
 	  CodePush.restartApp();
   }

Examples/CodePushDemoAppCpp/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "react": "^17.0.2",
     "react-native": "^0.68.5",
-    "react-native-code-push": "^8.1.0",
+    "@chlee1001/react-native-code-push": "^8.1.0",
     "react-native-windows": "^1.0.0"
   },
   "resolutions": {

Examples/CodePushDemoAppNewArch/android/app/build.gradle

@@ -117,3 +117,5 @@ dependencies {
         implementation jscFlavor
     }
 }
+
+apply from: "../../node_modules/@chlee1001/react-native-code-push/android/codepush.gradle"

Examples/CodePushDemoAppNewArch/android/app/src/main/java/com/codepushdemoappnewarch/MainApplication.kt

@@ -17,35 +17,27 @@ import com.microsoft.codepush.react.CodePush
 @OptIn(UnstableReactNativeAPI::class)
 class MainApplication : Application(), ReactApplication {
 
+    val defaultPackageList by lazy {
+      PackageList(this).packages.apply {
+        // Packages that cannot be autolinked yet can be added manually here, for example:
+        // add(MyReactNativePackage())
+      }
+    }
+
     override val reactNativeHost: ReactNativeHost =
       object : DefaultReactNativeHost(this) {
-        override fun getPackages(): List<ReactPackage> =
-            PackageList(this).packages.apply {
-              // Packages that cannot be autolinked yet can be added manually here, for example:
-              // add(MyReactNativePackage())
-            }
+        override fun getPackages(): List<ReactPackage> = defaultPackageList
 
         override fun getJSMainModuleName(): String = "index"
 
         override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
+        override fun getJSBundleFile(): String = CodePush.getJSBundleFile()
 
         override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
         override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
       }
 
-  override val reactHost: ReactHost
-    get() = getDefaultReactHost(
-        applicationContext,
-        PackageList(this).packages.apply {
-            // Packages that cannot be autolinked yet can be added manually here, for example:
-            // add(MyReactNativePackage())
-        },
-        jsMainModulePath = "index",
-        jsBundleAssetPath = "index.android.bundle",
-        jsBundleFilePath = CodePush.getJSBundleFile(),
-        isHermesEnabled = BuildConfig.IS_HERMES_ENABLED,
-        useDevSupport = BuildConfig.DEBUG,
-    )
+  override val reactHost: ReactHost get() = getDefaultReactHost(this, reactNativeHost)
 
   override fun onCreate() {
     super.onCreate()

Examples/CodePushDemoAppNewArch/android/settings.gradle

@@ -2,6 +2,5 @@ pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
 plugins { id("com.facebook.react.settings") }
 extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
 rootProject.name = 'CodePushDemoAppNewArch'
-include ':app', ':react-native-code-push'
-project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
+include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')