From b2acceb8686ae0866605ca7002e821b3464c33bf Mon Sep 17 00:00:00 2001 From: Shinokuni Date: Thu, 2 Jan 2020 15:38:25 +0100 Subject: [PATCH] Configure readropsdb module and dependencies --- app/build.gradle | 4 ---- readropsdb/build.gradle | 21 +++++++++++++-------- readropslibrary/build.gradle | 4 ++-- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2aca1ef7..11e4e524 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -74,10 +74,6 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0' kapt 'androidx.lifecycle:lifecycle-common-java8:2.1.0' - implementation 'org.jsoup:jsoup:1.12.1' - - implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' - implementation 'com.afollestad.material-dialogs:core:0.9.6.0' implementation 'com.mikepenz:fastadapter:3.3.1' diff --git a/readropsdb/build.gradle b/readropsdb/build.gradle index 6ce4d283..8f6603f8 100644 --- a/readropsdb/build.gradle +++ b/readropsdb/build.gradle @@ -4,15 +4,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 29 - buildToolsVersion "29.0.2" - + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 - versionCode 1 - versionName "1.0" + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion javaCompileOptions { annotationProcessorOptions { @@ -28,11 +24,20 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } + + debug { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { diff --git a/readropslibrary/build.gradle b/readropslibrary/build.gradle index e5dfcd19..e340f141 100644 --- a/readropslibrary/build.gradle +++ b/readropslibrary/build.gradle @@ -48,8 +48,8 @@ dependencies { implementation 'com.squareup.okhttp3:logging-interceptor:4.2.0' - implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' - implementation 'org.jsoup:jsoup:1.12.1' + api 'io.reactivex.rxjava2:rxandroid:2.1.1' + api 'org.jsoup:jsoup:1.12.1' debugApi 'com.facebook.flipper:flipper:0.30.1' debugApi 'com.facebook.soloader:soloader:0.8.0'