Skip to content

Commit

Permalink
Fix issues with release builds
Browse files Browse the repository at this point in the history
  • Loading branch information
moezbhatti committed Sep 10, 2019
1 parent 2380d29 commit 71f5b7d
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ buildscript {
ext.material_version = '1.0.0'
ext.mockito_version = '2.18.3'
ext.moshi_version = '1.6.0'
ext.okhttp3_version = '4.1.0'
ext.realm_version = '5.8.0'
ext.realm_adapters_version = '3.1.0'
ext.rxandroid_version = '2.0.1'
Expand All @@ -30,7 +31,6 @@ buildscript {
ext.rxkotlin_version = '2.1.0'
ext.rx_preferences_version = '2.0.0-RC3'
ext.timber_version = '4.5.1'
ext.okhttp3_version = '4.1.0'

ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2]

Expand Down
2 changes: 1 addition & 1 deletion common/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
~ You should have received a copy of the GNU General Public License
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
-->
<manifest package="com.moez.QKSMS" />
<manifest package="com.moez.QKSMS.common" />
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ class ChangelogManagerImpl @Inject constructor(

override fun getChangelog(): Single<ChangelogManager.Changelog> {
val url = "https://firestore.googleapis.com/v1/projects/qksms-app/databases/(default)/documents/changelog"
val httpUrl = url.toHttpUrlOrNull()
val request = httpUrl?.let { Request.Builder().url(it).build() }
val request = url.toHttpUrlOrNull()?.let { Request.Builder().url(it).build() }
val call = request?.let { OkHttpClient().newCall(it) }
val adapter = moshi.adapter(ChangelogResponse::class.java)

Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ org.gradle.jvmargs=-Xmx1536m
org.gradle.caching=true
android.useAndroidX=true
android.enableJetifier=true
android.enableR8=false

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down
14 changes: 13 additions & 1 deletion presentation/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,16 @@
-dontwarn org.python.core.**

# okio
-dontwarn okio.**
-dontwarn okio.**

# JSR 305 annotations are for embedding nullability information.
-dontwarn javax.annotation.**

# A resource is loaded with a relative path so the package of this class must be preserved.
-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase

# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
-dontwarn org.codehaus.mojo.animal_sniffer.*

# OkHttp platform used only on JVM and when Conscrypt dependency is available.
-dontwarn okhttp3.internal.platform.ConscryptPlatform

0 comments on commit 71f5b7d

Please sign in to comment.