diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2e593b2449..a37a7a91c7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -28,7 +28,7 @@ protobufGradlePlugin = "0.10.0" android = { module = "com.google.android:android", version.ref = "android" } androidMaterial = {module = "com.google.android.material:material", version = "1.14.0" } androidx-annotations = { module = "androidx.annotation:annotation", version = "1.10.0" } -androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" } +androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.8.0" } androidx-compose = { module = "androidx.activity:activity-compose", version = "1.13.0" } androidx-constraintLayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.2" } androidx-ktx = { module = "androidx.core:core-ktx", version = "1.19.0" } diff --git a/samples/android-app-kotlin-minsdk-sample/build.gradle.kts b/samples/android-app-kotlin-minsdk-sample/build.gradle.kts index 18fd0043b5..5067369cfa 100644 --- a/samples/android-app-kotlin-minsdk-sample/build.gradle.kts +++ b/samples/android-app-kotlin-minsdk-sample/build.gradle.kts @@ -10,7 +10,6 @@ wire { } dependencies { - implementation(libs.androidx.appcompat) implementation(libs.androidx.constraintLayout) implementation(libs.moshi) implementation(projects.wire) diff --git a/samples/android-app-kotlin-minsdk-sample/src/main/java/com/squareup/wire/android/app/kotlin/minsdk/MainActivity.kt b/samples/android-app-kotlin-minsdk-sample/src/main/java/com/squareup/wire/android/app/kotlin/minsdk/MainActivity.kt index 330ce02bcf..044638dabb 100644 --- a/samples/android-app-kotlin-minsdk-sample/src/main/java/com/squareup/wire/android/app/kotlin/minsdk/MainActivity.kt +++ b/samples/android-app-kotlin-minsdk-sample/src/main/java/com/squareup/wire/android/app/kotlin/minsdk/MainActivity.kt @@ -15,14 +15,14 @@ */ package com.squareup.wire.android.app.kotlin.minsdk +import android.app.Activity import android.os.Bundle import android.widget.TextView -import androidx.appcompat.app.AppCompatActivity import com.squareup.moshi.Moshi import com.squareup.moshi.adapter import com.squareup.wire.WireJsonAdapterFactory -class MainActivity : AppCompatActivity() { +class MainActivity : Activity() { @OptIn(ExperimentalStdlibApi::class) private val jsonAdapter = Moshi.Builder() diff --git a/samples/android-app-kotlin-minsdk-sample/src/main/res/values/styles.xml b/samples/android-app-kotlin-minsdk-sample/src/main/res/values/styles.xml index 93c34e59dc..06be9f77f3 100644 --- a/samples/android-app-kotlin-minsdk-sample/src/main/res/values/styles.xml +++ b/samples/android-app-kotlin-minsdk-sample/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ -