build: Update version to 1.2.0

As master is now based on 1.2.0-RC1, match planned release number.

Change-Id: Id16c97b76b92aabf0699ca81d70a3abb3bdb0cf0
Bug: https://jira.iotivity.org/browse/IOT/fixforversion/10501
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11261
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

diff --git a/android/android_api/base/build.gradle b/android/android_api/base/build.gradle
index 4ea654cdd7de0b9176e8dce243271bf51d62bfd0..29a2cb5507db5a64ab26d02e24a4b53be1e6bfdd 100755 (executable)
--- a/android/android_api/base/build.gradle
+++ b/android/android_api/base/build.gradle
@@ -41,7 +41,7 @@ android {
         minSdkVersion 21\r
         targetSdkVersion 21\r
         versionCode 1\r
-        versionName "1.1.1"\r
+        versionName "1.2.0"\r
         buildConfigField 'int', 'SECURED', SECURED\r
         buildConfigField 'int', 'WITH_CLOUD', WITH_CLOUD\r
         buildConfigField "int", 'WITH_MQ_PUB', WITH_MQ_PUB\r

diff --git a/build_common/SConscript b/build_common/SConscript
index 23910b685ce124c741068295e78c4a0874c2d687..ea968c348f88339015cb63d02b90d8b9618cdbdb 100644 (file)
--- a/build_common/SConscript
+++ b/build_common/SConscript
@@ -320,14 +320,14 @@ if not user_lib:
 if user_prefix:
        pc_vars = {'\@PREFIX\@': user_prefix,
                                '\@EXEC_PREFIX\@':user_prefix,
-                               '\@VERSION\@': '1.1.1',
+                               '\@VERSION\@': '1.2.0',
                                '\@LIB_INSTALL_DIR\@': user_lib,
                                '\@ROUTING_DEFINE\@': routing_define
                                }
 else:
        pc_vars = {'\@PREFIX\@': env.get('BUILD_DIR').encode('string_escape'),
                                '\@EXEC_PREFIX\@': env.get('BUILD_DIR').encode('string_escape'),
-                               '\@VERSION\@': '1.1.1',
+                               '\@VERSION\@': '1.2.0',
                                '\@LIB_INSTALL_DIR\@': user_lib,
                                '\@ROUTING_DEFINE\@': routing_define
                                }

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 70b52d14ddb1990474f49c517e0a9deec310edb0..1fd34683bdd8681c2cb90e21b612a514fdb2481d 100644 (file)
--- a/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec
+++ b/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec
@@ -6,7 +6,7 @@
 
 
 Name: com-oic-ca
-Version:    1.1.1
+Version:    1.2.0
 Release:    0
 Summary: Tizen oicca application
 URL: http://slp-source.sec.samsung.net

diff --git a/resource/csdk/logger/include/logger.h b/resource/csdk/logger/include/logger.h
index 0b42ead7b8ceebf6d1c192ef9d7f3ec4d6d1a575..7ccb51c0a73f6e6d59601ac989d5283310bfd92d 100644 (file)
--- 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.1.1"
+#define IOTIVITY_VERSION "1.2.0"
 
 #include <stdint.h>
 #include <stdio.h>

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 63b90e2b0acab4d6f549d8492b439efd45288e0a..305443074a8f5a9d4dd1bbf89f1e0e522ad0f415 100644 (file)
--- 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
@@ -3,7 +3,7 @@
 %{!?VERBOSE: %define VERBOSE 1}
 
 Name: com-oic-ri-sample
-Version:    1.1.1
+Version:    1.2.0
 Release:    0
 Summary: Tizen adapter interfacesample application
 URL: http://slp-source.sec.samsung.net

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 4f65262311f20e9c16c5dc0557f4f2031efe34e3..09a9ca441a835a6fbed89218de0aecc7b8f05bee 100644 (file)
--- 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 @@
 %{!?VERBOSE: %define VERBOSE 1}
 
 Name: com-oic-ri
-Version:    1.1.1
+Version:    1.2.0
 Release:    0
 Summary: Tizen oicri application
 URL: http://slp-source.sec.samsung.net

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 dda4b408582dfe762dc6a3ec8a7c81f02fc6218f..41d14d9c1afd623750ca962c1ca338b4ff88d909 100644 (file)
--- 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.1.1
+Version:    1.2.0
 Release:    0
 Summary: Tizen adapter interfacesample application
 URL: http://slp-source.sec.samsung.net

diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec
index 9a82719ad7a97eb43978150b5ce17d115670100e..1730a1eec062fffb0744d0024b71f58cc7bab3de 100644 (file)
--- a/tools/tizen/iotivity.spec
+++ b/tools/tizen/iotivity.spec
@@ -1,5 +1,5 @@
 Name: iotivity
-Version: 1.1.1
+Version: 1.2.0
 Release: 0
 Summary: IoT Connectivity sponsored by the OCF
 Group: Network & Connectivity/Other