From 87ea932fdbd28758749c1578c6fb2b56b023273f Mon Sep 17 00:00:00 2001
From: Rob Orgiu <robertoorgiu@google.com>
Date: Tue, 3 Sep 2024 16:33:40 +0200
Subject: [PATCH] Update ActivityEmbedding to Kotlin 2.0

---
 .../app/build.gradle                          |  6 +++---
 .../app/src/main/res/layout/list_item.xml     | 19 ++++++++-----------
 .../build.gradle                              | 10 +++-------
 .../gradle.properties                         |  1 -
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/CanonicalLayouts/list-detail-activity-embedding/app/build.gradle b/CanonicalLayouts/list-detail-activity-embedding/app/build.gradle
index d90d7df86..206adfdd4 100644
--- a/CanonicalLayouts/list-detail-activity-embedding/app/build.gradle
+++ b/CanonicalLayouts/list-detail-activity-embedding/app/build.gradle
@@ -19,12 +19,12 @@ plugins {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.example.activityembedding"
         minSdk 31
-        targetSdk 34
+        targetSdk 35
         versionCode 1
         versionName "1.0"
 
@@ -73,5 +73,5 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-device:1.0.1'
     androidTestImplementation("androidx.test.ext:junit-ktx:1.2.1")
     androidTestImplementation("androidx.test.ext:truth:1.6.0")
-    androidTestImplementation("androidx.test:runner:1.6.1")
+    androidTestImplementation("androidx.test:runner:1.6.2")
 }
diff --git a/CanonicalLayouts/list-detail-activity-embedding/app/src/main/res/layout/list_item.xml b/CanonicalLayouts/list-detail-activity-embedding/app/src/main/res/layout/list_item.xml
index d30ec45ec..4a98c336e 100644
--- a/CanonicalLayouts/list-detail-activity-embedding/app/src/main/res/layout/list_item.xml
+++ b/CanonicalLayouts/list-detail-activity-embedding/app/src/main/res/layout/list_item.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
  Copyright 2022 The Android Open Source Project
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,28 +14,26 @@
  limitations under the License.
 -->
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/cardView"
-    android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    app:cardCornerRadius="12dp"
+    android:layout_height="wrap_content"
     android:layout_margin="4dp"
-    app:cardPreventCornerOverlap="true"
     android:clickable="true"
     app:cardBackgroundColor="@color/design_default_color_surface"
-    >
+    app:cardCornerRadius="12dp"
+    app:cardPreventCornerOverlap="true">
 
     <TextView
         android:id="@+id/textView"
-        android:layout_margin="8dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="TextView"
+        android:layout_margin="8dp"
         android:background="?selectableItemBackground"
         android:textAppearance="@style/TextAppearance.AppCompat.Button"
-
-        >
+        android:textColor="@color/design_default_color_primary"
+        tools:text="TextView">
 
     </TextView>
 </androidx.cardview.widget.CardView>
diff --git a/CanonicalLayouts/list-detail-activity-embedding/build.gradle b/CanonicalLayouts/list-detail-activity-embedding/build.gradle
index de839cac4..6dd3c5170 100644
--- a/CanonicalLayouts/list-detail-activity-embedding/build.gradle
+++ b/CanonicalLayouts/list-detail-activity-embedding/build.gradle
@@ -15,11 +15,7 @@
  */
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.5.0' apply false
-    id 'com.android.library' version '8.5.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
+    id 'com.android.application' version '8.6.0' apply false
+    id 'com.android.library' version '8.6.0' apply false
+    id 'org.jetbrains.kotlin.android' version '2.0.0' apply false
 }
diff --git a/CanonicalLayouts/list-detail-activity-embedding/gradle.properties b/CanonicalLayouts/list-detail-activity-embedding/gradle.properties
index 95b3559e1..d6dbd9adb 100644
--- a/CanonicalLayouts/list-detail-activity-embedding/gradle.properties
+++ b/CanonicalLayouts/list-detail-activity-embedding/gradle.properties
@@ -27,5 +27,4 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false
\ No newline at end of file