feat: publish iOS frameworks to repository (#18)

willpassidomo · web-flow · commit 73f0e36b79bb · 2022-06-15T14:20:14.000-04:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   semantic-release:
-    name: "Semantic Release"
+    name: "Semantic Release & Generate Cocoapods artifacts"
     runs-on: macos-latest
     env:
       GITHUB_TOKEN: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
@@ -23,6 +23,14 @@ jobs:
         with:
           fetch-depth: 0
           ref: main
+          submodules: recursive
+      - name: "Install JDK 11"
+        uses: actions/setup-java@v2
+        with:
+          distribution: "zulu"
+          java-version: "11"
+      - name: Install Cocoapods
+        run: sudo gem install cocoapods; sudo gem install cocoapods-generate
       - name: "Import GPG Key"
         uses: crazy-max/ghaction-import-gpg@v4
         with:
@@ -54,7 +62,6 @@ jobs:
         if: ${{ github.event.inputs.dryRun == 'false' }}
         run: |
           git push origin main
-
   sonatype-release:
     name: "Sonatype (Maven Central) Release"
     needs: semantic-release
diff --git a/.scripts/release.sh b/.scripts/release.sh
@@ -9,6 +9,8 @@ sed -i '.bak' "s/\"com.mparticle:api:.*\"/\"com.mparticle:api:$1\"/g" README.md
 sed -i '.bak' "s/\"com.mparticle:models:.*\"/\"com.mparticle:models:$1\"/g" README.md
 sed -i '.bak' "s/\"com.mparticle:testing:.*\"/\"com.mparticle:testing:$1\"/g" README.md
 
+sed -i '.bak' "s/\"version\": \".*\"/\"version\": \"$1\"/g" mParticle_Internal.podspec.json
+sed -i '.bak' "s/\"tag\": \".*\"/\"tag\": \"$1\"/g" mParticle_Internal.podspec.json
 #commit the version bump, tag, and push to private and public
 git add gradle.properties
 git add README.md
diff --git a/Tests/build.gradle.kts b/Tests/build.gradle.kts
@@ -1,4 +1,6 @@
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
+import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
+import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework
 
 plugins {
     id("com.android.library")
@@ -8,25 +10,16 @@ plugins {
 }
 
 kotlin {
-    val iOSTarget = if (System.getenv("SDK_NAME")
-            ?.startsWith("iphoneos") == true
-    ) presets.getByName("iosArm64") else presets.getByName("iosX64")
-
     android {
         publishLibraryVariants("debug")
     }
-    val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false
-    if (onPhone) {
-        iosArm64("ios") {
-            binaries.framework(listOf(org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType.DEBUG))
-
-        }
-    } else {
-        iosX64("ios") {
-            binaries.framework(listOf(org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType.DEBUG))
-
+    val xcFramework = XCFramework()
+    ios {
+        binaries.framework(listOf(NativeBuildType.RELEASE)) {
+            xcFramework.add(this)
         }
     }
+
     cocoapods {
         framework {
             summary = "Cross Platform Testing"
@@ -95,9 +88,9 @@ val installTestPods by tasks.creating(Exec::class.java) {
 
 
 val runIos by tasks.creating(Exec::class.java) {
-    val linkDebugFrameworkIos = tasks.findByName("linkDebugFrameworkIos")
-    dependsOn("linkDebugFrameworkIos")
-    linkDebugFrameworkIos?.dependsOn(installTestPods)
+    val linkReleaseFrameworkIos = tasks.findByName("linkReleaseFrameworkIosX64")
+    dependsOn(linkReleaseFrameworkIos)
+    linkReleaseFrameworkIos?.dependsOn(installTestPods)
     installTestPods.dependsOn("podImport")
     description = "Builds the iOS application bundle using Xcode."
     workingDir = project.file("helpers/XCodeTest")
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -20,18 +20,9 @@ kotlin {
         }
     }
     val xcFramework = XCFramework()
-    val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false
-    if (onPhone) {
-        iosArm64("ios") {
-            binaries.framework(listOf(NativeBuildType.DEBUG)) {
-                xcFramework.add(this)
-            }
-        }
-    } else {
-        iosX64("ios") {
-            binaries.framework(listOf(NativeBuildType.DEBUG)) {
-                xcFramework.add(this)
-            }
+    ios {
+        binaries.framework(listOf(NativeBuildType.RELEASE)) {
+            xcFramework.add(this)
         }
     }
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,6 +15,15 @@ subprojects {
             tasks.register("publishAndroid") { dependsOn("publishAndroidDebugPublicationToMavenLocal") }
         }
     }
+
+    afterEvaluate {
+        val copyXCFramework = tasks.register<Copy>("copyXCFramework") {
+            from("build/cocoapods/publish/release")
+            into("$rootDir/frameworks")
+        }
+
+        tasks.findByName("podPublishReleaseXCFramework")?.finalizedBy(copyXCFramework)
+    }
 }
 
 val appleSDKTempDirPath = "${project.rootDir.absolutePath}/.sdks/apple-testing"
diff --git a/mParticle_Internal.podspec.json b/mParticle_Internal.podspec.json
@@ -0,0 +1,51 @@
+{
+  "name": "mParticle-Cross-Platform",
+  "version": "1.1.0",
+  "summary": "mParticle Internal Tools generated using Kotlin Multiplatform",
+  "description": "A collection on internal crossplatform tools and packages",
+  "homepage": "https://www.mparticle.com",
+  "license": {
+    "type": "Apache 2.0",
+    "file": "LICENSE"
+  },
+  "authors": {
+    "mParticle": "support@mparticle.com"
+  },
+  "source": {
+    "git": "https://github.com/mParticle/crossplatform-sdk-tests.git",
+    "tag": "1.1.0"
+  },
+  "default_subspecs": "Testing",
+  "subspecs": [
+    {
+      "name": "Api",
+      "vendored_frameworks": [
+        "frameworks/mParticle_Api.xcframework"
+      ]
+    },
+    {
+      "name": "Mocking",
+      "vendored_frameworks": [
+        "frameworks/mParticle_mocking.xcframework"
+      ]
+    },
+    {
+      "name": "Models",
+      "vendored_frameworks": [
+        "frameworks/mParticle_Models.xcframework"
+      ]
+    },
+    {
+      "name": "Testing",
+      "vendored_frameworks": [
+        "frameworks/mParticle_testing.xcframework"
+      ]
+    },
+    {
+      "name": "Tests",
+      "vendored_frameworks": [
+        "frameworks/mParticle_Multiplatform_Tests.xcframework"
+      ]
+    }
+  ]
+}
diff --git a/models/build.gradle.kts b/models/build.gradle.kts
@@ -24,19 +24,9 @@ kotlin {
             artifactId = project.name
         }
     }
-    val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false
-    if (onPhone) {
-        iosArm64("ios") {
-            binaries.framework(listOf(NativeBuildType.DEBUG)) {
-                xcFramework.add(this)
-            }
-
-        }
-    } else {
-        iosX64("ios") {
-            binaries.framework(listOf(NativeBuildType.DEBUG)) {
-                xcFramework.add(this)
-            }
+    ios {
+        binaries.framework(listOf(NativeBuildType.RELEASE)) {
+            xcFramework.add(this)
         }
     }
 
diff --git a/overview.drawio b/overview.drawio
diff --git a/release.config.js b/release.config.js
@@ -35,14 +35,14 @@ module.exports = {
     [
       "@semantic-release/exec",
       {
-        prepareCmd: "sh ./.scripts/release.sh ${nextRelease.version}",
+        prepareCmd: "sh ./.scripts/release.sh ${nextRelease.version}; ./gradlew podPublishReleaseXCFramework",
       },
     ],
     ["@semantic-release/github"],
     [
       "@semantic-release/git",
       {
-        assets: ["CHANGELOG.md", "gradle.properties", "README.md"],
+        assets: ["CHANGELOG.md", "gradle.properties", "README.md", "frameworks", "mParticle_Internal.podspec.json"],
         message:
           "chore(release): ${nextRelease.version} \n\n${nextRelease.notes}",
       },
diff --git a/testing/build.gradle.kts b/testing/build.gradle.kts
@@ -17,25 +17,17 @@ kotlin {
         }
     }
     val xcFramework = XCFramework()
-    val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false
-    if (onPhone) {
-        iosArm64("ios") {
-            binaries.framework(listOf(NativeBuildType.DEBUG)) {
-                xcFramework.add(this)
-            }
-        }
-    } else {
-        iosX64("ios") {
-            binaries.framework(listOf(NativeBuildType.DEBUG)) {
-                xcFramework.add(this)
-            }
+    ios {
+        binaries.framework(listOf(NativeBuildType.RELEASE)) {
+            xcFramework.add(this)
         }
     }
+
     cocoapods {
         framework {
             summary = "Cross Platform Testing"
             homepage = "."
-            baseName = "mParticle_testing"
+            baseName = "mParticle_Testing"
             ios.deploymentTarget = "14.3"
         }
         pod("mParticle-Apple-SDK/mParticle", path = project.file("../.sdks/apple-testing"))

Original file line number	Diff line number	Diff line change
`@@ -20,18 +20,9 @@ kotlin {`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`val xcFramework = XCFramework()`
`23`		`- val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false`
`24`		`- if (onPhone) {`
`25`		`- iosArm64("ios") {`
`26`		`- binaries.framework(listOf(NativeBuildType.DEBUG)) {`
`27`		`- xcFramework.add(this)`
`28`		`- }`
`29`		`- }`
`30`		`- } else {`
`31`		`- iosX64("ios") {`
`32`		`- binaries.framework(listOf(NativeBuildType.DEBUG)) {`
`33`		`- xcFramework.add(this)`
`34`		`- }`
	`23`	`+ ios {`
	`24`	`+ binaries.framework(listOf(NativeBuildType.RELEASE)) {`
	`25`	`+ xcFramework.add(this)`
`35`	`26`	`}`
`36`	`27`	`}`
`37`	`28`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,15 @@ subprojects {`
`15`	`15`	`tasks.register("publishAndroid") { dependsOn("publishAndroidDebugPublicationToMavenLocal") }`
`16`	`16`	`}`
`17`	`17`	`}`
	`18`	`+`
	`19`	`+ afterEvaluate {`
	`20`	`+ val copyXCFramework = tasks.register<Copy>("copyXCFramework") {`
	`21`	`+ from("build/cocoapods/publish/release")`
	`22`	`+ into("$rootDir/frameworks")`
	`23`	`+ }`
	`24`	`+`
	`25`	`+ tasks.findByName("podPublishReleaseXCFramework")?.finalizedBy(copyXCFramework)`
	`26`	`+ }`
`18`	`27`	`}`
`19`	`28`
`20`	`29`	`val appleSDKTempDirPath = "${project.rootDir.absolutePath}/.sdks/apple-testing"`
Original file line number	Diff line number	Diff line change
`@@ -24,19 +24,9 @@ kotlin {`
`24`	`24`	`artifactId = project.name`
`25`	`25`	`}`
`26`	`26`	`}`
`27`		`- val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false`
`28`		`- if (onPhone) {`
`29`		`- iosArm64("ios") {`
`30`		`- binaries.framework(listOf(NativeBuildType.DEBUG)) {`
`31`		`- xcFramework.add(this)`
`32`		`- }`
`33`		`-`
`34`		`- }`
`35`		`- } else {`
`36`		`- iosX64("ios") {`
`37`		`- binaries.framework(listOf(NativeBuildType.DEBUG)) {`
`38`		`- xcFramework.add(this)`
`39`		`- }`
	`27`	`+ ios {`
	`28`	`+ binaries.framework(listOf(NativeBuildType.RELEASE)) {`
	`29`	`+ xcFramework.add(this)`
`40`	`30`	`}`
`41`	`31`	`}`
`42`	`32`
Original file line number	Diff line number	Diff line change
`@@ -35,14 +35,14 @@ module.exports = {`
`35`	`35`	`[`
`36`	`36`	`"@semantic-release/exec",`
`37`	`37`	`{`
`38`		`- prepareCmd: "sh ./.scripts/release.sh ${nextRelease.version}",`
	`38`	`+ prepareCmd: "sh ./.scripts/release.sh ${nextRelease.version}; ./gradlew podPublishReleaseXCFramework",`
`39`	`39`	`},`
`40`	`40`	`],`
`41`	`41`	`["@semantic-release/github"],`
`42`	`42`	`[`
`43`	`43`	`"@semantic-release/git",`
`44`	`44`	`{`
`45`		`- assets: ["CHANGELOG.md", "gradle.properties", "README.md"],`
	`45`	`+ assets: ["CHANGELOG.md", "gradle.properties", "README.md", "frameworks", "mParticle_Internal.podspec.json"],`
`46`	`46`	`message:`
`47`	`47`	`"chore(release): ${nextRelease.version} \n\n${nextRelease.notes}",`
`48`	`48`	`},`