chore: merge workstation/6.0-Release into main

.github/workflows/build-kits.yml

@@ -0,0 +1,69 @@
+name: Build Kits
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  load-matrix:
+    name: Load kit matrix
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        with:
+          sparse-checkout: kits/matrix.json
+          sparse-checkout-cone-mode: false
+      - id: set
+        run: echo "matrix=$(jq -c . kits/matrix.json)" >> "$GITHUB_OUTPUT"
+
+  build-kits:
+    name: Build ${{ matrix.kit.name }}
+    needs: load-matrix
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        kit: ${{ fromJson(needs.load-matrix.outputs.matrix) }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+
+      - name: Set SDK version
+        run: |
+          echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
+          echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
+
+      - name: Install JDK 17
+        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5
+        with:
+          distribution: zulu
+          java-version: "17"
+
+      - name: Publish core SDK to Maven Local
+        run: ./gradlew publishMavenPublicationToMavenLocal
+
+      - name: Run kit unit tests
+        if: ${{ matrix.kit.skip_unit_tests != true }}
+        run: |
+          ./gradlew "${{ matrix.kit.kit_project }}:testRelease" \
+            -c settings-kits.gradle \
+            -Pmparticle.kit.mparticleFromMavenLocalOnly=true
+
+      - name: Build Kotlin example
+        if: ${{ matrix.kit.skip_example_builds != true && matrix.kit.example_kotlin_project != '' }}
+        run: |
+          ./gradlew "${{ matrix.kit.example_kotlin_project }}:assembleDebug" \
+            -c settings-kit-examples.gradle \
+            -Pmparticle.kit.mparticleFromMavenLocalOnly=true
+
+      - name: Build Java example
+        if: ${{ matrix.kit.skip_example_builds != true && matrix.kit.example_java_project != '' }}
+        run: |
+          ./gradlew "${{ matrix.kit.example_java_project }}:assembleDebug" \
+            -c settings-kit-examples.gradle \
+            -Pmparticle.kit.mparticleFromMavenLocalOnly=true

.github/workflows/daily.yml

@@ -45,12 +45,11 @@ jobs:
       GIT_COMMITTER_EMAIL: developers@mparticle.com
     steps:
       - name: "Clone branch"
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
           repository: mparticle/mparticle-android-sdk
           ref: ${{ inputs.branch_name }}
-          submodules: recursive
       - name: "Import GPG Key"
         uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec #v6.0
         with:
@@ -62,13 +61,6 @@ jobs:
         run: |
           git checkout -b regression/${{ github.run_number }}
           git push origin regression/${{ github.run_number }}
-      - name: "Commit Kit Updates"
-        run: |
-          git submodule foreach "git fetch; git reset --hard origin/main";
-          git add .
-          git diff-index --quiet HEAD || git commit -m 'chore: Update Submodules'
-      - name: "Push kit updates to release branch"
-        run: git push origin regression/${{ github.run_number }}
 
   #  instrumented-tests:
   #    name: "Instrumented Tests"
@@ -77,7 +69,7 @@ jobs:
   #    needs: create-regression-branch
   #    steps:
   #      - name: "Checkout future release branch"
-  #        uses: actions/checkout@v6.0.3
+  #        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
   #        with:
   #          repository: mparticle/mparticle-android-sdk
   #          ref: regression/${{ github.run_number }}
@@ -110,7 +102,7 @@ jobs:
   #    needs: create-regression-branch
   #    steps:
   #      - name: "Checkout Branch"
-  #        uses: actions/checkout@v6.0.3
+  #        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
   #        with:
   #          repository: mparticle/mparticle-android-sdk
   #          ref: regression/${{ github.run_number }}
@@ -200,7 +192,7 @@ jobs:
     needs: create-regression-branch
     steps:
       - name: "Checkout future release branch"
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           repository: mparticle/mparticle-android-sdk
           ref: regression/${{ github.run_number }}
@@ -229,10 +221,11 @@ jobs:
     needs: create-regression-branch
     steps:
       - name: "Checkout Branch"
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: regression/${{ github.run_number }}
-          submodules: recursive
+      - run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
+      - run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
       - name: "Install JDK 17"
         uses: actions/setup-java@v5
         with:
@@ -242,15 +235,15 @@ jobs:
       - name: "Run Android Core SDK Lint"
         run: ./gradlew lint
       - name: "Setup Android Kit Lint"
-        run: ./gradlew publishReleaseLocal
+        run: ./gradlew publishMavenPublicationToMavenLocal
       - name: "Run Android Kit Lint"
-        run: ./gradlew publishReleaseLocal -c settings-kits.gradle lint
-      - name: "Get SDK version for isolated kits"
-        id: sdk-version
-        run: echo "version=$(./gradlew -q properties | grep '^version:' | awk '{print $2}')" >> $GITHUB_OUTPUT
+        run: ./gradlew lint -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
       - name: "Run Isolated Kit Lint (urbanairship-kit)"
-        working-directory: kits/urbanairship-kit
-        run: ./gradlew -Pversion=${{ steps.sdk-version.outputs.version }} lint
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 lint
+      - name: "Run Isolated Kit Lint (ga-kit)"
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/ga/ga-23 lint
+      - name: "Run Isolated Kit Lint (ga4-kit)"
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/ga4/ga4-23 lint
       - name: "Archive Test Results"
         uses: actions/upload-artifact@v7
         if: always()
@@ -271,10 +264,11 @@ jobs:
     needs: create-regression-branch
     steps:
       - name: "Checkout Branch"
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: regression/${{ github.run_number }}
-          submodules: recursive
+      - run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
+      - run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
       - name: "Install JDK 17"
         uses: actions/setup-java@v5
         with:
@@ -284,15 +278,15 @@ jobs:
       - name: "Run Android Core SDK Kotlin Lint"
         run: ./gradlew ktlintCheck
       - name: "Setup Android Kit Kotlin Lint"
-        run: ./gradlew publishReleaseLocal
+        run: ./gradlew publishMavenPublicationToMavenLocal
       - name: "Run Android Kit Kotlin Lint"
-        run: ./gradlew publishReleaseLocal -c settings-kits.gradle ktlintCheck
-      - name: "Get SDK version for isolated kits"
-        id: sdk-version
-        run: echo "version=$(./gradlew -q properties | grep '^version:' | awk '{print $2}')" >> $GITHUB_OUTPUT
+        run: ./gradlew ktlintCheck -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
       - name: "Run Isolated Kit Kotlin Lint (urbanairship-kit)"
-        working-directory: kits/urbanairship-kit
-        run: ./gradlew -Pversion=${{ steps.sdk-version.outputs.version }} ktlintCheck
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 ktlintCheck
+      - name: "Run Isolated Kit Kotlin Lint (ga-kit)"
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/ga/ga-23 ktlintCheck
+      - name: "Run Isolated Kit Kotlin Lint (ga4-kit)"
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/ga4/ga4-23 ktlintCheck
       - name: "Archive Test Results"
         uses: actions/upload-artifact@v7
         if: always()
@@ -317,27 +311,28 @@ jobs:
       GIT_COMMITTER_EMAIL: developers@mparticle.com
     steps:
       - name: "Checkout future release branch"
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           repository: mparticle/mparticle-android-sdk
           ref: regression/${{ github.run_number }}
-          submodules: recursive
+      - run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
+      - run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
       - name: "Install JDK 17"
         uses: actions/setup-java@v5
         with:
           distribution: "zulu"
           java-version: "17"
           cache: "gradle"
       - name: "Build Android Core"
-        run: ./gradlew -PisRelease=true clean publishReleaseLocal
+        run: ./gradlew clean publishMavenPublicationToMavenLocal
       - name: "Test Kits"
-        run: ./gradlew -PisRelease=true clean testRelease publishReleaseLocal -c settings-kits.gradle
-      - name: "Get SDK version for isolated kits"
-        id: sdk-version
-        run: echo "version=$(./gradlew -PisRelease=true -q properties | grep '^version:' | awk '{print $2}')" >> $GITHUB_OUTPUT
+        run: ./gradlew clean testRelease -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
       - name: "Test Isolated Kits (urbanairship-kit)"
-        working-directory: kits/urbanairship-kit
-        run: ./gradlew -PisRelease=true -Pversion=${{ steps.sdk-version.outputs.version }} clean testRelease publishReleaseLocal
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 clean testRelease
+      - name: "Test Isolated Kits (ga-kit)"
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/ga/ga-23 clean testRelease
+      - name: "Test Isolated Kits (ga4-kit)"
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/ga4/ga4-23 clean testRelease
 
   semantic-release-dryrun:
     name: "Test Semantic Release - Dry Run"
@@ -351,7 +346,7 @@ jobs:
       GIT_COMMITTER_EMAIL: developers@mparticle.com
     steps:
       - name: "Checkout public main branch"
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           ref: main
@@ -382,7 +377,7 @@ jobs:
       GIT_COMMITTER_EMAIL: developers@mparticle.com
     steps:
       - name: "Checkout repo"
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
           fetch-depth: 0

.github/workflows/instrumented-tests.yml

@@ -0,0 +1,69 @@
+name: Instrumented Tests (Reusable)
+
+on:
+  workflow_call:
+    inputs:
+      display_name:
+        required: true
+        type: string
+      gradle_command:
+        required: true
+        type: string
+      artifact_name:
+        required: true
+        type: string
+      artifact_path:
+        required: true
+        type: string
+      timeout_minutes:
+        required: false
+        type: number
+        default: 20
+
+permissions:
+  contents: read
+  pull-requests: read
+  checks: write
+
+jobs:
+  instrumented:
+    name: "Instrumented Tests (${{ inputs.display_name }})"
+    timeout-minutes: ${{ inputs.timeout_minutes }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout Branch"
+        uses: actions/checkout@v6.0.2
+      - name: "Install JDK 17"
+        uses: actions/setup-java@v5
+        with:
+          distribution: "zulu"
+          java-version: "17"
+      - name: Gradle cache
+        uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a #v2.9.0
+      # AVD cache disabled: causes indefinite hangs on emulator shutdown (see
+      # ReactiveCircus/android-emulator-runner#373, #385, #362; WordPress/gutenberg#66771)
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+      - name: "Run Instrumented Tests (${{ inputs.display_name }})"
+        uses: reactivecircus/android-emulator-runner@b530d96654c385303d652368551fb075bc2f0b6b #v2.35.0
+        env:
+          ANDROID_EMULATOR_WAIT_TIME_BEFORE_KILL: 60
+        with:
+          api-level: 28
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: |
+            adb shell settings put global transition_animation_scale 0.0
+            adb shell settings put global animator_duration_scale 0.0
+            for pkg in com.mparticle.kittests com.mparticle.kits.test com.mparticle.legacyTest com.mparticle.test; do if adb shell pm list packages | grep -q "$pkg"; then adb uninstall "$pkg"; fi; done
+            ./gradlew ${{ inputs.gradle_command }}
+      - name: "Archive ${{ inputs.display_name }} Results"
+        uses: actions/upload-artifact@v7
+        if: always()
+        with:
+          name: ${{ inputs.artifact_name }}
+          path: ${{ inputs.artifact_path }}