Merge pull request #28 from ionic-team/fix/cocapods-v2

add root to podspec and add JSError file to xcode project
ionic-team · Aug 10, 2023 · 1371ae8 · 1371ae8
2 parents 1fab4af + 92a9401
commit 1371ae8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/packages/capacitor-plugin/CapacitorBackgroundRunner.podspec b/packages/capacitor-plugin/CapacitorBackgroundRunner.podspec
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.homepage = package['repository']['url']
   s.author = package['author']
   s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
-  s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
+  s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}', 'packages/capacitor-plugin/ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target  = '13.0'
   s.dependency 'Capacitor'
   s.swift_version = '5.1'

diff --git a/packages/capacitor-plugin/android/src/main/libs/android-js-engine-release.aar b/packages/capacitor-plugin/android/src/main/libs/android-js-engine-release.aar
diff --git a/packages/capacitor-plugin/ios/Plugin.xcodeproj/project.pbxproj b/packages/capacitor-plugin/ios/Plugin.xcodeproj/project.pbxproj
@@ -35,6 +35,7 @@
 		50ADFFA42020D75100D50D53 /* Capacitor.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50ADFFA52020D75100D50D53 /* Capacitor.framework */; };
 		50ADFFA82020EE4F00D50D53 /* BackgroundRunnerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 50ADFFA72020EE4F00D50D53 /* BackgroundRunnerPlugin.m */; };
 		50E1A94820377CB70090CE1A /* BackgroundRunnerPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E1A94720377CB70090CE1A /* BackgroundRunnerPlugin.swift */; };
+		D400A45E2A853E05003DAA2F /* JSError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D400A45D2A853E05003DAA2F /* JSError.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -81,6 +82,8 @@
 		5E23F77F099397094342571A /* Pods-Plugin.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Plugin.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Plugin/Pods-Plugin.debug.xcconfig"; sourceTree = "<group>"; };
 		91781294A431A2A7CC6EB714 /* Pods-Plugin.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Plugin.release.xcconfig"; path = "Pods/Target Support Files/Pods-Plugin/Pods-Plugin.release.xcconfig"; sourceTree = "<group>"; };
 		96ED1B6440D6672E406C8D19 /* Pods-PluginTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PluginTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PluginTests/Pods-PluginTests.debug.xcconfig"; sourceTree = "<group>"; };
+		D400A45B2A853BCE003DAA2F /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
+		D400A45D2A853E05003DAA2F /* JSError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSError.swift; sourceTree = "<group>"; };
 		F65BB2953ECE002E1EF3E424 /* Pods-PluginTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PluginTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-PluginTests/Pods-PluginTests.release.xcconfig"; sourceTree = "<group>"; };
 		F6753A823D3815DB436415E3 /* Pods_PluginTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PluginTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -116,6 +119,7 @@
 				0237236E2A003F5C009B91C9 /* Errors.swift */,
 				0237236B2A003F5C009B91C9 /* JSConsole.swift */,
 				0237236C2A003F5C009B91C9 /* JSCrypto.swift */,
+				D400A45D2A853E05003DAA2F /* JSError.swift */,
 				0237236D2A003F5C009B91C9 /* JSTextDecoder.swift */,
 				0237236A2A003F5C009B91C9 /* JSTextEncoder.swift */,
 				0237236F2A003F5C009B91C9 /* Runner.swift */,
@@ -197,6 +201,7 @@
 		A797B9EFA3DCEFEA1FBB66A9 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				D400A45B2A853BCE003DAA2F /* JavaScriptCore.framework */,
 				50ADFFA52020D75100D50D53 /* Capacitor.framework */,
 				3B2A61DA5A1F2DD4F959604D /* Pods_Plugin.framework */,
 				F6753A823D3815DB436415E3 /* Pods_PluginTests.framework */,
@@ -385,6 +390,7 @@
 				027BCF232A17DE2C009884A0 /* JSResponse.swift in Sources */,
 				023723632A002600009B91C9 /* Context+CapacitorAPI.swift in Sources */,
 				023723772A003F5C009B91C9 /* Context.swift in Sources */,
+				D400A45E2A853E05003DAA2F /* JSError.swift in Sources */,
 				0237237B2A004051009B91C9 /* KV.swift in Sources */,
 				023723722A003F5C009B91C9 /* JSConsole.swift in Sources */,
 				027BCF202A16ABA8009884A0 /* BackgroundRunner.swift in Sources */,