From 1b34e9bd49d14600cec353dd07921defc745a945 Mon Sep 17 00:00:00 2001 From: davigonz Date: Wed, 18 Oct 2017 12:35:13 +0200 Subject: [PATCH 1/3] Upgrade compileSdkToos to 26 --- build.gradle | 2 +- sample_client/build.gradle | 2 +- test_client/build.gradle | 2 +- test_client/tests/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 003af78e..64b3f1dd 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ dependencies { } android { - compileSdkVersion 24 + compileSdkVersion 26 buildToolsVersion '26.0.2' sourceSets { diff --git a/sample_client/build.gradle b/sample_client/build.gradle index af47091a..2c7a6b08 100644 --- a/sample_client/build.gradle +++ b/sample_client/build.gradle @@ -9,7 +9,7 @@ dependencies { } android { - compileSdkVersion 24 + compileSdkVersion 26 buildToolsVersion "26.0.2" sourceSets { diff --git a/test_client/build.gradle b/test_client/build.gradle index f15860c2..319d157b 100644 --- a/test_client/build.gradle +++ b/test_client/build.gradle @@ -11,7 +11,7 @@ dependencies { } android { - compileSdkVersion 24 + compileSdkVersion 26 buildToolsVersion "26.0.2" sourceSets { diff --git a/test_client/tests/build.gradle b/test_client/tests/build.gradle index f9f3e2aa..b9a2b5a1 100644 --- a/test_client/tests/build.gradle +++ b/test_client/tests/build.gradle @@ -6,7 +6,7 @@ dependencies { } android { - compileSdkVersion 24 + compileSdkVersion 26 buildToolsVersion "26.0.2" sourceSets { From 848d9db763727d184f119f16091c39f6a78f614b Mon Sep 17 00:00:00 2001 From: davigonz Date: Wed, 18 Oct 2017 13:09:53 +0200 Subject: [PATCH 2/3] Upgrade target sdk version to 26, including it also in Travis configuration --- .travis.yml | 2 +- AndroidManifest.xml | 2 +- sample_client/AndroidManifest.xml | 2 +- test_client/AndroidManifest.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f47975b..2dd25d40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ install: - yes | sdkmanager --verbose "build-tools;26.0.2" - yes | sdkmanager --verbose "platform-tools" - yes | sdkmanager --verbose "tools" -- yes | sdkmanager --verbose "platforms;android-24" +- yes | sdkmanager --verbose "platforms;android-26" - yes | sdkmanager --verbose "system-images;android-24;default;armeabi-v7a" # Check tools and dependencies installed diff --git a/AndroidManifest.xml b/AndroidManifest.xml index adb2be3f..36c89370 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -35,7 +35,7 @@ + android:targetSdkVersion="26" /> diff --git a/sample_client/AndroidManifest.xml b/sample_client/AndroidManifest.xml index ee94e2f0..df33bb06 100644 --- a/sample_client/AndroidManifest.xml +++ b/sample_client/AndroidManifest.xml @@ -30,7 +30,7 @@ + android:targetSdkVersion="26" /> + android:targetSdkVersion="26" /> Date: Wed, 18 Oct 2017 17:30:11 +0200 Subject: [PATCH 3/3] Update emulator version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2dd25d40..4fae7ec7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ env: # via the "travis encrypt" command using the project repo's public key - secure: epTZ0zZGDbHL3o6vSC9uNkZsi5j5SA6O/tvQBH7QW/dluuzIJxIjfhNbZHDyBReYDleirLzUFQpdWAUdvulCMLs/qZdIzFGlYXZSpxEnvPYMGQcilwADdJcxLw8L+3+ET5hSexxhjrTGw427IljkqGUpqQTxaLwFdFu98lDWSbc= matrix: - - ANDROID_TARGET=android-24 ANDROID_ABI=armeabi-v7a + - ANDROID_TARGET=android-26 ANDROID_ABI=armeabi-v7a addons: coverity_scan: project: