Skip to content

Commit

Permalink
Android update plugin/build tools version
Browse files Browse the repository at this point in the history
  • Loading branch information
npurushe committed May 29, 2018
1 parent 7c348af commit 9255a2b
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jdk:
android:
components:
- tools
- build-tools-26.0.2
- android-25
- build-tools-27.0.3
- android-26
- extra

services:
Expand Down
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ apply plugin: 'idea'
apply plugin: 'maven-publish'

buildscript {
ext.android_buildtools_version = '26.0.2'
ext.android_buildtools_version = '27.0.3'
ext.android_support_version = '26.1.0'
ext.jackson_version = '2.8.6'
ext.jpa_version = '2.1.1'
ext.kotlin_version = '1.2.20'
Expand All @@ -14,7 +15,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.8"
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.gradle.configureondemand=false
11 changes: 5 additions & 6 deletions requery-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ buildscript {
repositories {
jcenter()
mavenCentral()
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
}
}

Expand All @@ -11,7 +10,7 @@ apply plugin: 'kotlin-android'
apply plugin: 'maven-publish'

android {
compileSdkVersion 25
compileSdkVersion 26
buildToolsVersion "$android_buildtools_version"

defaultConfig {
Expand Down Expand Up @@ -43,14 +42,14 @@ android {

dependencies {
compile project(':requery')
compile 'com.android.support:support-v4:25.3.1'
compile 'com.android.support:recyclerview-v7:25.3.1'
compile "com.android.support:support-v4:$android_support_version"
compile "com.android.support:recyclerview-v7:$android_support_version"
compile 'net.zetetic:android-database-sqlcipher:3.5.9'
compile 'io.requery:sqlite-android:3.21.0'
testCompile 'junit:junit:4.12'
androidTestCompile project(':requery-test')
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5'
androidTestCompile 'com.android.support.test:runner:1.0.2'
androidTestCompile 'com.android.support.test:rules:1.0.2'
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}

Expand Down
6 changes: 3 additions & 3 deletions requery-android/example-kotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ kapt {
}

android {
compileSdkVersion 25
compileSdkVersion 26
buildToolsVersion "$android_buildtools_version"

defaultConfig {
Expand All @@ -36,8 +36,8 @@ android {
}

dependencies {
compile 'com.android.support:appcompat-v7:25.3.0'
compile 'com.android.support:recyclerview-v7:25.3.0'
compile "com.android.support:appcompat-v7:$android_support_version"
compile "com.android.support:recyclerview-v7:$android_support_version"
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile "io.reactivex.rxjava2:rxjava:$rxjava2_version"
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
Expand Down
6 changes: 3 additions & 3 deletions requery-android/example/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
compileSdkVersion 26
buildToolsVersion "$android_buildtools_version"

defaultConfig {
Expand Down Expand Up @@ -30,8 +30,8 @@ android {
}

dependencies {
compile 'com.android.support:appcompat-v7:25.3.0'
compile 'com.android.support:recyclerview-v7:25.3.0'
compile "com.android.support:appcompat-v7:$android_support_version"
compile "com.android.support:recyclerview-v7:$android_support_version"
compile "io.reactivex.rxjava2:rxjava:$rxjava2_version"
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
compile 'io.requery:requery:1.3.0'
Expand Down

0 comments on commit 9255a2b

Please sign in to comment.