update ios publish task

SourcePointUSA · Sep 6, 2024 · e97c46a · e97c46a
1 parent 3494236
commit e97c46a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 26 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,7 +3,6 @@ on:
   workflow_dispatch:
   push:
     tags:
-      - '!**-beta**'
       - '**'
 
 # make sure to have only one job from the same "trigger" at any time
@@ -12,20 +11,13 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-#  ios:
-#    runs-on: 'macos-latest'
-#    steps:
-#      - uses: actions/checkout@v4
-#      - uses: actions/setup-java@v4
-#        with:
-#          distribution: 'zulu'
-#          java-version: '17'
-#          cache: 'gradle'
-#      - run: ./gradlew podPublishXCFramework
-#      - uses: actions/upload-artifact@v4
-#        with:
-#            name: SPMobileCore.xcframework
-#            path: ./core/build/cocoapods/publish/release/SPMobileCore.xcframework
+  ios:
+    runs-on: 'macos-latest'
+    steps:
+      - uses: actions/checkout@v4
+      - run: pod trunk push --allow-warnings
+        env:
+          COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
   android:
     runs-on: 'macos-latest'
     steps:

diff --git a/SPMobileCore.xcframework/Info.plist b/SPMobileCore.xcframework/Info.plist
@@ -10,23 +10,26 @@
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>SPMobileCore.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>SPMobileCore.framework/SPMobileCore</string>
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>tvos-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>SPMobileCore.framework</string>
 			<key>SupportedArchitectures</key>
@@ -35,7 +38,7 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>tvos</string>
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
 		</dict>
@@ -45,34 +48,31 @@
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_x86_64-simulator</string>
+			<string>tvos-arm64</string>
 			<key>LibraryPath</key>
 			<string>SPMobileCore.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>tvos</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>SPMobileCore.framework/SPMobileCore</string>
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>SPMobileCore.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>ios</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -0,0 +1,7 @@
+val xcfFrameworkDest = layout.projectDirectory.dir("core/build/cocoapods/publish/release")
+
+tasks.register<Copy>("buildPodFramework") {
+    dependsOn(":core:podPublishReleaseXCFramework")
+    from(xcfFrameworkDest)
+    into(layout.projectDirectory)
+}
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -18,8 +18,6 @@ version = coreVersion
 
 val description = "The internal Network & Data layers used by our mobile SDKs"
 val generatedSourcesPath = layout.buildDirectory.dir("generated").get()
-val sourceDir = "${layout.projectDirectory}/cocoapods/publish/debug"
-val destDir = "${layout.projectDirectory}/cocoapods/pod"
 val gitRepoUrl = "https://github.com/SourcePointUSA/mobile-core.git"
 val deviceName = project.findProperty("iosDevice") as? String ?: "iPhone 15"