chore: cut release (#44)

Author: merlinpaypal

.github/workflows/release-test.yml

@@ -45,7 +45,7 @@ jobs:
 
   test_instrumentation:
     name: Instrumentation Tests
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repo

.github/workflows/release.yml

@@ -60,6 +60,14 @@ jobs:
           SIGNING_KEY_FILE: ${{ env.SIGNING_KEY_FILE_PATH }}
         run: npx semantic-release@21
 
+      - name: Sync release to develop
+        uses: devmasx/merge-branch@master
+        with:
+          type: now
+          from_branch: release
+          target_branch: develop
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Publish to Maven
         uses: ./.github/actions/publish_all_modules
         with:

.idea/.gitignore

@@ -1,7 +1,7 @@
 {
 	"branches": [
 		"release",
-		{"name": "develop", "prerelease": true},
+		{"name": "develop", "channel": "beta", "prerelease": true},
 		{"name": "prerelease", "prerelease": true}
 	],
 	"tagFormat": "${version}",

.idea/dictionaries/base.xml

@@ -6,6 +6,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.paypal.messages.config.PayPalEnvironment
 import com.paypal.messages.config.PayPalMessageOfferType
+import com.paypal.messages.config.message.PayPalMessageConfig
 import com.paypal.messages.config.message.PayPalMessageData
 import com.paypal.messages.config.message.PayPalMessageStyle
 import com.paypal.messages.io.Api.preventEmptyValues
@@ -98,6 +99,7 @@ class ApiTest {
 			),
 			style = PayPalMessageStyle(),
 		)
+		PayPalMessageConfig.setGlobalAnalytics("test_integration_name", "test_integration_version")
 		val messageDataRequest = Api.createMessageDataRequest(config, "hash", instanceId)
 		val url = messageDataRequest.url.toString()
 
@@ -114,6 +116,8 @@ class ApiTest {
 			"buyer_country=US",
 			"offer=PAY_LATER_PAY_IN_1",
 			"merchant_config=hash",
+			"integration_name=test_integration_name",
+			"integration_version=test_integration_version",
 		)
 		expectedQueryParts.forEach { assertTrue("url does not contain $it", url.contains(it)) }
 	}

.idea/misc.xml

@@ -5,6 +5,7 @@ import com.google.gson.GsonBuilder
 import com.google.gson.JsonObject
 import com.paypal.messages.BuildConfig
 import com.paypal.messages.analytics.CloudEvent
+import com.paypal.messages.analytics.GlobalAnalytics
 import com.paypal.messages.utils.LogCat
 import com.paypal.messages.utils.PayPalErrors
 import kotlinx.coroutines.CoroutineScope
@@ -45,6 +46,11 @@ object Api {
 		if (ignoreCache) addQueryParameter("ignore_cache", "true")
 		addQueryParameter("instance_id", instanceId.toString())
 
+		GlobalAnalytics.integrationName.takeIf { it.isNotEmpty() }?.let {
+			addQueryParameter("integration_name", GlobalAnalytics.integrationName)
+			addQueryParameter("integration_version", GlobalAnalytics.integrationVersion)
+		}
+
 		if (!stageTag.isNullOrBlank()) { addQueryParameter("stage_tag", stageTag) }
 
 		addQueryParameter("logo_type", config.style.logoType.name.lowercase())