From f3dd6d83f8eef50e0ea643428b6fa7c6dd1d6d18 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Fri, 27 Jan 2017 16:23:29 +0100 Subject: [PATCH] build: Update to 1.3.0 Note libcoap still uses IoTivity-1.2.1 branch: extlibs/libcoap/SConscript It could be updated in later patch, to be tracked on this page: https://wiki.iotivity.org/build Change-Id: I92e93372886380e716c6bf9212035c3925df415a Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/16831 Tested-by: jenkins-iotivity Reviewed-by: Habib Virji Reviewed-by: Dan Mihai Reviewed-by: Ashok Babu Channa --- build_common/SConscript | 2 +- java/iotivity-android/build.gradle | 2 +- resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec | 2 +- resource/csdk/logger/include/logger.h | 2 +- .../samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec | 2 +- resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec | 2 +- .../enrollee/tizen-sdb/EnrolleeSample/packaging/com.oic.es.sample.spec | 2 +- service/notification/src/common/NSConstants.h | 2 +- tools/tizen/iotivity.spec | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build_common/SConscript b/build_common/SConscript index ca1eb7a..24d1e50 100644 --- a/build_common/SConscript +++ b/build_common/SConscript @@ -6,7 +6,7 @@ import os import platform -project_version = '1.2.1' +project_version = '1.3.0' # Map of host os and allowed target os (host: allowed target os) host_target_map = { diff --git a/java/iotivity-android/build.gradle b/java/iotivity-android/build.gradle index 0907704..99f8721 100755 --- a/java/iotivity-android/build.gradle +++ b/java/iotivity-android/build.gradle @@ -73,7 +73,7 @@ android { minSdkVersion 21 targetSdkVersion 21 versionCode 1 - versionName "1.2.1" + versionName "1.3.0" buildConfigField 'int', 'SECURED', SECURED buildConfigField 'int', 'WITH_TCP', WITH_TCP buildConfigField 'int', 'WITH_CLOUD', WITH_CLOUD diff --git a/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec b/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec index 75cfdaa..cf51131 100644 --- a/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec +++ b/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec @@ -4,7 +4,7 @@ %define DEST_LIB_DIR %{buildroot}/%{_libdir} Name: com-oic-ca -Version: 1.2.1 +Version: 1.3.0 Release: 0 Summary: Tizen oicca application Group: Network & Connectivity / IoT Connectivity diff --git a/resource/csdk/logger/include/logger.h b/resource/csdk/logger/include/logger.h index 3f7dbe7..9daf251 100644 --- a/resource/csdk/logger/include/logger.h +++ b/resource/csdk/logger/include/logger.h @@ -21,7 +21,7 @@ #ifndef LOGGER_H_ #define LOGGER_H_ -#define IOTIVITY_VERSION "1.2.1" +#define IOTIVITY_VERSION "1.3.0" #include #include diff --git a/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec b/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec index ef8e485..dda0c4f 100644 --- a/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec +++ b/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec @@ -2,7 +2,7 @@ %define ROOTDIR %{_builddir}/%{name}-%{version} Name: com-oic-ri-sample -Version: 1.2.1 +Version: 1.3.0 Release: 0 Summary: Tizen adapter interfacesample application Group: Network & Connectivity / IoT Connectivity diff --git a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec index 628bb2f..dde34e2 100644 --- a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec +++ b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec @@ -4,7 +4,7 @@ %define DEST_LIB_DIR %{buildroot}/%{_libdir} Name: com-oic-ri -Version: 1.2.1 +Version: 1.3.0 Release: 0 Summary: Tizen oicri application Group: Network & Connectivity / IoT Connectivity diff --git a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/packaging/com.oic.es.sample.spec b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/packaging/com.oic.es.sample.spec index fbf1fb6..e849bab 100644 --- a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/packaging/com.oic.es.sample.spec +++ b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/packaging/com.oic.es.sample.spec @@ -3,7 +3,7 @@ %{!?VERBOSE: %define VERBOSE 1} Name: com-oic-es-sample -Version: 1.2.1 +Version: 1.3.0 Release: 0 Summary: Tizen adapter interfacesample application Group: Network & Connectivity / IoT Connectivity diff --git a/service/notification/src/common/NSConstants.h b/service/notification/src/common/NSConstants.h index baff965..457570e 100644 --- a/service/notification/src/common/NSConstants.h +++ b/service/notification/src/common/NSConstants.h @@ -203,7 +203,7 @@ } \ } -#define VERSION "1.2.1" +#define VERSION "1.3.0" #define NS_ATTRIBUTE_VERSION "x.org.iotivity.ns.version" #define NS_ATTRIBUTE_POLICY "x.org.iotivity.ns.subcontrollability" diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec index 16c6352..684eeb9 100644 --- a/tools/tizen/iotivity.spec +++ b/tools/tizen/iotivity.spec @@ -1,5 +1,5 @@ Name: iotivity -Version: 1.2.1 +Version: 1.3.0 Release: 0 Summary: IoT Connectivity sponsored by the OCF Group: Network & Connectivity / IoT Connectivity -- 2.7.4