From 9fa3c5bb4f96e37115acc742ede7c86ffd4dd5df Mon Sep 17 00:00:00 2001 From: Gurpreet Date: Thu, 21 Jul 2016 15:08:52 +0530 Subject: [PATCH 1/5] - changed the buildVersions and target SDK to 24. --- AndroidManifest.xml | 2 +- build.gradle | 6 +++--- sample_client/AndroidManifest.xml | 2 +- sample_client/build.gradle | 4 ++-- test_client/AndroidManifest.xml | 2 +- test_client/build.gradle | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f4427996..fe7d2ac0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -30,7 +30,7 @@ + android:targetSdkVersion="24" /> diff --git a/build.gradle b/build.gradle index a3e0ccca..d9f9cdbf 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:2.1.2' } } @@ -18,8 +18,8 @@ dependencies { } android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 24 + buildToolsVersion "24.0.0" sourceSets { main { diff --git a/sample_client/AndroidManifest.xml b/sample_client/AndroidManifest.xml index 568299b0..ee94e2f0 100644 --- a/sample_client/AndroidManifest.xml +++ b/sample_client/AndroidManifest.xml @@ -30,7 +30,7 @@ + android:targetSdkVersion="24" /> + android:targetSdkVersion="24" /> Date: Thu, 21 Jul 2016 15:13:35 +0530 Subject: [PATCH 2/5] - changes made to .travis.yml file. --- .travis.yml | 8 +++++--- test_client/build.gradle | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2573011b..926ed38f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,14 @@ sudo: false language: android +jdk: + - oraclejdk8 android: components: - platform-tools - tools - - build-tools-23.0.3 - - android-23 - - sys-img-armeabi-v7a-android-23 + - build-tools-24.0.0 + - android-24 + - sys-img-armeabi-v7a-android-24 branches: only: - master diff --git a/test_client/build.gradle b/test_client/build.gradle index 98eb672d..94434e82 100644 --- a/test_client/build.gradle +++ b/test_client/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.0.0' + classpath 'com.android.tools.build:gradle:2.1.2' } } From 8145e6c0808f1a8790d7234486ae528c74f3bba0 Mon Sep 17 00:00:00 2001 From: Gurpreet Date: Wed, 27 Jul 2016 00:30:27 +0530 Subject: [PATCH 3/5] - changes made to .travis.yml file. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 926ed38f..a4fd2295 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ env: - secure: ezKyZbb3q1Phcv/vJntuJe0C2req+Hp4/C+tFZIWZ3o8wRO9jVI3bnED9TWQyQOOT0SoRYjJ5zqp0UcEOGCzPeWFO6bA7RWp+zA/R9sziLNcVWMVv3WXnuClQjPBHJeXRnP7YmNjxDmSfV97a14dk5d9LgJZYliTDepH4dLsxro= - secure: HV8REF7bB1i6cBEe4YCZvjgTf6tGiptAPzp9qZXGUH9Lxh6yUjYMXXP8flDaIFcE2JuAakW6P4SPr7/SQ+X4f8/84cNhmU1I+6Y1nG37WvelRHQVslOUDbl1TNUnynYZ+ybkb3BtrQvggCGMdQKvGZXYiggFhN/TWuDo0c7Q2Ro= matrix: - - ANDROID_TARGET=android-23 ANDROID_ABI=armeabi-v7a + - ANDROID_TARGET=android-24 ANDROID_ABI=armeabi-v7a addons: coverity_scan: project: From 445cbef3aa9b18f50b11a9abd9c85d5df45908d1 Mon Sep 17 00:00:00 2001 From: Gurpreet Date: Mon, 8 Aug 2016 21:29:03 +0530 Subject: [PATCH 4/5] - changed project.properties files. --- project.properties | 2 +- sample_client/project.properties | 2 +- test_client/project.properties | 2 +- test_client/tests/project.properties | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/project.properties b/project.properties index b2ef7dcc..34c8d58b 100644 --- a/project.properties +++ b/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-23 +target=android-24 android.library=true diff --git a/sample_client/project.properties b/sample_client/project.properties index d8387c3b..07afc2f8 100644 --- a/sample_client/project.properties +++ b/sample_client/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-23 +target=android-24 android.library.reference.1=.. diff --git a/test_client/project.properties b/test_client/project.properties index d8387c3b..07afc2f8 100644 --- a/test_client/project.properties +++ b/test_client/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-23 +target=android-24 android.library.reference.1=.. diff --git a/test_client/tests/project.properties b/test_client/tests/project.properties index 916037e3..270e04b1 100644 --- a/test_client/tests/project.properties +++ b/test_client/tests/project.properties @@ -10,5 +10,4 @@ # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt -# Project target. -target=android-23 +# Project target \ No newline at end of file From 2e17ca3e34a1df572995ed5d499af028ee95bbb2 Mon Sep 17 00:00:00 2001 From: Gurpreet Date: Thu, 11 Aug 2016 20:42:38 +0530 Subject: [PATCH 5/5] - added target=android-24 in in file test_client/tests/project.properties --- test_client/tests/project.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test_client/tests/project.properties b/test_client/tests/project.properties index 270e04b1..fe3c64ae 100644 --- a/test_client/tests/project.properties +++ b/test_client/tests/project.properties @@ -10,4 +10,5 @@ # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt -# Project target \ No newline at end of file +# Project target +target=android-24 \ No newline at end of file