Skip to content
This repository was archived by the owner on Jan 23, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ android:
components:
- tools
- platform-tools-24.0.2
- build-tools-25.0.0
- build-tools-26.0.2
- android-24
- extra-android-m2repository
before_cache:
Expand Down
7 changes: 3 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}

dependencies {
classpath 'io.fabric.tools:gradle:1.21.6'
classpath 'io.fabric.tools:gradle:1.24.3'
}
}

Expand Down Expand Up @@ -62,7 +62,7 @@ android {
* Update (both Gradle and local SDK) whenever possible
*/
compileSdkVersion 24
buildToolsVersion '25.0.0'
buildToolsVersion '26.0.2'

/**
* Build configurations for APK
Expand Down Expand Up @@ -168,8 +168,7 @@ dependencies {
androidTestCompile 'com.android.support.test:runner:0.5'
apt 'com.jakewharton:butterknife-compiler:8.4.0'
apt 'org.projectlombok:lombok:1.16.10'
onlineCompile 'com.squareup.okhttp3:okhttp:3.4.1'
onlineCompile 'com.squareup.okio:okio:1.10.0'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okio is a transitive dependency of okhttp so specifying it here doesn't achieve much

onlineCompile 'com.squareup.okhttp3:okhttp:3.7.0'
provided 'org.projectlombok:lombok:1.16.10'
compile project(':openCVLibrary330')
}
Expand Down
2 changes: 1 addition & 1 deletion openCVLibrary330/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion 24
buildToolsVersion "25.0.0"
buildToolsVersion "26.0.2"

defaultConfig {
minSdkVersion 19
Expand Down