Base updates for AGP

Author: jamesnrokt

.gitignore

@@ -23,3 +23,5 @@ hs_err_pid*
 
 .idea
 .gradle
+
+local.properties

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

@@ -11,11 +11,12 @@ plugins {
 }
 
 android {
-    compileSdk = 33
+    namespace = "com.mparticle.example.higgsshopsampleapp"
+    compileSdk = 34
     defaultConfig {
         applicationId = "com.mparticle.example.higgsshopsampleapp"
         minSdk = 24
-        targetSdk = 33
+        targetSdk = 34
         versionCode = buildVersionCode()
         versionName = "0.14.1-SNAPSHOT"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -24,11 +25,12 @@ android {
         buildConfigField("String", "HIGGS_SHOP_FCM_SENDER_ID", "\"${System.getenv("HIGGS_SHOP_FCM_SENDER_ID")}\"")
     }
     buildFeatures {
+        buildConfig = true
         dataBinding = true
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.3.2"
+        kotlinCompilerExtensionVersion = "1.5.8"
     }
     kotlinOptions {
         jvmTarget = "11"
@@ -46,16 +48,15 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    namespace = "com.mparticle.example.higgsshopsampleapp"
 }
 
 dependencies {
     implementation("androidx.appcompat:appcompat:1.5.1")
-    implementation("androidx.compose.runtime:runtime:1.3.0")
-    implementation("androidx.compose.ui:ui:1.3.0")
-    implementation("androidx.compose.material:material:1.3.0")
-    implementation("androidx.compose.ui:ui-tooling:1.3.0")
-    implementation("androidx.compose.runtime:runtime-livedata:1.3.0")
+    implementation("androidx.compose.runtime:runtime:1.5.4")
+    implementation("androidx.compose.ui:ui:1.5.4")
+    implementation("androidx.compose.material:material:1.5.4")
+    implementation("androidx.compose.ui:ui-tooling:1.5.4")
+    implementation("androidx.compose.runtime:runtime-livedata:1.5.4")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.fragment:fragment:1.5.4")
@@ -77,9 +78,9 @@ dependencies {
 
     implementation("com.github.bumptech.glide:glide:4.14.2")
 
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4")
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.3")
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
 
     implementation("com.squareup.retrofit2:retrofit:2.9.0")
     implementation("com.squareup.retrofit2:converter-gson:2.9.0")
@@ -91,9 +92,9 @@ dependencies {
     implementation("com.squareup.okhttp3:okhttp:4.10.0")
     implementation("com.squareup.okhttp3:logging-interceptor:4.10.0")
 
-    debugImplementation("androidx.compose.ui:ui-tooling:1.3.0")
+    debugImplementation("androidx.compose.ui:ui-tooling:1.5.4")
 
-    val roomVersion = "2.4.3"
+    val roomVersion = "2.6.1"
     implementation("androidx.room:room-runtime:$roomVersion")
     // annotationProcessor("androidx.room:room-compiler:$roomVersion")
     kapt("androidx.room:room-compiler:$roomVersion")

core-sdk-samples/higgs-shop-sample-app/app/src/main/kotlin/com/mparticle/example/higgsshopsampleapp/activities/CheckoutActivity.kt

@@ -112,7 +112,7 @@ class CheckoutActivity : AppCompatActivity() {
         snackbar.setTextColor(getColor(R.color.black))
         snackbar.setActionTextColor(getColor(R.color.blue_4079FE))
         snackbar.view.setPadding(20, 10, 20, 0)
-        (snackbar.view.findViewById<TextView>(R.id.snackbar_text))?.textAlignment =
+        (snackbar.view.findViewById<TextView>(com.google.android.material.R.id.snackbar_text))?.textAlignment =
             View.TEXT_ALIGNMENT_TEXT_START
         val snackbarActionTextView =
             snackbar.view.findViewById<View>(com.google.android.material.R.id.snackbar_action) as TextView

core-sdk-samples/higgs-shop-sample-app/app/src/main/kotlin/com/mparticle/example/higgsshopsampleapp/activities/LandingActivity.kt

@@ -77,7 +77,7 @@ class LandingActivity : AppCompatActivity() {
         )
         val layoutParams = ActionBar.LayoutParams(snackbar.view.layoutParams)
 
-        val tv = (snackbar.view.findViewById<TextView>(R.id.snackbar_text))
+        val tv = (snackbar.view.findViewById<TextView>(com.google.android.material.R.id.snackbar_text))
         tv?.maxLines = 5
         tv?.textAlignment = View.TEXT_ALIGNMENT_TEXT_START
 

core-sdk-samples/higgs-shop-sample-app/app/src/main/kotlin/com/mparticle/example/higgsshopsampleapp/activities/ProductDetailActivity.kt

@@ -119,7 +119,7 @@ class ProductDetailActivity : AppCompatActivity() {
         snackbar.setBackgroundTint(getColor(R.color.white))
         snackbar.setTextColor(getColor(R.color.black))
         snackbar.view.setPadding(20, 10, 20, 0)
-        (snackbar.view.findViewById<TextView>(R.id.snackbar_text))?.textAlignment =
+        (snackbar.view.findViewById<TextView>(com.google.android.material.R.id.snackbar_text))?.textAlignment =
             View.TEXT_ALIGNMENT_TEXT_START
         snackbar.setActionTextColor(getColor(R.color.blue_4079FE))
         val snackbarActionTextView =

core-sdk-samples/higgs-shop-sample-app/app/src/main/kotlin/com/mparticle/example/higgsshopsampleapp/fragments/AccountFragment.kt

@@ -76,7 +76,7 @@ class AccountFragment : Fragment() {
         val snackbar = Snackbar.make(parentLayout, message, Snackbar.LENGTH_SHORT)
         val layoutParams = ActionBar.LayoutParams(snackbar.view.layoutParams)
 
-        val tv = (snackbar.view.findViewById<TextView>(R.id.snackbar_text))
+        val tv = (snackbar.view.findViewById<TextView>(com.google.android.material.R.id.snackbar_text))
         tv?.textAlignment = View.TEXT_ALIGNMENT_CENTER
 
         snackbar.setBackgroundTint(requireContext().getColor(R.color.white))

core-sdk-samples/higgs-shop-sample-app/app/src/main/kotlin/com/mparticle/example/higgsshopsampleapp/repositories/database/daos/CartDao.kt

@@ -7,16 +7,16 @@ import com.mparticle.example.higgsshopsampleapp.repositories.database.entities.C
 interface CartDao {
 
     @Query("SELECT * FROM CartItems ORDER BY sku desc")
-    fun getAllCartItems(): List<CartItemEntity>
+    suspend fun getAllCartItems(): List<CartItemEntity>
 
     @Query("SELECT * FROM CartItems WHERE sku=:sku ORDER BY sku desc")
-    fun getCartItemByKey(sku: String): CartItemEntity?
+    suspend fun getCartItemByKey(sku: String): CartItemEntity?
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun addToCart(CartItemEntity: CartItemEntity): Long
+    suspend fun addToCart(cartItem: CartItemEntity): Long
 
     @Delete
-    suspend fun removeFromCart(CartItemEntity: CartItemEntity): Int
+    suspend fun removeFromCart(cartItem: CartItemEntity): Int
 
     @Query("DELETE FROM CartItems")
     suspend fun clearCart(): Int

core-sdk-samples/higgs-shop-sample-app/app/src/main/kotlin/com/mparticle/example/higgsshopsampleapp/utils/ImageUtils.kt

@@ -15,7 +15,7 @@ import com.bumptech.glide.request.transition.Transition
 import com.mparticle.example.higgsshopsampleapp.R
 
 
-const val DEFAULT_PRODUCT_IMAGE = R.drawable.product_image_placeholder
+var DEFAULT_PRODUCT_IMAGE = R.drawable.product_image_placeholder
 
 @SuppressLint("UnrememberedMutableState")
 @Composable

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

@@ -6,8 +6,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.3.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
+        classpath("com.android.tools.build:gradle:8.6.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
         classpath("com.google.gms:google-services:4.3.14")
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sun Feb 13 22:21:18 PST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME