Skip to content

Commit

Permalink
update versions
Browse files Browse the repository at this point in the history
  • Loading branch information
wuan committed Mar 5, 2017
1 parent 437c674 commit 7d7f59e
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 24 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
/app/build
/app/*.apk
/.gradle
/local.properties
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ android:
- tools

# The BuildTools version used by your project
- build-tools-23.0.2
- build-tools-25.0.2

# The SDK version used to compile your project
- android-23
- android-24

# Additional components
- extra-google-m2repository
- extra-android-m2repository
- addon-google_apis-google-23
- addon-google_apis-google-24

# Specify at least one system image,
# if you need to run emulator(s) during your tests
Expand Down
31 changes: 15 additions & 16 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = "1.0.3"
ext.kotlin_version = "1.1.0"
repositories {
mavenCentral()
}
Expand All @@ -15,14 +15,14 @@ apply plugin: 'net.saliman.cobertura'
apply plugin: 'com.github.kt3k.coveralls'

android {
buildToolsVersion "23.0.2"
buildToolsVersion '25.0.2'
defaultConfig {
compileSdkVersion "Google Inc.:Google APIs:23"
compileSdkVersion "Google Inc.:Google APIs:24"
applicationId "org.blitzortung.android.app"
minSdkVersion 8
targetSdkVersion 23
versionCode 187
versionName "1.5.16"
minSdkVersion 9
targetSdkVersion 25
versionCode 188
versionName "1.5.17"
multiDexEnabled true
}
buildTypes {
Expand All @@ -31,9 +31,6 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
dexOptions {
incremental true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
Expand All @@ -49,16 +46,18 @@ cobertura {
coverageSourceDirs = android.sourceSets.main.java.srcDirs
}

def anko_version = '0.9.1'

dependencies {
compile 'com.android.support:appcompat-v7:24.0.0'
compile 'com.android.support:appcompat-v7:25.2.0'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile 'org.jetbrains.anko:anko-sdk23:0.9' // sdk19, sdk21, sdk23 are also available
compile 'org.jetbrains.anko:anko-appcompat-v7:0.9' // For appcompat-v7 bindings
compile "org.jetbrains.anko:anko-sdk23:$anko_version" // sdk19, sdk21, sdk23 are also available
compile "org.jetbrains.anko:anko-appcompat-v7:$anko_version" // For appcompat-v7 bindings
testCompile 'junit:junit:4.12'
testCompile 'net.wuerl.kotlin:assertj-core-kotlin:0.1.1'
testCompile 'com.nhaarman:mockito-kotlin:0.5.0'
testCompile 'net.wuerl.kotlin:assertj-core-kotlin:0.2.0'
testCompile 'com.nhaarman:mockito-kotlin:1.3.0'
testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
testCompile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
testCompile 'org.robolectric:robolectric:3.1'
testCompile 'org.robolectric:robolectric:3.3'
}

Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class VersionComponentTest {
}

companion object {
val CURRENT_VERSION_CODE = 187
val CURRENT_VERSION_NAME = "1.5.16"
val CURRENT_VERSION_CODE = 188
val CURRENT_VERSION_NAME = "1.5.17"
}
}
6 changes: 5 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'
classpath 'net.saliman:gradle-cobertura-plugin:2.3.1'

Expand All @@ -19,3 +19,7 @@ allprojects {
jcenter()
}
}

task clean(type: Delete) {
delete rootProject.buildDir
}
1 change: 1 addition & 0 deletions gradle/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.gradle.jvmargs=-Xmx1536M
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Aug 29 23:33:59 CEST 2016
#Sun Mar 05 21:20:31 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip

0 comments on commit 7d7f59e

Please sign in to comment.