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 38fd526..3c33355 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 82fb651..edbd6fb 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 a7dd445..58cae46 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 788038d..1b4fa8f 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 751d6d2..504ef22 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 333920c..2ede4c5 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 d72b630..52b07d9 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 930e26a..194a54f 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 f124840..bb3d6fe 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 0e83140..c1dc2c8 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 dc6b0d5..1879c36 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 fdee272..c524962 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 6517346..79a5c0d 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 f105e1a..209b447 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 81bdc88..eec628e 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 ef6715f..de176b8 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 7c0bdbc..eb25bc6 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 1de4715..d334dc6 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 46e2863..77af0fa 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 ed9b8b6..7a23ae2 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 fa408da..815207d 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 c1f2134..6345591 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 d5fc03c..c617a8a 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 0fa51a3..dad4652 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 50c7205..8442c05 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 a8285a4..eee9d65 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 bcb90e5..02aa602 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 689eec9..b094ea6 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 50c7205..8442c05 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 7b4983f..330b548 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 f6bc21a..8e15a60 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"
     }