mirror of
https://github.com/MinimalBible/MinimalBible
synced 2024-11-04 15:18:22 -05:00
Get everything set for API 21
This commit is contained in:
parent
3ed3d6c08b
commit
d94b8b45c7
@ -1,5 +1,9 @@
|
|||||||
# We still need android to get the build tools/support libraries
|
# We still need android to get the build tools/support libraries
|
||||||
language: android
|
language: android
|
||||||
|
android:
|
||||||
|
components:
|
||||||
|
- build-tools-21.1.1
|
||||||
|
# Don't have any other tools so far, robolectric covers pretty much everything...
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- ./gradlew test
|
- ./gradlew test
|
||||||
|
@ -8,21 +8,15 @@ apply plugin: 'com.android.application'
|
|||||||
apply plugin: 'kotlin-android'
|
apply plugin: 'kotlin-android'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 20
|
compileSdkVersion 21
|
||||||
buildToolsVersion '20.0.0'
|
buildToolsVersion '21.1.1'
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId 'org.bspeice.minimalbible'
|
applicationId 'org.bspeice.minimalbible'
|
||||||
minSdkVersion 8
|
minSdkVersion 8
|
||||||
targetSdkVersion 20
|
targetSdkVersion 21
|
||||||
versionCode 1
|
versionCode 1
|
||||||
versionName '1.0'
|
versionName '1.0'
|
||||||
}
|
}
|
||||||
buildTypes {
|
|
||||||
release {
|
|
||||||
runProguard false
|
|
||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
packagingOptions {
|
packagingOptions {
|
||||||
exclude 'META-INF/LICENSE.txt'
|
exclude 'META-INF/LICENSE.txt'
|
||||||
exclude 'META-INF/NOTICE.txt'
|
exclude 'META-INF/NOTICE.txt'
|
||||||
@ -53,7 +47,7 @@ dependencies {
|
|||||||
compile 'com.jakewharton:butterknife:+'
|
compile 'com.jakewharton:butterknife:+'
|
||||||
compile 'com.readystatesoftware.systembartint:systembartint:+'
|
compile 'com.readystatesoftware.systembartint:systembartint:+'
|
||||||
compile 'com.netflix.rxjava:rxjava-android:+'
|
compile 'com.netflix.rxjava:rxjava-android:+'
|
||||||
compile 'com.android.support:appcompat-v7:20.+'
|
compile 'com.android.support:appcompat-v7:21.+'
|
||||||
compile 'org.apache.commons:commons-lang3:+'
|
compile 'org.apache.commons:commons-lang3:+'
|
||||||
compile 'com.google.code.gson:gson:+'
|
compile 'com.google.code.gson:gson:+'
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
@ -7,7 +7,7 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:0.13.+'
|
classpath 'com.android.tools.build:gradle:0.14.2'
|
||||||
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
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
#Mon Nov 17 21:43:00 EST 2014
|
#Sun Nov 23 22:14:54 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=https\://services.gradle.org/distributions/gradle-2.1-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip
|
||||||
|
Loading…
Reference in New Issue
Block a user