feat: update AGP to 7.3.0 and reorder dependencies (#120)

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

@@ -41,34 +41,27 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
+    namespace = "com.mparticle.example.higgsshopsampleapp"
 }
 
 dependencies {
-
-    // Compose
-    val composeVersion = "1.2.1"
-    implementation("androidx.compose.runtime:runtime:$composeVersion")
-    implementation("androidx.compose.ui:ui:$composeVersion")
-    implementation("androidx.compose.material:material:$composeVersion")
-    implementation("androidx.compose.ui:ui-tooling:$composeVersion")
-    implementation("androidx.compose.runtime:runtime-livedata:$composeVersion")
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeVersion")
-
     implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("androidx.fragment:fragment:1.3.6")
-    implementation("androidx.fragment:fragment-ktx:1.3.6")
+    implementation("androidx.compose.runtime:runtime:1.2.1")
+    implementation("androidx.compose.ui:ui:1.2.1")
+    implementation("androidx.compose.material:material:1.2.1")
+    implementation("androidx.compose.ui:ui-tooling:1.2.1")
+    implementation("androidx.compose.runtime:runtime-livedata:1.2.1")
     implementation("androidx.constraintlayout:constraintlayout:2.1.3")
     implementation("androidx.core:core-ktx:1.7.0")
+    implementation("androidx.fragment:fragment:1.3.6")
+    implementation("androidx.fragment:fragment-ktx:1.3.6")
     implementation("androidx.recyclerview:recyclerview:1.2.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1")
-    implementation("com.google.android.material:material:1.5.0")
-    implementation("com.mparticle:android-core:5.45.0")
-
-    implementation("androidx.navigation:navigation-fragment:2.3.5")
-    implementation("androidx.navigation:navigation-ui:2.3.5")
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.3.1")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.4.0")
     implementation("androidx.navigation:navigation-fragment-ktx:2.3.5")
     implementation("androidx.navigation:navigation-ui-ktx:2.3.5")
+    implementation("com.google.android.material:material:1.5.0")
+    implementation("com.mparticle:android-core:5.45.1")
 
     implementation("com.github.bumptech.glide:glide:4.13.2")
 
@@ -85,9 +78,7 @@ dependencies {
     implementation("com.squareup.okhttp3:logging-interceptor:4.10.0")
     implementation("com.squareup.okhttp3:okhttp:4.10.0")
     implementation("com.squareup.okhttp3:logging-interceptor:4.10.0")
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.3.1")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.3.5")
-    implementation("androidx.navigation:navigation-ui-ktx:2.3.5")
+
     debugImplementation("androidx.compose.ui:ui-tooling:1.1.1")
 
     val roomVersion = "2.4.3"
@@ -101,8 +92,9 @@ dependencies {
     // implementation("androidx.room:room-guava:$roomVersion")
     // implementation("androidx.room:room-paging:2.4.1")
     testImplementation("androidx.room:room-testing:$roomVersion")
-
     testImplementation("junit:junit:4.13.2")
+
+    androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.2.1")
     androidTestImplementation("androidx.test:core:1.4.0")
     androidTestImplementation("androidx.test:core-ktx:1.4.0")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
@@ -111,9 +103,10 @@ dependencies {
     androidTestImplementation("androidx.test.ext:junit:1.1.3")
     androidTestImplementation("androidx.test.ext:junit-ktx:1.1.3")
     androidTestImplementation("androidx.test.ext:truth:1.4.0")
-    androidTestImplementation("com.google.truth:truth:1.1.3")
     androidTestImplementation("androidx.test:runner:1.4.0")
+    androidTestImplementation("com.google.truth:truth:1.1.3")
     androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
+
     androidTestUtil("androidx.test:orchestrator:1.4.1")
 }
 

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mparticle.example.higgsshopsampleapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>

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

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.2.2")
+        classpath("com.android.tools.build:gradle:7.3.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
     }
 }