From: Philippe Coval Date: Thu, 17 Nov 2016 09:41:31 +0000 (+0100) Subject: build: Update version to 1.2.1 X-Git-Tag: 1.2.1~122 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14e50ae2fbe0921d432f8e44225a0e2e92698de0;p=platform%2Fupstream%2Fiotivity.git build: Update version to 1.2.1 Change-Id: Ib8994521a91c17d3714d0594d6fbc05e335cd82e Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/14453 Tested-by: jenkins-iotivity Reviewed-by: Jaewook Jung Reviewed-by: Uze Choi --- diff --git a/android/android_api/base/build.gradle b/android/android_api/base/build.gradle index 855418d..e496be0 100755 --- a/android/android_api/base/build.gradle +++ b/android/android_api/base/build.gradle @@ -41,7 +41,7 @@ android { minSdkVersion 21 targetSdkVersion 21 versionCode 1 - versionName "1.2.0" + versionName "1.2.1" buildConfigField 'int', 'SECURED', SECURED buildConfigField 'int', 'WITH_TCP', WITH_TCP buildConfigField 'int', 'WITH_CLOUD', WITH_CLOUD diff --git a/build_common/SConscript b/build_common/SConscript index 56ea713..5236e04 100644 --- a/build_common/SConscript +++ b/build_common/SConscript @@ -6,7 +6,7 @@ import os import platform -project_version = '1.2.0' +project_version = '1.2.1' # Map of host os and allowed target os (host: allowed target os) host_target_map = { 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 f0bee17..96b19b8 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.0 +Version: 1.2.1 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 4304d23..2bd6087 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.0" +#define IOTIVITY_VERSION "1.2.1" #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 e2e0b2d..e9b6ac9 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.0 +Version: 1.2.1 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 8b53d0f..997a35b 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 @@ -5,7 +5,7 @@ %define DEST_LIB_DIR %{buildroot}/%{_libdir} Name: com-oic-ri -Version: 1.2.0 +Version: 1.2.1 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 7191720..8981c73 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.0 +Version: 1.2.1 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 cbfca9a..39c71bd 100644 --- a/service/notification/src/common/NSConstants.h +++ b/service/notification/src/common/NSConstants.h @@ -183,7 +183,7 @@ } \ } -#define VERSION "1.2.0" +#define VERSION "1.2.1" #define NS_ATTRIBUTE_VERSION "version" #define NS_ATTRIBUTE_POLICY "subControllability" diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec index 8c9f1a0..ea02529 100644 --- a/tools/tizen/iotivity.spec +++ b/tools/tizen/iotivity.spec @@ -1,5 +1,5 @@ Name: iotivity -Version: 1.2.0 +Version: 1.2.1 Release: 0 Summary: IoT Connectivity sponsored by the OCF Group: Network & Connectivity / IoT Connectivity