Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
1 change: 0 additions & 1 deletion samples/android-app-kotlin-minsdk-sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ wire {
}

dependencies {
implementation(libs.androidx.appcompat)
implementation(libs.androidx.constraintLayout)
implementation(libs.moshi)
implementation(projects.wire)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<style name="AppTheme" parent="android:Theme.Material.Light.DarkActionBar">
<item name="android:colorPrimary">@color/colorPrimary</item>
<item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="android:colorAccent">@color/colorAccent</item>
</style>
</resources>
Loading