Merge pull request #981 from microsoft/fix/podInstall

Fix Autolinking for React Native 0.69
microsoft · Jul 6, 2022 · fceb22c · fceb22c
2 parents 6e98143 + af5387b
commit fceb22c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Version 4.4.5 (Under development)
 
+### App Center
+
+* **[Fix]** Fix Autolinking for React Native 0.69.
+
   ___
 
 ## Version 4.4.4

diff --git a/...analytics/ios/appcenter-analytics.podspec → ...ter-analytics/appcenter-analytics.podspec b/...analytics/ios/appcenter-analytics.podspec → ...ter-analytics/appcenter-analytics.podspec
@@ -1,6 +1,6 @@
 require 'json'
 
-package = JSON.parse(File.read(File.join(__dir__, '../package.json')))
+package = JSON.parse(File.read(File.join(__dir__, './package.json')))
 
 Pod::Spec.new do |s|
   s.name              = package['name']
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
 
   s.author            = { 'Microsoft' => 'appcentersdk@microsoft.com' }
   s.source            = { :git => "https://github.com/microsoft/appcenter-sdk-react-native.git" }
-  s.source_files      = "AppCenterReactNativeAnalytics/**/*.{h,m}"
+  s.source_files      = "ios/AppCenterReactNativeAnalytics/**/*.{h,m}"
   s.platform          = :ios, '9.0'
   s.requires_arc      = true
 

diff --git a/appcenter-analytics/react-native.config.js b/appcenter-analytics/react-native.config.js
@@ -1,11 +1,7 @@
-const path = require('path');
-
 module.exports = {
   dependency: {
     platforms: {
-      ios: {
-        podspecPath: path.join(__dirname, 'ios', 'appcenter-analytics.podspec')
-      },
+      ios: {},
       android: {
         packageInstance: 'new AppCenterReactNativeAnalyticsPackage(getApplication(), getResources().getString(R.string.appCenterAnalytics_whenToEnableAnalytics))'
       }

diff --git a/...ter-crashes/ios/appcenter-crashes.podspec → appcenter-crashes/appcenter-crashes.podspec b/...ter-crashes/ios/appcenter-crashes.podspec → appcenter-crashes/appcenter-crashes.podspec
@@ -1,6 +1,6 @@
 require 'json'
 
-package = JSON.parse(File.read(File.join(__dir__, '../package.json')))
+package = JSON.parse(File.read(File.join(__dir__, './package.json')))
 
 Pod::Spec.new do |s|
   s.name              = package['name']
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.author            = { 'Microsoft' => 'appcentersdk@microsoft.com' }
 
   s.source            = { :git => "https://github.com/microsoft/appcenter-sdk-react-native.git" }
-  s.source_files      = "AppCenterReactNativeCrashes/**/*.{h,m}"
+  s.source_files      = "ios/AppCenterReactNativeCrashes/**/*.{h,m}"
   s.platform          = :ios, '9.0'
   s.requires_arc      = true
 

diff --git a/appcenter-crashes/react-native.config.js b/appcenter-crashes/react-native.config.js
@@ -1,11 +1,7 @@
-const path = require('path');
-
 module.exports = {
   dependency: {
     platforms: {
-      ios: {
-        podspecPath: path.join(__dirname, 'ios', 'appcenter-crashes.podspec')
-      },
+      ios: {},
       android: {
         packageInstance: 'new AppCenterReactNativeCrashesPackage(getApplication(), getResources().getString(R.string.appCenterCrashes_whenToSendCrashes))'
       }

diff --git a/appcenter/ios/appcenter-core.podspec → appcenter/appcenter-core.podspec b/appcenter/ios/appcenter-core.podspec → appcenter/appcenter-core.podspec
@@ -1,6 +1,6 @@
 require 'json'
 
-package = JSON.parse(File.read(File.join(__dir__, '../package.json')))
+package = JSON.parse(File.read(File.join(__dir__, './package.json')))
 
 Pod::Spec.new do |s|
   # The name is hardcoded due to a name conflict, resulting in the error 'Errno::ENOENT - No such file or directory @ rb_sysopen - appcenter.podspec.json' error.
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.author           = { 'Microsoft' => 'appcentersdk@microsoft.com' }
 
   s.source            = { :git => "https://github.com/microsoft/appcenter-sdk-react-native.git" }
-  s.source_files      = "AppCenterReactNative/**/*.{h,m}"
+  s.source_files      = "ios/AppCenterReactNative/**/*.{h,m}"
   s.platform          = :ios, '9.0'
   s.requires_arc      = true
 

diff --git a/appcenter/react-native.config.js b/appcenter/react-native.config.js
@@ -1,11 +1,7 @@
-const path = require('path');
-
 module.exports = {
   dependency: {
     platforms: {
-      ios: {
-        podspecPath: path.join(__dirname, 'ios', 'appcenter-core.podspec')
-      },
+      ios: {},
       android: {
         packageInstance: 'new AppCenterReactNativePackage(getApplication())'
       }