Commit b32a8861 authored by Christophe Henry's avatar Christophe Henry Committed by Christophe Henry

Bump version name and version code before alpha 2 release

parent 5aff7fd9
......@@ -11,8 +11,8 @@ android {
applicationId "fr.chenry.android.freshrss"
minSdkVersion 21
targetSdkVersion 28
versionCode 1
versionName "0.0.1"
versionCode 2
versionName "0.0.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
......@@ -25,6 +25,10 @@ android {
enabled = true
}
configurations.all {
resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
}
applicationVariants.all { variant ->
if (variant.name.contains("elease")) {
variant.mergeAssetsProvider.get().doLast {
......@@ -40,7 +44,7 @@ android {
dependencies {
def lifecycle_version = "2.0.0"
def room_version = "2.1.0-alpha03"
def room_version = "2.1.0-alpha04"
def fuel_version = "1.16.0"
def espresso_version = "3.1.1"
def test_runnner_version = "1.1.1"
......@@ -82,8 +86,8 @@ dependencies {
testImplementation "androidx.arch.core:core-testing:$lifecycle_version"
// Room
implementation "androidx.room:room-runtime:$room_version"
kapt "androidx.room:room-compiler:$room_version"
implementation "androidx.room:room-runtime:$room_version"
implementation "androidx.room:room-rxjava2:$room_version"
implementation "androidx.room:room-guava:$room_version"
implementation "androidx.room:room-coroutines:$room_version"
......@@ -107,8 +111,10 @@ dependencies {
// Tests
testImplementation "junit:junit:4.12"
androidTestImplementation "androidx.test:runner:$test_runnner_version"
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
androidTestImplementation("androidx.test.espresso:espresso-core:$espresso_version") {
exclude group: "com.google.code.findbugs"
}
// Debug
implementation "com.facebook.stetho:stetho:1.5.0"
// implementation "com.facebook.stetho:stetho:1.5.0"
}
......@@ -6,8 +6,6 @@ import android.os.Handler
import android.os.IBinder
import androidx.core.app.NotificationManagerCompat
import androidx.core.os.postDelayed
import androidx.lifecycle.Observer
import com.facebook.stetho.Stetho
import fr.chenry.android.freshrss.RefresherService.RefresherBinder
import fr.chenry.android.freshrss.store.Store
import fr.chenry.android.freshrss.utils.Try
......@@ -15,7 +13,7 @@ import fr.chenry.android.freshrss.utils.whenNotNull
import nl.komponents.kovenant.android.startKovenant
import nl.komponents.kovenant.android.stopKovenant
import nl.komponents.kovenant.deferred
import java.util.Properties
import java.util.*
class FreshRSSApplication: Application() {
private val refreshDelay: Long get() = 30
......@@ -39,7 +37,7 @@ class FreshRSSApplication: Application() {
properties.getProperty("debug", "false")!!.toBoolean()
}.getOrDefault(false)
if(Store.debugMode) Stetho.initializeWithDefaults(this)
//if(Store.debugMode) Stetho.initializeWithDefaults(this)
}
override fun onTerminate() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment