From 252700a15831813f171031708298ab1741aa14dd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Aug 2026 14:08:07 +0000 Subject: [PATCH 1/2] Update dependency androidx.appcompat:appcompat to v1.8.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" } From 26abdb7403adb5b2d84cc050b7083e1c0e8d4452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Quenaudon?= Date: Mon, 24 Aug 2026 07:59:34 +0100 Subject: [PATCH 2/2] Drop appcompat from the minSdk 21 sample MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit appcompat 1.8.0 raises its minimum SDK to 23. This sample exists to prove that Wire works with minSdk 21. The sample now uses the platform Activity and a platform theme instead of appcompat. The other Android samples use minSdk 28 and keep appcompat. Co-authored-by: Benoît Quenaudon Signed-off-by: Benoît Quenaudon --- samples/android-app-kotlin-minsdk-sample/build.gradle.kts | 1 - .../wire/android/app/kotlin/minsdk/MainActivity.kt | 4 ++-- .../src/main/res/values/styles.xml | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) 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 @@ -