diff --git a/app/build.gradle b/app/build.gradle index 90815a224..2c08279d9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -90,6 +90,10 @@ android { versionCode defaultConfig.versionCode + braveVersionCode versionName "${defaultConfig.versionName}-${braveVersionName}" android.sourceSets.braveConscrypt.res.srcDirs = android.sourceSets.brave.res.srcDirs + + dependencies { + implementation 'org.conscrypt:conscrypt-android:2.5.2' + } } } @@ -316,9 +320,6 @@ dependencies { // Date and time formatting implementation "org.ocpsoft.prettytime:prettytime:5.0.6.Final" - // conscrypt libraries - braveConscryptImplementation 'org.conscrypt:conscrypt-android:2.4.0' - /** Debugging **/ // Memory leak detection debugImplementation "com.squareup.leakcanary:leakcanary-object-watcher-android:${leakCanaryVersion}" diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index d21f33e1f..9648430e6 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -35,3 +35,7 @@ ## For some reason NotificationModeConfigFragment wasn't kept (only referenced in a preference xml) -keep class org.schabi.newpipe.settings.notifications.** { *; } + +# conscrypt rules (where not needed on 2.4.0) +-dontwarn com.android.org.conscrypt.SSLParametersImpl +-dontwarn org.apache.harmony.xnet.provider.jsse.SSLParametersImpl