Skip to content

Commit 85792ad

Browse files
mchuangatmpmchuangatmp
authored
feat: Add in new Android 13 and dependencies changes (#149)
1 parent 7c45782 commit 85792ad

File tree

16 files changed

+174
-86
lines changed

16 files changed

+174
-86
lines changed

‎.github/workflows/auto_assign_pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
-H "Accept: application/vnd.github+json" \
9494
-H "Authorization: Bearer ${{secrets.MP_SEMANTIC_RELEASE_BOT}}" \
9595
https://api.github.com/repos/mParticle/mparticle-android-sample-apps/pulls/${{ steps.find-pr-number.outputs.result }}/requested_reviewers \
96-
-d '{"reviewers":["jasonmgeorge","MystiBerry"],"team_reviewers":["docs-triage"]}'
96+
-d '{"reviewers":["schallock","MystiBerry"],"team_reviewers":["docs-triage"]}'
9797
- name: "PR title is not docs"
9898
if: ${{ steps.is-docs.outputs.isDocs != 'true'}}
9999
run: |
@@ -102,5 +102,5 @@ jobs:
102102
-H "Accept: application/vnd.github+json" \
103103
-H "Authorization: Bearer ${{secrets.MP_SEMANTIC_RELEASE_BOT}}" \
104104
https://api.github.com/repos/mParticle/mparticle-android-sample-apps/pulls/${{ steps.find-pr-number.outputs.result }}/requested_reviewers \
105-
-d '{"reviewers":["mchuangatmp","einsteinx2"],"team_reviewers":["android-triage"]}'
105+
-d '{"reviewers":["mchuangatmp"],"team_reviewers":["android-triage"]}'
106106

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

Lines changed: 18 additions & 14 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@v2
19+
uses: actions/checkout@v3
2020
with:
2121
submodules: recursive
2222
# - name: "Create Path Triggers"
@@ -39,22 +39,23 @@ jobs:
3939
needs: confirm-folder-changes
4040
steps:
4141
- name: "Checkout Branch"
42-
uses: actions/checkout@v2
42+
uses: actions/checkout@v3
4343
with:
4444
submodules: recursive
4545
- name: "Install JDK 11"
46-
uses: actions/setup-java@v2
46+
uses: actions/setup-java@v3
4747
with:
4848
distribution: "zulu"
4949
java-version: "11"
50+
cache: "gradle"
5051
- name: "Run Instrumented Tests"
51-
uses: reactivecircus/android-emulator-runner@v2.20.0
52+
uses: reactivecircus/android-emulator-runner@v2.26.0
5253
with:
5354
working-directory: ${{ inputs.app_relative_path }}
5455
api-level: 29
5556
script: ./gradlew connectedCheck
5657
- name: "Archive Instrumented Tests Results"
57-
uses: actions/upload-artifact@v2
58+
uses: actions/upload-artifact@v3
5859
if: ${{ always() }}
5960
with:
6061
name: "instrumented-tests-results"
@@ -67,19 +68,20 @@ jobs:
6768
needs: confirm-folder-changes
6869
steps:
6970
- name: "Checkout Branch"
70-
uses: actions/checkout@v2
71+
uses: actions/checkout@v3
7172
with:
7273
submodules: recursive
7374
- name: "Install JDK 11"
74-
uses: actions/setup-java@v2
75+
uses: actions/setup-java@v3
7576
with:
7677
distribution: "zulu"
7778
java-version: "11"
79+
cache: "gradle"
7880
- name: "Run Unit Tests"
7981
working-directory: ${{ inputs.app_relative_path }}
8082
run: ./gradlew test
8183
- name: "Android Unit Tests Report"
82-
uses: actions/upload-artifact@v2
84+
uses: actions/upload-artifact@v3
8385
if: ${{ always() }}
8486
with:
8587
name: "unit-tests-results"
@@ -92,19 +94,20 @@ jobs:
9294
needs: confirm-folder-changes
9395
steps:
9496
- name: "Checkout Branch"
95-
uses: actions/checkout@v2
97+
uses: actions/checkout@v3
9698
with:
9799
submodules: recursive
98100
- name: "Install JDK 11"
99-
uses: actions/setup-java@v2
101+
uses: actions/setup-java@v3
100102
with:
101103
distribution: "zulu"
102104
java-version: "11"
105+
cache: "gradle"
103106
- name: "Run Android Core SDK Lint"
104107
working-directory: ${{ inputs.app_relative_path }}
105108
run: ./gradlew lint
106109
- name: "Archive Lint Test Results"
107-
uses: actions/upload-artifact@v2
110+
uses: actions/upload-artifact@v3
108111
if: ${{ always() }}
109112
with:
110113
name: "lint-results"
@@ -117,19 +120,20 @@ jobs:
117120
needs: confirm-folder-changes
118121
steps:
119122
- name: "Checkout Branch"
120-
uses: actions/checkout@v2
123+
uses: actions/checkout@v3
121124
with:
122125
submodules: recursive
123126
- name: "Install JDK 11"
124-
uses: actions/setup-java@v2
127+
uses: actions/setup-java@v3
125128
with:
126129
distribution: "zulu"
127130
java-version: "11"
131+
cache: "gradle"
128132
- name: "Run Android Core SDK Kotlin Lint"
129133
working-directory: ${{ inputs.app_relative_path }}
130134
run: ./gradlew ktlintCheck
131135
- name: "Archive Lint Test Results"
132-
uses: actions/upload-artifact@v2
136+
uses: actions/upload-artifact@v3
133137
if: ${{ always() }}
134138
with:
135139
name: "kotlin-lint-results"

‎.github/workflows/pull-request.yml‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,4 @@ jobs:
1313
automerge-dependabot:
1414
name: "Save PR Number for Dependabot Automerge"
1515
needs: [ higgs-shop-sample-app ]
16-
if: ${{ github.actor == 'dependabot[bot]' && github.event_name == 'pull_request' }}
17-
runs-on: ubuntu-latest
18-
steps:
19-
- name: "Checkout PR branch"
20-
uses: actions/checkout@v2
21-
with:
22-
submodules: recursive
23-
fetch-depth: 0
24-
- name: "Save Pull Request Number"
25-
run: |
26-
mkdir -p ./pr
27-
echo ${{ github.event.number }} > ./pr/NR
28-
- uses: actions/upload-artifact@v2
29-
with:
30-
name: pr
31-
path: pr/
16+
uses: mParticle/mparticle-workflows/.github/workflows/dependabot-save-pr-number.yml@main

‎.github/workflows/pull_request_opened.yml‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,4 @@ on:
77
jobs:
88
pull-request-opened:
99
name: "Opened Pull Request"
10-
runs-on: ubuntu-latest
11-
steps:
12-
- name: "Checkout PR branch"
13-
uses: actions/checkout@v2
14-
with:
15-
submodules: recursive
16-
fetch-depth: 0
17-
- name: "Save Pull Request Number"
18-
run: |
19-
mkdir -p ./pr
20-
echo ${{ github.event.pull_request.number }},${{github.event.pull_request.title }} > ./pr/NR
21-
- uses: actions/upload-artifact@v2
22-
with:
23-
name: pr
24-
path: pr/
10+
uses: mParticle/mparticle-workflows/.github/workflows/dependabot-save-pr-number.yml@main

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
GIT_COMMITTER_EMAIL: [email protected]
2828
steps:
2929
- name: "Checkout next release branch"
30-
uses: actions/checkout@v2
30+
uses: actions/checkout@v3
3131
with:
3232
ref: development
3333
- name: "Import GPG Key"
@@ -56,7 +56,7 @@ jobs:
5656
GIT_COMMITTER_EMAIL: [email protected]
5757
steps:
5858
- name: "Checkout public main branch"
59-
uses: actions/checkout@v2
59+
uses: actions/checkout@v3
6060
with:
6161
fetch-depth: 0
6262
ref: main
@@ -68,10 +68,11 @@ jobs:
6868
git_user_signingkey: true
6969
git_commit_gpgsign: true
7070
- name: "Install JDK 11"
71-
uses: actions/setup-java@v2
71+
uses: actions/setup-java@v3
7272
with:
7373
distribution: "zulu"
7474
java-version: "11"
75+
cache: "gradle"
7576
- name: "Merge release branch into main branch"
7677
run: |
7778
git pull origin release/${{ github.run_number }}
@@ -105,7 +106,7 @@ jobs:
105106
runs-on: ubuntu-latest
106107
steps:
107108
- name: "Checkout main branch"
108-
uses: actions/checkout@v2
109+
uses: actions/checkout@v3
109110
with:
110111
fetch-depth: 0
111112
repository: ${{ github.repository }}

‎.github/workflows/reusable-workflows.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
pull_request:
55

66
jobs:
7+
pr-check-hadcoded-secrets:
8+
name: "Check PR for hardcoded secrets"
9+
uses: mParticle/mparticle-workflows/.github/workflows/security-hardcoded-secrets.yml@main
710
pr-branch-check-name:
811
name: "Check PR for semantic branch name"
912
uses: mParticle/mparticle-workflows/.github/workflows/pr-branch-check-name.yml@main

‎.github/workflows/sync-higgs-shop-data-plan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
GIT_COMMITTER_EMAIL: [email protected]
2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v2
30+
uses: actions/checkout@v3
3131
with:
3232
ref: development
3333

‎core-sdk-samples/higgs-shop-sample-app/app/build.gradle.kts‎

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import java.util.TimeZone
55
plugins {
66
id("com.android.application")
77
id("org.jlleitschuh.gradle.ktlint") version "11.0.0"
8+
// id("com.google.gms.google-services")
89
kotlin("android")
910
kotlin("kapt")
1011
}
@@ -13,20 +14,24 @@ android {
1314
compileSdk = 33
1415
defaultConfig {
1516
applicationId = "com.mparticle.example.higgsshopsampleapp"
16-
minSdk = 23
17+
minSdk = 24
1718
targetSdk = 33
1819
versionCode = buildVersionCode()
1920
versionName = "0.13.0-SNAPSHOT"
2021
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2122
buildConfigField("String", "HIGGS_SHOP_SAMPLE_APP_KEY", "\"${System.getenv("HIGGS_SHOP_SAMPLE_APP_KEY")}\"")
2223
buildConfigField("String", "HIGGS_SHOP_SAMPLE_APP_SECRET", "\"${System.getenv("HIGGS_SHOP_SAMPLE_APP_SECRET")}\"")
24+
buildConfigField("String", "HIGGS_SHOP_FCM_SENDER_ID", "\"${System.getenv("HIGGS_SHOP_FCM_SENDER_ID")}\"")
2325
}
2426
buildFeatures {
2527
dataBinding = true
2628
compose = true
2729
}
2830
composeOptions {
29-
kotlinCompilerExtensionVersion = "1.3.1"
31+
kotlinCompilerExtensionVersion = "1.3.2"
32+
}
33+
kotlinOptions {
34+
jvmTarget = "11"
3035
}
3136
buildTypes {
3237
getByName("release") {
@@ -45,41 +50,47 @@ android {
4550
}
4651

4752
dependencies {
48-
implementation("androidx.appcompat:appcompat:1.4.1")
49-
implementation("androidx.compose.runtime:runtime:1.2.1")
50-
implementation("androidx.compose.ui:ui:1.2.1")
51-
implementation("androidx.compose.material:material:1.2.1")
52-
implementation("androidx.compose.ui:ui-tooling:1.2.1")
53-
implementation("androidx.compose.runtime:runtime-livedata:1.2.1")
54-
implementation("androidx.constraintlayout:constraintlayout:2.1.3")
55-
implementation("androidx.core:core-ktx:1.7.0")
56-
implementation("androidx.fragment:fragment:1.3.6")
57-
implementation("androidx.fragment:fragment-ktx:1.3.6")
53+
implementation("androidx.appcompat:appcompat:1.5.1")
54+
implementation("androidx.compose.runtime:runtime:1.3.0")
55+
implementation("androidx.compose.ui:ui:1.3.0")
56+
implementation("androidx.compose.material:material:1.3.0")
57+
implementation("androidx.compose.ui:ui-tooling:1.3.0")
58+
implementation("androidx.compose.runtime:runtime-livedata:1.3.0")
59+
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
60+
implementation("androidx.core:core-ktx:1.9.0")
61+
implementation("androidx.fragment:fragment:1.5.4")
62+
implementation("androidx.fragment:fragment-ktx:1.5.4")
5863
implementation("androidx.recyclerview:recyclerview:1.2.1")
59-
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0")
60-
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.4.0")
61-
implementation("androidx.navigation:navigation-fragment-ktx:2.3.5")
62-
implementation("androidx.navigation:navigation-ui-ktx:2.3.5")
63-
implementation("com.google.android.material:material:1.5.0")
64-
implementation("com.mparticle:android-core:5.45.1")
64+
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
65+
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
66+
implementation("androidx.navigation:navigation-fragment-ktx:2.5.3")
67+
implementation("androidx.navigation:navigation-ui-ktx:2.5.3")
68+
implementation("com.google.android.material:material:1.7.0")
69+
implementation("com.mparticle:android-core:5.48.0")
70+
implementation("com.google.android.gms:play-services-ads-identifier:18.0.1")
71+
72+
// implementation(platform("com.google.firebase:firebase-bom:31.0.2"))
73+
// implementation("com.google.firebase:firebase-analytics-ktx")
74+
75+
// implementation("com.mparticle:android-media:1.4.2")
6576

66-
implementation("com.github.bumptech.glide:glide:4.13.2")
77+
implementation("com.github.bumptech.glide:glide:4.14.2")
6778

6879
api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4")
6980
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
7081
api("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
7182

72-
implementation("com.squareup.retrofit2:retrofit:2.6.1")
73-
implementation("com.squareup.retrofit2:converter-gson:2.6.1")
74-
implementation("com.squareup.retrofit2:converter-moshi:2.6.1")
75-
implementation("com.squareup.retrofit2:adapter-rxjava2:2.6.1")
76-
implementation("io.reactivex.rxjava2:rxjava:2.1.14")
77-
implementation("io.reactivex.rxjava2:rxandroid:2.0.2")
83+
implementation("com.squareup.retrofit2:retrofit:2.9.0")
84+
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
85+
implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
86+
implementation("com.squareup.retrofit2:adapter-rxjava2:2.9.0")
87+
implementation("io.reactivex.rxjava2:rxjava:2.2.21")
88+
implementation("io.reactivex.rxjava2:rxandroid:2.1.1")
7889
implementation("com.squareup.okhttp3:logging-interceptor:4.10.0")
7990
implementation("com.squareup.okhttp3:okhttp:4.10.0")
8091
implementation("com.squareup.okhttp3:logging-interceptor:4.10.0")
8192

82-
debugImplementation("androidx.compose.ui:ui-tooling:1.1.1")
93+
debugImplementation("androidx.compose.ui:ui-tooling:1.3.0")
8394

8495
val roomVersion = "2.4.3"
8596
implementation("androidx.room:room-runtime:$roomVersion")
@@ -94,7 +105,7 @@ dependencies {
94105
testImplementation("androidx.room:room-testing:$roomVersion")
95106
testImplementation("junit:junit:4.13.2")
96107

97-
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.2.1")
108+
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.3.0")
98109
androidTestImplementation("androidx.test:core:1.4.0")
99110
androidTestImplementation("androidx.test:core-ktx:1.4.0")
100111
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")

0 commit comments

Comments
 (0)