diff --git a/.travis.yml b/.travis.yml index f10ddbedb..3245024df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,9 @@ language: android android: components: - tools - - platform-tools-24.0.2 + - platform-tools-26.0.1 - build-tools-26.0.2 - - android-24 + - android-26 - extra-android-m2repository before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock diff --git a/app/build.gradle b/app/build.gradle index f9da1b029..d4d7c2bb1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,6 +17,7 @@ buildscript { */ repositories { maven { url 'https://maven.fabric.io/public' } + maven { url "https://maven.google.com" } } /** @@ -61,7 +62,7 @@ android { * Android SDK and build-tools version * Update (both Gradle and local SDK) whenever possible */ - compileSdkVersion 24 + compileSdkVersion 26 buildToolsVersion '26.0.2' /** @@ -72,7 +73,7 @@ android { */ defaultConfig { minSdkVersion 19 /*Dont change this unless you know why*/ - targetSdkVersion 24 /*Dont change this unless you know why*/ + targetSdkVersion 26 /*Dont change this unless you know why*/ versionCode 30 versionName "4.0.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -150,8 +151,10 @@ dependencies { /** * Test Build Dependencies */ - compile 'com.android.support:appcompat-v7:24.2.1' - compile 'com.android.support:recyclerview-v7:24.2.1' + compile 'com.android.support:appcompat-v7:26.1.0' + compile 'com.android.support:preference-v7:26.1.0' + compile 'com.android.support:recyclerview-v7:26.1.0' + compile 'com.android.support:design:26.1.0' compile 'com.google.guava:guava:19.0' compile 'com.google.code.findbugs:jsr305:3.0.1' compile 'com.jakewharton:butterknife:8.4.0' @@ -162,10 +165,10 @@ dependencies { testCompile 'junit:junit:4.12' testCompile 'com.squareup.assertj:assertj-android:1.1.1' testCompile 'org.mockito:mockito-core:1.10.19' - testCompile 'com.android.support:support-annotations:24.2.1' - testCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support:support-annotations:24.2.1' - androidTestCompile 'com.android.support.test:runner:0.5' + testCompile 'com.android.support:support-annotations:26.1.0' + testCompile 'com.android.support.test:runner:1.0.1' + androidTestCompile 'com.android.support:support-annotations:26.1.0' + androidTestCompile 'com.android.support.test:runner:1.0.1' apt 'com.jakewharton:butterknife-compiler:8.4.0' apt 'org.projectlombok:lombok:1.16.10' onlineCompile 'com.squareup.okhttp3:okhttp:3.7.0' diff --git a/openCVLibrary330/build.gradle b/openCVLibrary330/build.gradle index 3da910fb3..e7d65aa17 100644 --- a/openCVLibrary330/build.gradle +++ b/openCVLibrary330/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 24 + compileSdkVersion 26 buildToolsVersion "26.0.2" defaultConfig { minSdkVersion 19 - targetSdkVersion 24 + targetSdkVersion 26 } buildTypes {