Skip to content

Commit 115313e

Browse files
authored
feat: Updated Advertising ID permissions on manifest, updated settings.gradle.kts, and build.gradle.kts to latest dependencies and SDK 33 (#115)
1 parent 8428d5d commit 115313e

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ import java.util.TimeZone
44

55
plugins {
66
id("com.android.application")
7-
id("org.jlleitschuh.gradle.ktlint") version "10.2.1"
7+
id("org.jlleitschuh.gradle.ktlint") version "11.0.0"
88
kotlin("android")
99
kotlin("kapt")
1010
}
1111

1212
android {
13-
compileSdk = 31
13+
compileSdk = 33
1414
defaultConfig {
1515
applicationId = "com.mparticle.example.higgsshopsampleapp"
1616
minSdk = 23
17-
targetSdk = 31
17+
targetSdk = 33
1818
versionCode = buildVersionCode()
1919
versionName = "0.11.5-SNAPSHOT"
2020
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -49,29 +49,29 @@ dependencies {
4949
implementation("androidx.recyclerview:recyclerview:1.2.1")
5050
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1")
5151
implementation("com.google.android.material:material:1.5.0")
52-
implementation("com.mparticle:android-core:5.35.3")
52+
implementation("com.mparticle:android-core:5.44.2")
5353

5454
implementation("androidx.navigation:navigation-fragment:2.3.5")
5555
implementation("androidx.navigation:navigation-ui:2.3.5")
5656
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.3.1")
5757
implementation("androidx.navigation:navigation-fragment-ktx:2.3.5")
5858
implementation("androidx.navigation:navigation-ui-ktx:2.3.5")
5959

60-
implementation("com.github.bumptech.glide:glide:4.11.0")
60+
implementation("com.github.bumptech.glide:glide:4.13.2")
6161

62-
api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.3.7")
63-
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
64-
api("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1")
62+
api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4")
63+
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
64+
api("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
6565

6666
implementation("com.squareup.retrofit2:retrofit:2.6.1")
6767
implementation("com.squareup.retrofit2:converter-gson:2.6.1")
6868
implementation("com.squareup.retrofit2:converter-moshi:2.6.1")
6969
implementation("com.squareup.retrofit2:adapter-rxjava2:2.6.1")
7070
implementation("io.reactivex.rxjava2:rxjava:2.1.14")
7171
implementation("io.reactivex.rxjava2:rxandroid:2.0.2")
72-
implementation("com.squareup.okhttp3:logging-interceptor:3.12.12")
73-
implementation("com.squareup.okhttp3:okhttp:3.12.12")
74-
implementation("com.squareup.okhttp3:logging-interceptor:3.12.12")
72+
implementation("com.squareup.okhttp3:logging-interceptor:4.10.0")
73+
implementation("com.squareup.okhttp3:okhttp:4.10.0")
74+
implementation("com.squareup.okhttp3:logging-interceptor:4.10.0")
7575
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.3.1")
7676
implementation("androidx.navigation:navigation-fragment-ktx:2.3.5")
7777
implementation("androidx.navigation:navigation-ui-ktx:2.3.5")
@@ -99,7 +99,7 @@ dependencies {
9999
androidTestImplementation("androidx.test.ext:truth:1.4.0")
100100
androidTestImplementation("com.google.truth:truth:1.1.3")
101101
androidTestImplementation("androidx.test:runner:1.4.0")
102-
androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0")
102+
androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
103103
androidTestUtil("androidx.test:orchestrator:1.4.1")
104104
}
105105

core-sdk-samples/higgs-shop-sample-app/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package="com.mparticle.example.higgsshopsampleapp">
44

55
<uses-permission android:name="android.permission.INTERNET"/>
6+
<uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
67

78
<application
89
android:name=".HiggsShopSampleApplication"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
mavenCentral()
66
}
77
dependencies {
8-
classpath("com.android.tools.build:gradle:7.2.1")
8+
classpath("com.android.tools.build:gradle:7.2.2")
99
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
1010
}
1111
}

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencyResolutionManagement {
2-
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
2+
repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
33
repositories {
44
google()
55
mavenCentral()

0 commit comments

Comments
 (0)