Skip to content
This repository was archived by the owner on Aug 2, 2024. It is now read-only.

Commit d7df7cb

Browse files
authored
Remove appcompat (#916)
Change-Id: I467d58d5f9e878291f1aa2d66bee6c656d9d1dc0
1 parent 73b03a8 commit d7df7cb

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

app/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ androidComponents {
112112
dependencies {
113113
kapt(libs.androidx.room.compiler)
114114
kapt(libs.hilt.android.compiler)
115-
implementation(libs.androidx.appcompat)
116115
implementation(libs.androidx.constraintlayout)
117116
implementation(libs.androidx.core.ktx)
118117
implementation(libs.androidx.lifecycle.livedata.ktx)

app/proguard-rules.pro

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,14 @@
6363
-keep class com.google.gson.examples.android.model.** { *; }
6464
##---------------End: proguard configuration for Gson ----------
6565

66-
66+
##---------------Begin: proguard configuration for OkHttp ----------
67+
# Don't warn on unused classes.
68+
# See: https://github.com/square/okhttp/issues/6258
69+
-dontwarn org.bouncycastle.jsse.BCSSLSocket
70+
-dontwarn org.bouncycastle.jsse.BCSSLParameters
71+
-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
72+
-dontwarn org.conscrypt.*
73+
-dontwarn org.openjsse.javax.net.ssl.SSLParameters
74+
-dontwarn org.openjsse.javax.net.ssl.SSLSocket
75+
-dontwarn org.openjsse.net.ssl.OpenJSSE
76+
##---------------End: proguard configuration for OkHttp ----------

app/src/androidTest/java/com/google/samples/apps/sunflower/utilities/TestUtils.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616

1717
package com.google.samples.apps.sunflower.utilities
1818

19-
import android.app.Activity
2019
import android.content.Intent
21-
import androidx.appcompat.widget.Toolbar
2220
import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
2321
import androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra
2422
import com.google.samples.apps.sunflower.data.GardenPlanting
@@ -58,12 +56,6 @@ val testGardenPlanting = GardenPlanting(testPlant.plantId, testCalendar, testCal
5856
*/
5957
val testPlantAndGardenPlanting = PlantAndGardenPlantings(testPlant, listOf(testGardenPlanting))
6058

61-
/**
62-
* Returns the content description for the navigation button view in the toolbar.
63-
*/
64-
fun getToolbarNavigationContentDescription(activity: Activity, toolbarId: Int) =
65-
activity.findViewById<Toolbar>(toolbarId).navigationContentDescription as String
66-
6759
/**
6860
* Simplify testing Intents with Chooser
6961
*
@@ -72,4 +64,4 @@ fun getToolbarNavigationContentDescription(activity: Activity, toolbarId: Int) =
7264
fun chooser(matcher: Matcher<Intent>): Matcher<Intent> = allOf(
7365
hasAction(Intent.ACTION_CHOOSER),
7466
hasExtra(`is`(Intent.EXTRA_INTENT), matcher)
75-
)
67+
)

gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
accessibilityTestFramework = "4.0.0"
1818
activityCompose = "1.7.2"
1919
androidGradlePlugin = "8.0.2"
20-
appcompat = "1.6.1"
2120
benchmark = "1.1.0"
2221
# @keep
2322
compileSdk = "33"
@@ -67,7 +66,6 @@ systemuicontroller = "0.30.1"
6766
accessibility-test-framework = { module = "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework", version.ref = "accessibilityTestFramework" }
6867
android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
6968
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
70-
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
7169
androidx-arch-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "coreTesting" }
7270
androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "benchmark" }
7371
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }

0 commit comments

Comments
 (0)