Skip to content

Commit a3275e2

Browse files
thomson-tmarkvdouwjamesnroktmarkvdouw
authored
chore: merge development branch to main (#284)
* feat: Adding simple sample instrumentation test for ShopViewModel (#151) * feat: Update dependencies and implement Rokt (#279) * feat: sideloaded kit integration (#211) * Sideloaded kit integration * Testing sideloading integration * Fix dependency version * Changes due to comments * Adding kitId in constructor due to change in architecture * Implementing default functions from KitIntegration * Adding minimal sideloading kit example and kit-base dependency * Base updates for AGP * Remove excessive logging * Update deps to use BOM and add Rokt * Add Rokt overlay placement post checkout * Add Rokt close implementation * Add event logging and auto close * Migrate to toml version management * Add lint baseline * Add standard files * Migrate missed plugins * Add versions to toml file * Add permissions * Bump upload artifact version * Add concurrency * Remove main qualifier * Use local reference * Bump versions * Change runner to recommended by reactivecircus * Bump gradle version * Update settings.gradle.kts --------- Co-authored-by: markvdouw <[email protected]> * fix: desugar build error --------- Co-authored-by: markvdouw <[email protected]> Co-authored-by: James Newman <[email protected]> Co-authored-by: markvdouw <[email protected]>
1 parent 995bc1e commit a3275e2

File tree

24 files changed

+1083
-178
lines changed

24 files changed

+1083
-178
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @mParticle/sdk-team

.github/dependabot.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2
22
updates:
33
- package-ecosystem: gradle
4-
directory: "/core-sdk-samples/higgs-shop-sample-app/"
4+
directory: "/"
55
schedule:
66
interval: daily
77
time: "08:00"
@@ -10,4 +10,13 @@ updates:
1010
labels: ['dependabot']
1111
open-pull-requests-limit: 10
1212
commit-message:
13-
prefix: "chore"
13+
prefix: "chore"
14+
- package-ecosystem: github-actions
15+
directory: /
16+
schedule:
17+
interval: weekly
18+
open-pull-requests-limit: 4
19+
labels:
20+
- dependabot
21+
commit-message:
22+
prefix: "chore"

.github/workflows/pull-request-app-checks.yml

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: "Checkout Sample Apps"
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020
with:
2121
submodules: recursive
2222
# - name: "Create Path Triggers"
@@ -35,27 +35,34 @@ jobs:
3535
instrumented-tests:
3636
name: "Instrumented Tests"
3737
timeout-minutes: 30
38-
runs-on: macos-latest
38+
runs-on: ubuntu-latest
3939
needs: confirm-folder-changes
4040
steps:
4141
- name: "Checkout Branch"
42-
uses: actions/checkout@v3
42+
uses: actions/checkout@v4
4343
with:
4444
submodules: recursive
45-
- name: "Install JDK 11"
46-
uses: actions/setup-java@v3
45+
- name: "Install JDK"
46+
uses: actions/setup-java@v4
4747
with:
4848
distribution: "zulu"
49-
java-version: "11"
49+
java-version: 17
5050
cache: "gradle"
51+
- name: Enable KVM group perms
52+
run: |
53+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
54+
sudo udevadm control --reload-rules
55+
sudo udevadm trigger --name-match=kvm
5156
- name: "Run Instrumented Tests"
52-
uses: reactivecircus/android-emulator-runner@v2.27.0
57+
uses: reactivecircus/android-emulator-runner@v2
5358
with:
5459
working-directory: ${{ inputs.app_relative_path }}
5560
api-level: 29
61+
arch: x86_64
62+
profile: Nexus 6
5663
script: ./gradlew connectedCheck
5764
- name: "Archive Instrumented Tests Results"
58-
uses: actions/upload-artifact@v3
65+
uses: actions/upload-artifact@v4
5966
if: ${{ always() }}
6067
with:
6168
name: "instrumented-tests-results"
@@ -68,20 +75,20 @@ jobs:
6875
needs: confirm-folder-changes
6976
steps:
7077
- name: "Checkout Branch"
71-
uses: actions/checkout@v3
78+
uses: actions/checkout@v4
7279
with:
7380
submodules: recursive
74-
- name: "Install JDK 11"
75-
uses: actions/setup-java@v3
81+
- name: "Install JDK"
82+
uses: actions/setup-java@v4
7683
with:
7784
distribution: "zulu"
78-
java-version: "11"
85+
java-version: 17
7986
cache: "gradle"
8087
- name: "Run Unit Tests"
8188
working-directory: ${{ inputs.app_relative_path }}
8289
run: ./gradlew test
8390
- name: "Android Unit Tests Report"
84-
uses: actions/upload-artifact@v3
91+
uses: actions/upload-artifact@v4
8592
if: ${{ always() }}
8693
with:
8794
name: "unit-tests-results"
@@ -90,24 +97,24 @@ jobs:
9097
lint-checks:
9198
name: "Lint Checks"
9299
timeout-minutes: 15
93-
runs-on: macos-latest
100+
runs-on: ubuntu-latest
94101
needs: confirm-folder-changes
95102
steps:
96103
- name: "Checkout Branch"
97-
uses: actions/checkout@v3
104+
uses: actions/checkout@v4
98105
with:
99106
submodules: recursive
100-
- name: "Install JDK 11"
101-
uses: actions/setup-java@v3
107+
- name: Install JDK
108+
uses: actions/setup-java@v4
102109
with:
103110
distribution: "zulu"
104-
java-version: "11"
111+
java-version: 17
105112
cache: "gradle"
106113
- name: "Run Android Core SDK Lint"
107114
working-directory: ${{ inputs.app_relative_path }}
108115
run: ./gradlew lint
109116
- name: "Archive Lint Test Results"
110-
uses: actions/upload-artifact@v3
117+
uses: actions/upload-artifact@v4
111118
if: ${{ always() }}
112119
with:
113120
name: "lint-results"
@@ -116,24 +123,24 @@ jobs:
116123
kotlin-lint-checks:
117124
name: "Kotlin Lint Checks"
118125
timeout-minutes: 15
119-
runs-on: macos-latest
126+
runs-on: ubuntu-latest
120127
needs: confirm-folder-changes
121128
steps:
122129
- name: "Checkout Branch"
123-
uses: actions/checkout@v3
130+
uses: actions/checkout@v4
124131
with:
125132
submodules: recursive
126-
- name: "Install JDK 11"
127-
uses: actions/setup-java@v3
133+
- name: Install JDK
134+
uses: actions/setup-java@v4
128135
with:
129136
distribution: "zulu"
130-
java-version: "11"
137+
java-version: 17
131138
cache: "gradle"
132139
- name: "Run Android Core SDK Kotlin Lint"
133140
working-directory: ${{ inputs.app_relative_path }}
134141
run: ./gradlew ktlintCheck
135142
- name: "Archive Lint Test Results"
136-
uses: actions/upload-artifact@v3
143+
uses: actions/upload-artifact@v4
137144
if: ${{ always() }}
138145
with:
139146
name: "kotlin-lint-results"

.github/workflows/pull-request.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,36 @@ name: "Build and Test"
22

33
on: [ push, workflow_dispatch, pull_request ]
44

5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
7+
cancel-in-progress: true
8+
9+
permissions:
10+
contents: read
11+
pull-requests: read
12+
checks: write
13+
id-token: write
14+
515
jobs:
616

717
higgs-shop-sample-app:
818
name: "Check Higgs Shop Sample App"
9-
uses: mParticle/mparticle-android-sample-apps/.github/workflows/pull-request-app-checks.yml@main
19+
uses: ./.github/workflows/pull-request-app-checks.yml
1020
with:
1121
app_relative_path: "core-sdk-samples/higgs-shop-sample-app"
1222

1323
automerge-dependabot:
1424
name: "Save PR Number for Dependabot Automerge"
1525
needs: [ higgs-shop-sample-app ]
1626
uses: mParticle/mparticle-workflows/.github/workflows/dependabot-save-pr-number.yml@main
27+
28+
pr-notify:
29+
if: >
30+
github.event_name == 'pull_request' &&
31+
github.event.pull_request.draft == false
32+
needs:
33+
- higgs-shop-sample-app
34+
name: Notify GChat
35+
uses: ROKT/rokt-workflows/.github/workflows/oss_pr_opened_notification.yml@main
36+
secrets:
37+
gchat_webhook: ${{ secrets.GCHAT_PRS_WEBHOOK }}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ hs_err_pid*
2323

2424
.idea
2525
.gradle
26+
27+
local.properties

SECURITY.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Security Policy
2+
3+
## Reporting a vulnerability
4+
5+
To avoid abuse by malicious actors please do not open GitHub issues or pull requests for any security related issue you may have spotted.
6+
7+
The safest way to report any vulnerability or concern you may have is via our [dedicated submission form](https://www.rokt.com/vulnerability-disclosure/).
8+
9+
For further information please refer to the [Rokt Vulnerability Disclosure Policy](https://www.rokt.com/vulnerability-disclosure/).

0 commit comments

Comments
 (0)