Skip to content
This repository was archived by the owner on Jul 11, 2025. It is now read-only.

Commit 87ea932

Browse files
author
Rob Orgiu
committed
Update ActivityEmbedding to Kotlin 2.0
1 parent a62577d commit 87ea932

File tree

4 files changed

+14
-22
lines changed

4 files changed

+14
-22
lines changed

CanonicalLayouts/list-detail-activity-embedding/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ plugins {
1919
}
2020

2121
android {
22-
compileSdk 34
22+
compileSdk 35
2323

2424
defaultConfig {
2525
applicationId "com.example.activityembedding"
2626
minSdk 31
27-
targetSdk 34
27+
targetSdk 35
2828
versionCode 1
2929
versionName "1.0"
3030

@@ -73,5 +73,5 @@ dependencies {
7373
androidTestImplementation 'androidx.test.espresso:espresso-device:1.0.1'
7474
androidTestImplementation("androidx.test.ext:junit-ktx:1.2.1")
7575
androidTestImplementation("androidx.test.ext:truth:1.6.0")
76-
androidTestImplementation("androidx.test:runner:1.6.1")
76+
androidTestImplementation("androidx.test:runner:1.6.2")
7777
}
Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="utf-8"?><!--
32
Copyright 2022 The Android Open Source Project
43
54
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,28 +14,26 @@
1514
limitations under the License.
1615
-->
1716
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
18-
xmlns:tools="http://schemas.android.com/tools"
1917
xmlns:app="http://schemas.android.com/apk/res-auto"
18+
xmlns:tools="http://schemas.android.com/tools"
2019
android:id="@+id/cardView"
21-
android:layout_height="wrap_content"
2220
android:layout_width="match_parent"
23-
app:cardCornerRadius="12dp"
21+
android:layout_height="wrap_content"
2422
android:layout_margin="4dp"
25-
app:cardPreventCornerOverlap="true"
2623
android:clickable="true"
2724
app:cardBackgroundColor="@color/design_default_color_surface"
28-
>
25+
app:cardCornerRadius="12dp"
26+
app:cardPreventCornerOverlap="true">
2927

3028
<TextView
3129
android:id="@+id/textView"
32-
android:layout_margin="8dp"
3330
android:layout_width="match_parent"
3431
android:layout_height="wrap_content"
35-
android:text="TextView"
32+
android:layout_margin="8dp"
3633
android:background="?selectableItemBackground"
3734
android:textAppearance="@style/TextAppearance.AppCompat.Button"
38-
39-
>
35+
android:textColor="@color/design_default_color_primary"
36+
tools:text="TextView">
4037

4138
</TextView>
4239
</androidx.cardview.widget.CardView>

CanonicalLayouts/list-detail-activity-embedding/build.gradle

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515
*/
1616
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1717
plugins {
18-
id 'com.android.application' version '8.5.0' apply false
19-
id 'com.android.library' version '8.5.0' apply false
20-
id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
21-
}
22-
23-
task clean(type: Delete) {
24-
delete rootProject.buildDir
18+
id 'com.android.application' version '8.6.0' apply false
19+
id 'com.android.library' version '8.6.0' apply false
20+
id 'org.jetbrains.kotlin.android' version '2.0.0' apply false
2521
}

CanonicalLayouts/list-detail-activity-embedding/gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,4 @@ kotlin.code.style=official
2727
# resources declared in the library itself and none from the library's dependencies,
2828
# thereby reducing the size of the R class for that library
2929
android.nonTransitiveRClass=true
30-
android.defaults.buildfeatures.buildconfig=true
3130
android.nonFinalResIds=false

0 commit comments

Comments
 (0)