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

Commit

Permalink
Remove appcompat (#916)
Browse files Browse the repository at this point in the history
Change-Id: I467d58d5f9e878291f1aa2d66bee6c656d9d1dc0
  • Loading branch information
arriolac authored Sep 14, 2023
1 parent 73b03a8 commit d7df7cb
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
1 change: 0 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ androidComponents {
dependencies {
kapt(libs.androidx.room.compiler)
kapt(libs.hilt.android.compiler)
implementation(libs.androidx.appcompat)
implementation(libs.androidx.constraintlayout)
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.livedata.ktx)
Expand Down
12 changes: 11 additions & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,14 @@
-keep class com.google.gson.examples.android.model.** { *; }
##---------------End: proguard configuration for Gson ----------


##---------------Begin: proguard configuration for OkHttp ----------
# Don't warn on unused classes.
# See: https://github.com/square/okhttp/issues/6258
-dontwarn org.bouncycastle.jsse.BCSSLSocket
-dontwarn org.bouncycastle.jsse.BCSSLParameters
-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
-dontwarn org.conscrypt.*
-dontwarn org.openjsse.javax.net.ssl.SSLParameters
-dontwarn org.openjsse.javax.net.ssl.SSLSocket
-dontwarn org.openjsse.net.ssl.OpenJSSE
##---------------End: proguard configuration for OkHttp ----------
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@

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

import android.app.Activity
import android.content.Intent
import androidx.appcompat.widget.Toolbar
import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
import androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra
import com.google.samples.apps.sunflower.data.GardenPlanting
Expand Down Expand Up @@ -58,12 +56,6 @@ val testGardenPlanting = GardenPlanting(testPlant.plantId, testCalendar, testCal
*/
val testPlantAndGardenPlanting = PlantAndGardenPlantings(testPlant, listOf(testGardenPlanting))

/**
* Returns the content description for the navigation button view in the toolbar.
*/
fun getToolbarNavigationContentDescription(activity: Activity, toolbarId: Int) =
activity.findViewById<Toolbar>(toolbarId).navigationContentDescription as String

/**
* Simplify testing Intents with Chooser
*
Expand All @@ -72,4 +64,4 @@ fun getToolbarNavigationContentDescription(activity: Activity, toolbarId: Int) =
fun chooser(matcher: Matcher<Intent>): Matcher<Intent> = allOf(
hasAction(Intent.ACTION_CHOOSER),
hasExtra(`is`(Intent.EXTRA_INTENT), matcher)
)
)
2 changes: 0 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
accessibilityTestFramework = "4.0.0"
activityCompose = "1.7.2"
androidGradlePlugin = "8.0.2"
appcompat = "1.6.1"
benchmark = "1.1.0"
# @keep
compileSdk = "33"
Expand Down Expand Up @@ -67,7 +66,6 @@ systemuicontroller = "0.30.1"
accessibility-test-framework = { module = "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework", version.ref = "accessibilityTestFramework" }
android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
androidx-arch-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "coreTesting" }
androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "benchmark" }
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
Expand Down

0 comments on commit d7df7cb

Please sign in to comment.