Skip to content
This repository was archived by the owner on Jan 23, 2024. It is now read-only.

update build to target oreo and use version 26 of support libs #790

Merged
nahojjjen merged 2 commits into from
Oct 16, 2017
Merged

update build to target oreo and use version 26 of support libs #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8aa8d29
update build to target oreo and use version 26 of support libs
harkin Oct 14, 2017
283ba87
Merge branch 'master' into hl/update-target-version
nahojjjen Oct 16, 2017
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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 11 additions & 8 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ buildscript {
*/
repositories {
maven { url 'https://maven.fabric.io/public' }
maven { url "https://maven.google.com" }
}

/**
Expand Down Expand Up @@ -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'

/**
Expand All @@ -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"
Expand Down Expand Up @@ -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'
Copy link
Contributor Author

@harkin harkin Oct 14, 2017

Choose a reason for hiding this comment

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

preference-v7 and design are transitive dependencies currently.

com.pavelsikun:material-seekbar-preference uses an old version of preferences and io.apptik.widget:multislider uses an old version of design.

There's an error in Android Studio warning that using support libraries from different versions could lead to crashes. By including them all libraries use the latest versions. I've tested both seekbars and they work properly on my device

compile 'com.google.guava:guava:19.0'
compile 'com.google.code.findbugs:jsr305:3.0.1'
compile 'com.jakewharton:butterknife:8.4.0'
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions openCVLibrary330/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down