From 6e0e8e44d7a2d3ef9a86bb1a5cef4f86bee5ea52 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sun, 14 Dec 2014 17:23:40 -0500 Subject: [PATCH] Update to version 1.0 of Android Studio --- app-test/build.gradle | 2 +- .../org/bspeice/minimalbible/TestModules.java | 54 ------------------- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 4 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 app/src/debug/java/org/bspeice/minimalbible/TestModules.java diff --git a/app-test/build.gradle b/app-test/build.gradle index b7c587e..a0f3170 100644 --- a/app-test/build.gradle +++ b/app-test/build.gradle @@ -43,7 +43,7 @@ dependencies { compile androidModule testCompile 'junit:junit:4.+' - testCompile 'org.robolectric:robolectric:+' + testCompile 'org.robolectric:robolectric:2.+' testCompile 'org.mockito:mockito-core:+' testCompile 'com.jayway.awaitility:awaitility:+' testCompile 'org.jetbrains.spek:spek:+' diff --git a/app/src/debug/java/org/bspeice/minimalbible/TestModules.java b/app/src/debug/java/org/bspeice/minimalbible/TestModules.java deleted file mode 100644 index ed03d46..0000000 --- a/app/src/debug/java/org/bspeice/minimalbible/TestModules.java +++ /dev/null @@ -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 provideValidCategories() { - return new ArrayList() {{ - 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; - } -} diff --git a/build.gradle b/build.gradle index 4e512fd..c39dd83 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '0.9.206' + ext.kotlin_version = '0.9.976' repositories { mavenCentral() } 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" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0826c8e..8b07930 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Dec 05 22:45:09 EST 2014 +#Sun Dec 14 17:15:20 EST 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME 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