Updated the android version to API 23 and build tools version to 23.0.1.

The user will be prompted to download these versions if they do not have
Android SDK installed. Both are the latest supported versions.

Change-Id: I6c988b9dcde12b47406a8490840d07c135c5dd0e
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4759
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

diff --git a/android/android_api/SConscript b/android/android_api/SConscript
index 38fd526cc67111166397ec3e20810cb8a989eb12..3c3335555624caf53b002e1c1ff2eb97629bb176 100644 (file)
--- a/android/android_api/SConscript
+++ b/android/android_api/SConscript
@@ -14,14 +14,14 @@ ANDROID_SECURED = env.get('SECURED')
 os.environ['ANDROID_HOME'] = env.get('ANDROID_HOME')
 os.environ['ANDROID_NDK_HOME'] = env.get('ANDROID_NDK')
 
-if not os.path.exists(android_home + '/platforms/android-21') or not os.path.exists(android_home + '/build-tools/20.0.0'):
+if not os.path.exists(android_home + '/platforms/android-23') or not os.path.exists(android_home + '/build-tools/23.0.1'):
     print '''
 ***************************************** Info ********************************
-*   Either 'Android API 21' is not installed or 'Android SDK Build Tools      *
-*   20.0.0' is not installed. The Android SDK Manager will now open. Please   *
+*   Either 'Android API 23' is not installed or 'Android SDK Build Tools      *
+*   23.0.1' is not installed. The Android SDK Manager will now open. Please   *
 *   be sure to deselect all options, then select the following 2 packages:    *
-*       1. Under "Tools" select "Android SDK Build-tools" Revision 20.        *
-*       2. Under "Android 5.0.1 (API 21)" select "SDK Platform"               *
+*       1. Under "Tools" select "Android SDK Build-tools" Revision 23.0.1.    *
+*       2. Under "Android 6.0 (API 23)" select "SDK Platform"                 *
 *       3. Continue by selecting "Install 2 Packages"                         *
 *                                                                             *
 *   NOTE: If you have an http proxy, please press ctrl+c now and edit/create  *

diff --git a/android/android_api/base/build.gradle b/android/android_api/base/build.gradle
index 82fb651b2f885dec5a91ea822b7eacd919dca945..edbd6fb8b5e0c7116b72a19d1d5d67449f609f4b 100755 (executable)
--- a/android/android_api/base/build.gradle
+++ b/android/android_api/base/build.gradle
@@ -23,8 +23,8 @@
 apply plugin: 'com.android.library'\r
 \r
 android {\r
-    compileSdkVersion 21\r
-    buildToolsVersion "20.0.0"\r
+    compileSdkVersion 23\r
+    buildToolsVersion "23.0.1"\r
     archivesBaseName = "iotivity-base"\r
 \r
     libraryVariants.all { variant ->\r
@@ -39,7 +39,7 @@ android {
 \r
     defaultConfig {\r
         minSdkVersion 21\r
-        targetSdkVersion 21\r
+        targetSdkVersion 23\r
         versionCode 1\r
         versionName "1.0"\r
     }\r
@@ -101,4 +101,4 @@ task buildNative(type: Exec) {
         println 'Reason: ANDROID_NDK_HOME not set.'\r
         println '##################'\r
     }\r
-}
\ No newline at end of file
+}\r

diff --git a/android/examples/devicediscoveryclient/build.gradle b/android/examples/devicediscoveryclient/build.gradle
index a7dd4454ebe6a5fdc6ff86914cd4921adac17433..58cae46cd99e11ade2ea042c1159f45ea04bc3da 100644 (file)
--- a/android/examples/devicediscoveryclient/build.gradle
+++ b/android/examples/devicediscoveryclient/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "org.iotivity.base.examples.devicediscoveryclient"
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }

diff --git a/android/examples/devicediscoveryserver/build.gradle b/android/examples/devicediscoveryserver/build.gradle
index 788038db0175caa21017ec816ee955588be41582..1b4fa8feded6649de1a5d99f475255c0976e6d53 100644 (file)
--- a/android/examples/devicediscoveryserver/build.gradle
+++ b/android/examples/devicediscoveryserver/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "org.iotivity.base.examples.devicediscoveryserver"
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }

diff --git a/android/examples/fridgeclient/build.gradle b/android/examples/fridgeclient/build.gradle
index 751d6d251ebfd0c45582e0e796153758e87e3328..504ef2231599c1f81abb516d74b8711be59a7ed7 100755 (executable)
--- a/android/examples/fridgeclient/build.gradle
+++ b/android/examples/fridgeclient/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 android {
-    compileSdkVersion 21
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "org.iotivity.base.examples.fridgeclient"
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }
@@ -32,4 +32,4 @@ try {
 } catch (all) {
     print "${ERROR_MSG}"
     assert all
-}
\ No newline at end of file
+}

diff --git a/android/examples/fridgegroupclient/build.gradle b/android/examples/fridgegroupclient/build.gradle
index 333920ca3d938cc364246c4401ed4a85456a6ca6..2ede4c54b76a0d9a5a7184c95e1bc34cf68d2fa6 100755 (executable)
--- a/android/examples/fridgegroupclient/build.gradle
+++ b/android/examples/fridgegroupclient/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'\r
 android {\r
-    compileSdkVersion 21\r
-    buildToolsVersion "20.0.0"\r
+    compileSdkVersion 23\r
+    buildToolsVersion "23.0.1"\r
 \r
     defaultConfig {\r
         applicationId "org.iotivity.base.examples.fridgegroupclient"\r
         minSdkVersion 21\r
-        targetSdkVersion 21\r
+        targetSdkVersion 23\r
         versionCode 1\r
         versionName "1.0"\r
     }\r

diff --git a/android/examples/fridgegroupserver/build.gradle b/android/examples/fridgegroupserver/build.gradle
index d72b630fe602612b2e28dc2b59ea29def7e1813d..52b07d9590c62d97569edbf5f203dfb05f03db43 100755 (executable)
--- a/android/examples/fridgegroupserver/build.gradle
+++ b/android/examples/fridgegroupserver/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'\r
 android {\r
-    compileSdkVersion 21\r
-    buildToolsVersion "20.0.0"\r
+    compileSdkVersion 23\r
+    buildToolsVersion "23.0.1"\r
 \r
     defaultConfig {\r
         applicationId "org.iotivity.base.examples.fridgegroupserver"\r
         minSdkVersion 21\r
-        targetSdkVersion 21\r
+        targetSdkVersion 23\r
         versionCode 1\r
         versionName "1.0"\r
     }\r
@@ -32,4 +32,4 @@ try {
 } catch (all) {\r
     print "${ERROR_MSG}"\r
     assert all\r
-}
\ No newline at end of file
+}\r

diff --git a/android/examples/fridgeserver/build.gradle b/android/examples/fridgeserver/build.gradle
index 930e26adc892e36dbe85fbf4d52fee8486cb21c7..194a54f0bdb6ef3350fe20ccc12e8a9a71de89a4 100755 (executable)
--- a/android/examples/fridgeserver/build.gradle
+++ b/android/examples/fridgeserver/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 android {
-    compileSdkVersion 21
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "org.iotivity.base.examples.fridgeserver"
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }
@@ -32,4 +32,4 @@ try {
 } catch (all) {
     print "${ERROR_MSG}"
     assert all
-}
\ No newline at end of file
+}

diff --git a/android/examples/groupclient/build.gradle b/android/examples/groupclient/build.gradle
index f12484009c82eb3d0ea06d5d02707d3fe30477fe..bb3d6fee1f31d8e0b504bb494c7f7a2ae0eceb59 100644 (file)
--- a/android/examples/groupclient/build.gradle
+++ b/android/examples/groupclient/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "org.iotivity.base.examples.groupclient"
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }

diff --git a/android/examples/groupserver/build.gradle b/android/examples/groupserver/build.gradle
index 0e831400cd2b575f3c6bbc5932d1b28cca5318ad..c1dc2c83217b3c78b9d54f49d072c84187a7cd95 100644 (file)
--- a/android/examples/groupserver/build.gradle
+++ b/android/examples/groupserver/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "org.iotivity.base.examples.groupserver"
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }

diff --git a/android/examples/presenceclient/build.gradle b/android/examples/presenceclient/build.gradle
index dc6b0d5fa6d56a239c9a7d7bd31fb0751559033f..1879c368bd8937f4b0f3f3d63a6f28302375a538 100644 (file)
--- a/android/examples/presenceclient/build.gradle
+++ b/android/examples/presenceclient/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "org.iotivity.base.examples.presenceclient"
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }

diff --git a/android/examples/presenceserver/build.gradle b/android/examples/presenceserver/build.gradle
index fdee272a670750ca19e0f1a118d9dc895f16bee4..c524962d2c3b9b164a4b0ffdea39195a787bbda7 100644 (file)
--- a/android/examples/presenceserver/build.gradle
+++ b/android/examples/presenceserver/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "org.iotivity.base.examples.presenceserver"
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }

diff --git a/android/examples/provisioningclient/build.gradle b/android/examples/provisioningclient/build.gradle
index 6517346b8bf70372e9f0196e35d536f2f9f90b86..79a5c0d55be19feb7e36efaf4dd4208e4f99e3d2 100644 (file)
--- a/android/examples/provisioningclient/build.gradle
+++ b/android/examples/provisioningclient/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'\r
 \r
 android {\r
-    compileSdkVersion 21\r
-    buildToolsVersion "20.0.0"\r
+    compileSdkVersion 23\r
+    buildToolsVersion "23.0.1"\r
 \r
     defaultConfig {\r
         applicationId "org.iotivity.base.examples.provisioningclient"\r
         minSdkVersion 21\r
-        targetSdkVersion 21\r
+        targetSdkVersion 23\r
         versionCode 1\r
         versionName "1.0"\r
     }\r

diff --git a/android/examples/simpleclient/build.gradle b/android/examples/simpleclient/build.gradle
index f105e1a45d4bc020615e262dd18f184bbb12133f..209b447600a02b2f3bae385944e04f1b88f7cef4 100644 (file)
--- a/android/examples/simpleclient/build.gradle
+++ b/android/examples/simpleclient/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "org.iotivity.base.examples.simpleclient"
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }

diff --git a/android/examples/simpleserver/build.gradle b/android/examples/simpleserver/build.gradle
index 81bdc8874db768a1fd094ee08353c369a1ce83e1..eec628e05fa8aeead7f623fc4d68b2d27cd7dc33 100644 (file)
--- a/android/examples/simpleserver/build.gradle
+++ b/android/examples/simpleserver/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "org.iotivity.base.examples.simpleserver"
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }

diff --git a/build_common/android/SConscript b/build_common/android/SConscript
index ef6715f3a0fbc21dac832f5caf26839080b9cf0e..de176b8d84d8ee40b22bbe0d78c0f0e44bdaef22 100644 (file)
--- a/build_common/android/SConscript
+++ b/build_common/android/SConscript
@@ -118,7 +118,7 @@ for tc_ver in ['4.7', '4.8', '4.9', '']:
 
 cmd = [ndk_build_cmd]
 cmd.append('APP_ABI=' + target_arch)
-cmd.append('APP_PLATFORM=android-21')
+cmd.append('APP_PLATFORM=android-23')
 cmd.append('APP_STL=gnustl_shared')
 if env.get('RELEASE'):
        cmd.append('APP_OPTIM=release')

diff --git a/build_docs.sh b/build_docs.sh
index 7c0bdbc4b4aa40fe415b2d8fa5bc732a976f9306..eb25bc63cff89b3fd84f0dc58f9e91e1da81abe2 100755 (executable)
--- a/build_docs.sh
+++ b/build_docs.sh
@@ -9,7 +9,7 @@ pushd `dirname $0` > /dev/null
 rm -rf docs
 
 # JavaDoc now... from Uze's script
-ANDROID_JAR="$ANDROID_HOME/platforms/android-21/android.jar"
+ANDROID_JAR="$ANDROID_HOME/platforms/android-23/android.jar"
 
 if [ ! -e "$ANDROID_JAR" ]; then
     echo "Android platform not found. Expected '$ANDROID_JAR'"

diff --git a/resource/csdk/connectivity/build/android/jni/Application.mk b/resource/csdk/connectivity/build/android/jni/Application.mk
index 1de471557929b79034f118c481914a9bc5172b29..d334dc695bb766a37be2f57e45a1fd193288c2c4 100644 (file)
--- a/resource/csdk/connectivity/build/android/jni/Application.mk
+++ b/resource/csdk/connectivity/build/android/jni/Application.mk
@@ -3,7 +3,7 @@ APP_PROJECT_PATH = ./
 
 APP_STL = gnustl_shared
 APP_MODULES := CA
-APP_PLATFORM = android-21
+APP_PLATFORM = android-23
 APP_CPPFLAGS += -fexceptions
 APP_CPPFLAGS += -frtti += -Wno-error=format-security
 APP_CFLAGS = -Wno-error=format-security

diff --git a/resource/csdk/connectivity/lib/android/jni/Application.mk b/resource/csdk/connectivity/lib/android/jni/Application.mk
index 46e28637c26a3eae1d84a5023393fe0bb650cb3c..77af0faff460568577c5ba0c6a49223756e9ff4f 100644 (file)
--- a/resource/csdk/connectivity/lib/android/jni/Application.mk
+++ b/resource/csdk/connectivity/lib/android/jni/Application.mk
@@ -22,7 +22,7 @@
 APP_PROJECT_PATH = ./
 
 APP_STL = gnustl_shared
-APP_PLATFORM = android-21
+APP_PLATFORM = android-23
 APP_CPPFLAGS += -fexceptions
 APP_CPPFLAGS += -frtti += -Wno-error=format-security
 APP_CFLAGS = -Wno-error=format-security

diff --git a/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/Application.mk b/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/Application.mk
index ed9b8b6e79488c745f9265f024a22e1d5af2be4f..7a23ae26807eed90f7a381a1df40b0d66f9eb3b1 100755 (executable)
--- a/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/Application.mk
+++ b/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/Application.mk
@@ -2,7 +2,7 @@
 APP_PROJECT_PATH = ./
 APP_STL := gnustl_shared
 
-APP_PLATFORM = android-21
+APP_PLATFORM = android-23
 APP_CPPFLAGS += -fexceptions
 APP_CPPFLAGS += -frtti
 APP_CFLAGS = -Wno-error=format-security

diff --git a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
index fa408daed9323fd30aa1494ef022d12c26bd87ad..815207d25b0e028bbae0f2d27ad892d3149d6ba0 100644 (file)
--- a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
+++ b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'\r
 android {\r
-    compileSdkVersion 21\r
-    buildToolsVersion '21.1.2'\r
+    compileSdkVersion 23\r
+    buildToolsVersion '23.0.1'\r
 \r
     defaultConfig {\r
         applicationId "org.iotivity.service.easysetup"\r
         minSdkVersion 21\r
-        targetSdkVersion 21\r
+        targetSdkVersion 23\r
     }\r
 \r
     buildTypes {\r
@@ -20,4 +20,4 @@ android {
 dependencies {\r
     compile project(':EasySetupCore-debug')\r
     compile project(':iotivity-armeabi-base-debug')\r
-}
\ No newline at end of file
+}\r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/build.gradle b/service/easy-setup/sdk/mediator/android/EasySetupCore/build.gradle
index c1f2134c3fecdd6a0723c7c68610b3dd47c79a91..6345591a96df57637bade3b6c8ef49d6b5543e59 100644 (file)
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/build.gradle
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/build.gradle
@@ -16,12 +16,12 @@ allprojects {
 }\r
 \r
 android {\r
-    compileSdkVersion 21\r
-    buildToolsVersion '21.1.2'\r
+    compileSdkVersion 23\r
+    buildToolsVersion '23.0.1'\r
 \r
     defaultConfig {\r
         minSdkVersion 21\r
-        targetSdkVersion 21\r
+        targetSdkVersion 23\r
     }\r
 \r
     buildTypes {\r
@@ -37,4 +37,4 @@ android {
 \r
 dependencies {\r
     compile project(':iotivity-armeabi-base-debug')\r
-}
\ No newline at end of file
+}\r

diff --git a/service/easy-setup/sdk/mediator/android/jni/Application.mk b/service/easy-setup/sdk/mediator/android/jni/Application.mk
index d5fc03c022251c3f787278c8944949ba90bd78d8..c617a8ac0560ab1ef9245201a1c6b429a1cb691d 100644 (file)
--- a/service/easy-setup/sdk/mediator/android/jni/Application.mk
+++ b/service/easy-setup/sdk/mediator/android/jni/Application.mk
@@ -1,4 +1,4 @@
 APP_STL               := gnustl_shared
-APP_PLATFORM = android-21
+APP_PLATFORM = android-23
 NDK_TOOLCHAIN_VERSION := 4.8
 

diff --git a/service/resource-container/android/SConscript b/service/resource-container/android/SConscript
index 0fa51a3f5906f2cf56b761de5069109d214bff0b..dad46520e68656f911551e8a8e2a9d216979ab3c 100644 (file)
--- a/service/resource-container/android/SConscript
+++ b/service/resource-container/android/SConscript
@@ -13,15 +13,15 @@ else:
 os.environ['ANDROID_HOME'] = env.get('ANDROID_HOME')
 os.environ['ANDROID_NDK_HOME'] = env.get('ANDROID_NDK')
 
-if not os.path.exists(android_home + '/platforms/android-21') or not os.path.exists(android_home + '/build-tools/20.0.0'):
+if not os.path.exists(android_home + '/platforms/android-23') or not os.path.exists(android_home + '/build-tools/23.0.1'):
     print '''
 ***************************************** Info ********************************
-*   Either 'Android API 21' is not installed or 'Android SDK Build Tools      *
-*   20.0.0' is not installed. The Android SDK Manager will now open. Please   *
+*   Either 'Android API 23' is not installed or 'Android SDK Build Tools      *
+*   23.0.1' is not installed. The Android SDK Manager will now open. Please   *
 *   be sure to deselect all options, then select the following 2 packages:    *
-*       1. Under "Tools" select "Android SDK Build-tools" Revision 20.        *
-*       2. Under "Android 5.0.1 (API 21)" select "SDK Platform"               *
-*       3. Continue by selecting "Install 2 Packages"                         *
+*       1. Under "Tools" select "Android SDK Build-tools" Revision 23.0.1.    *
+*       2. Under "Android 6.0 (API 23)" select "SDK Platform"                 *
+*       3. Continue by selecting "Install 2 Packages                          *
 *                                                                             *
 *   NOTE: If you have an http proxy, please press ctrl+c now and edit/create  *
 *         the following file in your $HOME directory as follows:              *

diff --git a/service/resource-container/android/resource-container/build.gradle b/service/resource-container/android/resource-container/build.gradle
index 50c720554f88354dc1ca6d6aafca0e69cbf51e43..8442c0532c0c886e99c21c48f1c776f2b533e177 100644 (file)
--- a/service/resource-container/android/resource-container/build.gradle
+++ b/service/resource-container/android/resource-container/build.gradle
@@ -21,8 +21,8 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
     archivesBaseName = "iotivity"
 
     libraryVariants.all { variant ->
@@ -37,7 +37,7 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }

diff --git a/service/resource-container/examples/android/RCSampleClientApp/app/build.gradle b/service/resource-container/examples/android/RCSampleClientApp/app/build.gradle
index a8285a4d91481f79aba7e8c5a614a0900377d95b..eee9d65e5d3d8d70c050d3ea39db3daf8c6a45d0 100644 (file)
--- a/service/resource-container/examples/android/RCSampleClientApp/app/build.gradle
+++ b/service/resource-container/examples/android/RCSampleClientApp/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "org.iotivity.service.sample.client"
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }

diff --git a/service/resource-container/examples/android/RCSampleServerApp/app/build.gradle b/service/resource-container/examples/android/RCSampleServerApp/app/build.gradle
index bcb90e5bb1ada85103d3d389ca56ca024ee76d3b..02aa60273dde59e2616e5fbfd81a93849cd3dabc 100644 (file)
--- a/service/resource-container/examples/android/RCSampleServerApp/app/build.gradle
+++ b/service/resource-container/examples/android/RCSampleServerApp/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "org.iotivity.service.sample.server"
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }

diff --git a/service/resource-encapsulation/android/SConscript b/service/resource-encapsulation/android/SConscript
index 689eec9d962e2631f0bbe5e7bc19cc65e74284e1..b094ea6eabe08e332ca02e5dbcc00e30698b0cc6 100644 (file)
--- a/service/resource-encapsulation/android/SConscript
+++ b/service/resource-encapsulation/android/SConscript
@@ -13,15 +13,15 @@ else:
 os.environ['ANDROID_HOME'] = env.get('ANDROID_HOME')
 os.environ['ANDROID_NDK_HOME'] = env.get('ANDROID_NDK')
 
-if not os.path.exists(android_home + '/platforms/android-21') or not os.path.exists(android_home + '/build-tools/20.0.0'):
+if not os.path.exists(android_home + '/platforms/android-23') or not os.path.exists(android_home + '/build-tools/23.0.1'):
     print '''
 ***************************************** Info ********************************
-*   Either 'Android API 21' is not installed or 'Android SDK Build Tools      *
-*   20.0.0' is not installed. The Android SDK Manager will now open. Please   *
+*   Either 'Android API 23' is not installed or 'Android SDK Build Tools      *
+*   23.0.1' is not installed. The Android SDK Manager will now open. Please   *
 *   be sure to deselect all options, then select the following 2 packages:    *
-*       1. Under "Tools" select "Android SDK Build-tools" Revision 20.        *
-*       2. Under "Android 5.0.1 (API 21)" select "SDK Platform"               *
-*       3. Continue by selecting "Install 2 Packages"                         *
+*       1. Under "Tools" select "Android SDK Build-tools" Revision 23.0.1.    *
+*       2. Under "Android 6.0 (API 23)" select "SDK Platform"                 *
+*       3. Continue by selecting "Install 2 Packages                          *
 *                                                                             *
 *   NOTE: If you have an http proxy, please press ctrl+c now and edit/create  *
 *         the following file in your $HOME directory as follows:              *

diff --git a/service/resource-encapsulation/android/service/build.gradle b/service/resource-encapsulation/android/service/build.gradle
index 50c720554f88354dc1ca6d6aafca0e69cbf51e43..8442c0532c0c886e99c21c48f1c776f2b533e177 100644 (file)
--- a/service/resource-encapsulation/android/service/build.gradle
+++ b/service/resource-encapsulation/android/service/build.gradle
@@ -21,8 +21,8 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
     archivesBaseName = "iotivity"
 
     libraryVariants.all { variant ->
@@ -37,7 +37,7 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }

diff --git a/service/resource-encapsulation/examples/android/RESampleClientApp/app/build.gradle b/service/resource-encapsulation/examples/android/RESampleClientApp/app/build.gradle
index 7b4983f39aefdbc23923a523494eb01b7719d330..330b548524a6a8ac6388b66b23d861d590d34ea6 100644 (file)
--- a/service/resource-encapsulation/examples/android/RESampleClientApp/app/build.gradle
+++ b/service/resource-encapsulation/examples/android/RESampleClientApp/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "org.iotivity.service.sample.client"
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }

diff --git a/service/resource-encapsulation/examples/android/RESampleServerApp/app/build.gradle b/service/resource-encapsulation/examples/android/RESampleServerApp/app/build.gradle
index f6bc21a6527d0b49d155de1a8be02b77619a3f86..8e15a602a038ba3c85132864916a07107eb9f3a6 100644 (file)
--- a/service/resource-encapsulation/examples/android/RESampleServerApp/app/build.gradle
+++ b/service/resource-encapsulation/examples/android/RESampleServerApp/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "org.iotivity.service.sample.server"
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }