mirror-github-minimalbible/MinimalBible
1
0
Fork 0
mirror of https://github.com/MinimalBible/MinimalBible synced 2024-11-21 15:38:35 -05:00
Code Issues Releases Wiki Activity

Update to version 1.0 of Android Studio

Browse Source
This commit is contained in:
Bradlee Speice 2014-12-14 17:23:40 -05:00
parent c5e7fe8f41
commit 6e0e8e44d7
4 changed files with 5 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app-test/build.gradle
View File

@ -43,7 +43,7 @@ dependencies {
compile androidModule compile androidModule
testCompile 'junit:junit:4.+' testCompile 'junit:junit:4.+'
testCompile 'org.robolectric:robolectric:+' testCompile 'org.robolectric:robolectric:2.+'
testCompile 'org.mockito:mockito-core:+' testCompile 'org.mockito:mockito-core:+'
testCompile 'com.jayway.awaitility:awaitility:+' testCompile 'com.jayway.awaitility:awaitility:+'
testCompile 'org.jetbrains.spek:spek:+' testCompile 'org.jetbrains.spek:spek:+'

54
app/src/debug/java/org/bspeice/minimalbible/TestModules.java
View File

@ -1,54 +0,0 @@
package org.bspeice.minimalbible;
import org.bspeice.minimalbible.activity.downloader.DownloadActivity;
import org.bspeice.minimalbible.service.manager.BookManager;
import org.crosswire.jsword.book.BookCategory;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Named;
import javax.inject.Singleton;
import dagger.Module;
import dagger.Provides;
/**
* Created by Bradlee Speice on 7/5/2014.
*/
@Module(injects = DownloadActivity.class,
overrides = true,
library = true)
public class TestModules {
public static CharSequence testActivityTitle = "Test";
private BookManager bookManager;
@Provides
CharSequence provideString() {
return testActivityTitle;
}
@Provides
@Singleton
@Named("ValidCategories")
List<BookCategory> provideValidCategories() {
return new ArrayList<BookCategory>() {{
add(BookCategory.BIBLE);
add(BookCategory.COMMENTARY);
add(BookCategory.DICTIONARY);
add(BookCategory.MAPS);
}};
}
public void setBookManager(BookManager bookManager) {
this.bookManager = bookManager;
}
@Provides
@Singleton
BookManager provideBookManager() {
return bookManager;
}
}

4
build.gradle
View File

@ -1,13 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '0.9.206' ext.kotlin_version = '0.9.976'
repositories { repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.14.2' classpath 'com.android.tools.build:gradle:1.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Fri Dec 05 22:45:09 EST 2014 #Sun Dec 14 17:15:20 EST 2014
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-2.2-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip