Skip to content

Commit ba9d10b

Browse files
authored
feat: update AGP to 7.3.0 and reorder dependencies (#120)
1 parent 290915e commit ba9d10b

File tree

3 files changed

+19
-27
lines changed

3 files changed

+19
-27
lines changed

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

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -41,34 +41,27 @@ android {
4141
sourceCompatibility = JavaVersion.VERSION_11
4242
targetCompatibility = JavaVersion.VERSION_11
4343
}
44+
namespace = "com.mparticle.example.higgsshopsampleapp"
4445
}
4546

4647
dependencies {
47-
48-
// Compose
49-
val composeVersion = "1.2.1"
50-
implementation("androidx.compose.runtime:runtime:$composeVersion")
51-
implementation("androidx.compose.ui:ui:$composeVersion")
52-
implementation("androidx.compose.material:material:$composeVersion")
53-
implementation("androidx.compose.ui:ui-tooling:$composeVersion")
54-
implementation("androidx.compose.runtime:runtime-livedata:$composeVersion")
55-
androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeVersion")
56-
5748
implementation("androidx.appcompat:appcompat:1.4.1")
58-
implementation("androidx.fragment:fragment:1.3.6")
59-
implementation("androidx.fragment:fragment-ktx:1.3.6")
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")
6054
implementation("androidx.constraintlayout:constraintlayout:2.1.3")
6155
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")
6258
implementation("androidx.recyclerview:recyclerview:1.2.1")
63-
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1")
64-
implementation("com.google.android.material:material:1.5.0")
65-
implementation("com.mparticle:android-core:5.45.0")
66-
67-
implementation("androidx.navigation:navigation-fragment:2.3.5")
68-
implementation("androidx.navigation:navigation-ui:2.3.5")
69-
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.3.1")
59+
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0")
60+
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.4.0")
7061
implementation("androidx.navigation:navigation-fragment-ktx:2.3.5")
7162
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")
7265

7366
implementation("com.github.bumptech.glide:glide:4.13.2")
7467

@@ -85,9 +78,7 @@ dependencies {
8578
implementation("com.squareup.okhttp3:logging-interceptor:4.10.0")
8679
implementation("com.squareup.okhttp3:okhttp:4.10.0")
8780
implementation("com.squareup.okhttp3:logging-interceptor:4.10.0")
88-
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.3.1")
89-
implementation("androidx.navigation:navigation-fragment-ktx:2.3.5")
90-
implementation("androidx.navigation:navigation-ui-ktx:2.3.5")
81+
9182
debugImplementation("androidx.compose.ui:ui-tooling:1.1.1")
9283

9384
val roomVersion = "2.4.3"
@@ -101,8 +92,9 @@ dependencies {
10192
// implementation("androidx.room:room-guava:$roomVersion")
10293
// implementation("androidx.room:room-paging:2.4.1")
10394
testImplementation("androidx.room:room-testing:$roomVersion")
104-
10595
testImplementation("junit:junit:4.13.2")
96+
97+
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.2.1")
10698
androidTestImplementation("androidx.test:core:1.4.0")
10799
androidTestImplementation("androidx.test:core-ktx:1.4.0")
108100
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
@@ -111,9 +103,10 @@ dependencies {
111103
androidTestImplementation("androidx.test.ext:junit:1.1.3")
112104
androidTestImplementation("androidx.test.ext:junit-ktx:1.1.3")
113105
androidTestImplementation("androidx.test.ext:truth:1.4.0")
114-
androidTestImplementation("com.google.truth:truth:1.1.3")
115106
androidTestImplementation("androidx.test:runner:1.4.0")
107+
androidTestImplementation("com.google.truth:truth:1.1.3")
116108
androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
109+
117110
androidTestUtil("androidx.test:orchestrator:1.4.1")
118111
}
119112

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.mparticle.example.higgsshopsampleapp">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<uses-permission android:name="android.permission.INTERNET"/>
65
<uses-permission android:name="com.google.android.gms.permission.AD_ID"/>

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.2")
8+
classpath("com.android.tools.build:gradle:7.3.0")
99
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
1010
}
1111
}

0 commit comments

Comments
 (0)