mirror of
https://github.com/MinimalBible/MinimalBible-Legacy
synced 2025-07-03 06:44:51 -04:00
Squashed commit of the following: (enable Rx)
commit4269988b7c
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Sat Jun 14 16:41:11 2014 -0400 Backport to Java 6... Android Studio automatically folds lambda-style, so it won't get too out of hand. commite945ef51a7
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Sat Jun 14 16:25:13 2014 -0400 Get the unit tests passing again Note: I need to write more. Lots more. commit04fe4d13b4
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Sat Jun 14 15:13:44 2014 -0400 Add lots of Lint fixes commitdda5c79299
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Sat Jun 14 15:04:17 2014 -0400 Fix books not being removed... commit93abe065a2
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Sat Jun 14 14:10:43 2014 -0400 Fix a NetworkOnMainThreadException commitba3c6ebe6c
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Sat Jun 14 14:08:50 2014 -0400 Some refactoring and Async fixes. commit3869cf0b9b
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Tue Jun 10 23:46:29 2014 -0400 Synchronization needs fixing, otherwise works. commit8d17b6db64
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Tue Jun 10 23:44:35 2014 -0400 Silly DownloadManager Injects are for classes that need them. commit7070c933d1
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Tue Jun 10 23:41:35 2014 -0400 Fix the dagger compile errors If you have an @Singleton with no @Injects inside it, you need to add an @Injects constructor for Dagger to validate. commit28dfec81d7
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Tue Jun 10 23:17:20 2014 -0400 [broken probably] Refactoring to Rx should be done... But having issues with compiling. Checking if Dagger and retrolambda play nice. commitfb0c5fdaaa
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Tue Jun 10 22:56:52 2014 -0400 [broken] BookListFragment to Rx commit6eb5f66dcc
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Tue Jun 10 22:49:47 2014 -0400 [broken] BookItemHolder to Rx commite356c8d1fc
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Tue Jun 10 22:40:46 2014 -0400 Revert "[broken] Remove the BookDownloadThread again" This reverts commit8f346f17e4
. commit287b8cb40d
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Tue Jun 10 22:39:06 2014 -0400 [broken] Add a note on the InstalledManager commit899b054c8b
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Tue Jun 10 22:37:53 2014 -0400 [broken] Slight semantic change to RefreshManager commit8f346f17e4
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Tue Jun 10 22:36:12 2014 -0400 [broken] Remove the BookDownloadThread again commit1a7364da86
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Tue Jun 10 22:35:40 2014 -0400 [broken] Convert BookDownloadManager to Rx commitca1ccd9942
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Tue Jun 10 22:04:53 2014 -0400 [broken] Convert RefreshManager to Rx commit5770e8dd74
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Tue Jun 10 19:32:23 2014 -0400 Add RxAndroid support, remove eventbus commit3f5909be08
Author: Bradlee Speice <bspeice.nc@gmail.com> Date: Tue Jun 10 19:30:45 2014 -0400 Add retrolambda support
This commit is contained in:
@ -1,12 +1,14 @@
|
||||
apply plugin: 'android'
|
||||
apply plugin: 'android-apt'
|
||||
//apply plugin: 'retrolambda'
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.2+'
|
||||
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.3'
|
||||
//classpath 'me.tatarka:gradle-retrolambda:1.3.2'
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,24 +19,18 @@ repositories {
|
||||
dependencies {
|
||||
compile project(path: ':jsword-minimalbible', configuration: 'buildJSword')
|
||||
compile project(':appcompat_v7')
|
||||
|
||||
apt 'com.squareup.dagger:dagger-compiler:1.2.0'
|
||||
compile 'com.squareup.dagger:dagger:1.2.0'
|
||||
|
||||
apt 'com.jakewharton:butterknife:5.0.1'
|
||||
compile 'com.jakewharton:butterknife:5.0.1'
|
||||
|
||||
compile 'de.devland.esperandro:esperandro-api:1.1.2'
|
||||
apt 'de.devland.esperandro:esperandro:1.1.2'
|
||||
|
||||
// compile 'com.f2prateek.dart:dart:1.1.0'
|
||||
|
||||
compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
|
||||
compile 'de.greenrobot:eventbus:2.2.0'
|
||||
|
||||
// compile 'de.greenrobot:eventbus:2.2.0'
|
||||
compile 'com.netflix.rxjava:rxjava-android:0.19.0'
|
||||
// Handled by appcompat
|
||||
// compile 'com.google.android:support-v4:r7'
|
||||
|
||||
// And our unit testing needs some specific stuff (and specific stuff included again)
|
||||
androidTestCompile 'junit:junit:4.11+'
|
||||
androidTestCompile 'com.jayway.awaitility:awaitility:1.6.0'
|
||||
@ -43,8 +39,7 @@ dependencies {
|
||||
|
||||
android {
|
||||
compileSdkVersion 19
|
||||
buildToolsVersion "19.0.3"
|
||||
|
||||
buildToolsVersion '19.1.0'
|
||||
sourceSets {
|
||||
main {
|
||||
manifest.srcFile 'AndroidManifest.xml'
|
||||
@ -68,7 +63,6 @@ android {
|
||||
debug.setRoot('build-types/debug')
|
||||
release.setRoot('build-types/release')
|
||||
}
|
||||
|
||||
packagingOptions {
|
||||
exclude 'META-INF/LICENSE.txt'
|
||||
exclude 'LICENSE.txt'
|
||||
@ -78,8 +72,20 @@ android {
|
||||
exclude 'META-INF/NOTICE'
|
||||
exclude 'META-INF/services/javax.annotation.processing.Processor'
|
||||
}
|
||||
|
||||
lintOptions {
|
||||
abortOnError false
|
||||
}
|
||||
|
||||
/*
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
*/
|
||||
|
||||
defaultConfig {}
|
||||
productFlavors {
|
||||
}
|
||||
buildTypes {
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user