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

Commit 65585b3

Browse files
committed
Revert "AGP 8.0.0-alpha11 (#220)"
This reverts commit 3368f46.
1 parent 7a69009 commit 65585b3

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

gradle.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
android.enableJetifier=true
2+
android.defaults.buildfeatures.aidl=false
3+
android.defaults.buildfeatures.buildconfig=false
4+
android.defaults.buildfeatures.renderscript=false
5+
android.defaults.buildfeatures.resvalues=false
6+
android.defaults.buildfeatures.shaders=false
27
android.injected.testOnly=false
38
android.useAndroidX=true
49
kotlin.code.style=official

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
versionName = "1.8.0"
33
versionCode = "108000"
44
accompanist = "0.28.0"
5-
agp = "8.0.0-alpha11"
5+
agp = "7.4.0"
66
androidX-activity = "1.6.1"
77
androidX-appCompat = "1.6.0"
88
androidX-collection = "1.2.0"

gradle/proguard-rules.pro

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,8 @@
6060
-dontwarn java.lang.instrument.ClassFileTransformer
6161
-dontwarn sun.misc.SignalHandler
6262

63-
# https://github.com/square/okhttp/blob/339732e3a1b78be5d792860109047f68a011b5eb/okhttp/src/jvmMain/resources/META-INF/proguard/okhttp3.pro#L11-L14
64-
-dontwarn okhttp3.internal.platform.**
65-
-dontwarn org.conscrypt.**
66-
-dontwarn org.bouncycastle.**
67-
-dontwarn org.openjsse.**
63+
# From OkHttp but gated appropriately
64+
-dontwarn org.conscrypt.ConscryptHostnameVerifier
6865

6966
# ZoneRulesProvider _does_ exist!
7067
-dontwarn java.time.zone.ZoneRulesProvider

0 commit comments

Comments
 (0)