Upgrade version to 3.8.0-alpha0 (#1711)

zeroc-ice · Jan 22, 2024 · d572a6c · d572a6c
1 parent afb4193
commit d572a6c
Show file tree

Hide file tree

Showing 628 changed files with 1,199 additions and 2,534 deletions.
diff --git a/config/Make.rules b/config/Make.rules
@@ -103,9 +103,9 @@ supported-languages     ?= $(strip cpp java python ruby php \
 supported-configs       ?= shared
 default-configs         ?= $(firstword $(supported-configs))
 
-version                 = 3.7.10
-mmversion               = 3.7
-soversion               = 37
+version                 = 3.8a0
+mmversion               = 3.8
+soversion               = 38a0
 
 #
 # The compatversion is the lowest patch release with the same API.

diff --git a/config/icebuilder.props b/config/icebuilder.props
@@ -2,10 +2,10 @@
 <!-- Copyright (c) ZeroC, Inc. All rights reserved. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <IceVersion>3.7.10</IceVersion>
-    <IceIntVersion>30710</IceIntVersion>
-    <IceVersionMM>3.7</IceVersionMM>
-    <IceSoVersion>37</IceSoVersion>
-    <IceJSONVersion>3.7.10</IceJSONVersion>
+    <IceVersion>3.8a0</IceVersion>
+    <IceIntVersion>30850</IceIntVersion>
+    <IceVersionMM>3.8</IceVersionMM>
+    <IceSoVersion>38a0</IceSoVersion>
+    <IceJSONVersion>3.8.0-alpha0</IceJSONVersion>
   </PropertyGroup>
 </Project>
diff --git a/config/iphoneos-SDKSettings.plist b/config/iphoneos-SDKSettings.plist
@@ -18,6 +18,6 @@
 	<key>IsBaseSDK</key>
 	<string>NO</string>
 	<key>Version</key>
-	<string>3.7.10</string>
+	<string>3.8a0</string>
 </dict>
 </plist>
diff --git a/config/iphonesimulator-SDKSettings.plist b/config/iphonesimulator-SDKSettings.plist
@@ -18,6 +18,6 @@
 	<key>IsBaseSDK</key>
 	<string>NO</string>
 	<key>Version</key>
-	<string>3.7.10</string>
+	<string>3.8a0</string>
 </dict>
 </plist>
diff --git a/config/macosx-SDKSettings.plist b/config/macosx-SDKSettings.plist
@@ -18,6 +18,6 @@
 	<key>IsBaseSDK</key>
 	<string>NO</string>
 	<key>Version</key>
-	<string>3.7.10</string>
+	<string>3.8a0</string>
 </dict>
 </plist>
diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml
@@ -28,7 +28,7 @@
       <parameter name="publish-endpoints" default="default"/>
       <parameter name="flush-timeout" default="1000"/>
 
-      <service name="${instance-name}" entry="IceStormService,37:createIceStorm">
+      <service name="${instance-name}" entry="IceStormService,38a0:createIceStorm">
 
         <adapter name="${service}.TopicManager"
                  id="${instance-name}.TopicManager"
@@ -75,7 +75,7 @@
       <parameter name="publish-replica-group"/>
       <parameter name="topic-manager-replica-group"/>
 
-      <service name="${instance-name}${node-id}" entry="IceStormService,37:createIceStorm">
+      <service name="${instance-name}${node-id}" entry="IceStormService,38a0:createIceStorm">
 
         <adapter name="${service}.TopicManager"
                  id="${instance-name}${node-id}.TopicManager"

diff --git a/cpp/include/Ice/Communicator.h b/cpp/include/Ice/Communicator.h
@@ -1,17 +1,6 @@
 //
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
-//
-// Ice version 3.7.10
-//
-// <auto-generated>
-//
-// Generated from file `Communicator.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
 
 #ifndef __Ice_Communicator_h__
 #define __Ice_Communicator_h__
@@ -45,18 +34,6 @@
 #include <Ice/Connection.h>
 #include <IceUtil/UndefSysMacros.h>
 
-#ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 307
-#       error Ice version mismatch!
-#   endif
-#   if ICE_INT_VERSION % 100 >= 50
-#       error Beta header file detected
-#   endif
-#   if ICE_INT_VERSION % 100 < 10
-#       error Ice patch level mismatch!
-#   endif
-#endif
-
 #ifndef ICE_API
 #   if defined(ICE_STATIC_LIBS)
 #       define ICE_API /**/

diff --git a/cpp/include/Ice/CommunicatorF.h b/cpp/include/Ice/CommunicatorF.h
@@ -1,17 +1,6 @@
 //
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
-//
-// Ice version 3.7.10
-//
-// <auto-generated>
-//
-// Generated from file `CommunicatorF.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
 
 #ifndef __Ice_CommunicatorF_h__
 #define __Ice_CommunicatorF_h__
@@ -28,18 +17,6 @@
 #include <Ice/Optional.h>
 #include <IceUtil/UndefSysMacros.h>
 
-#ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 307
-#       error Ice version mismatch!
-#   endif
-#   if ICE_INT_VERSION % 100 >= 50
-#       error Beta header file detected
-#   endif
-#   if ICE_INT_VERSION % 100 < 10
-#       error Ice patch level mismatch!
-#   endif
-#endif
-
 #ifndef ICE_API
 #   if defined(ICE_STATIC_LIBS)
 #       define ICE_API /**/

diff --git a/cpp/include/Ice/Connection.h b/cpp/include/Ice/Connection.h
@@ -1,17 +1,6 @@
 //
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
-//
-// Ice version 3.7.10
-//
-// <auto-generated>
-//
-// Generated from file `Connection.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
 
 #ifndef __Ice_Connection_h__
 #define __Ice_Connection_h__
@@ -32,18 +21,6 @@
 #include <Ice/Endpoint.h>
 #include <IceUtil/UndefSysMacros.h>
 
-#ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 307
-#       error Ice version mismatch!
-#   endif
-#   if ICE_INT_VERSION % 100 >= 50
-#       error Beta header file detected
-#   endif
-#   if ICE_INT_VERSION % 100 < 10
-#       error Ice patch level mismatch!
-#   endif
-#endif
-
 #ifndef ICE_API
 #   if defined(ICE_STATIC_LIBS)
 #       define ICE_API /**/

diff --git a/cpp/include/Ice/ConnectionF.h b/cpp/include/Ice/ConnectionF.h
@@ -1,17 +1,6 @@
 //
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
-//
-// Ice version 3.7.10
-//
-// <auto-generated>
-//
-// Generated from file `ConnectionF.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
 
 #ifndef __Ice_ConnectionF_h__
 #define __Ice_ConnectionF_h__
@@ -28,18 +17,6 @@
 #include <Ice/Optional.h>
 #include <IceUtil/UndefSysMacros.h>
 
-#ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 307
-#       error Ice version mismatch!
-#   endif
-#   if ICE_INT_VERSION % 100 >= 50
-#       error Beta header file detected
-#   endif
-#   if ICE_INT_VERSION % 100 < 10
-#       error Ice patch level mismatch!
-#   endif
-#endif
-
 #ifndef ICE_API
 #   if defined(ICE_STATIC_LIBS)
 #       define ICE_API /**/

diff --git a/cpp/include/Ice/Current.h b/cpp/include/Ice/Current.h
@@ -1,17 +1,6 @@
 //
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
-//
-// Ice version 3.7.10
-//
-// <auto-generated>
-//
-// Generated from file `Current.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
 
 #ifndef __Ice_Current_h__
 #define __Ice_Current_h__
@@ -34,18 +23,6 @@
 #include <Ice/Version.h>
 #include <IceUtil/UndefSysMacros.h>
 
-#ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 307
-#       error Ice version mismatch!
-#   endif
-#   if ICE_INT_VERSION % 100 >= 50
-#       error Beta header file detected
-#   endif
-#   if ICE_INT_VERSION % 100 < 10
-#       error Ice patch level mismatch!
-#   endif
-#endif
-
 #ifndef ICE_API
 #   if defined(ICE_STATIC_LIBS)
 #       define ICE_API /**/

diff --git a/cpp/include/Ice/Endpoint.h b/cpp/include/Ice/Endpoint.h
@@ -1,17 +1,6 @@
 //
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
-//
-// Ice version 3.7.10
-//
-// <auto-generated>
-//
-// Generated from file `Endpoint.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
 
 #ifndef __Ice_Endpoint_h__
 #define __Ice_Endpoint_h__
@@ -31,18 +20,6 @@
 #include <Ice/EndpointF.h>
 #include <IceUtil/UndefSysMacros.h>
 
-#ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 307
-#       error Ice version mismatch!
-#   endif
-#   if ICE_INT_VERSION % 100 >= 50
-#       error Beta header file detected
-#   endif
-#   if ICE_INT_VERSION % 100 < 10
-#       error Ice patch level mismatch!
-#   endif
-#endif
-
 #ifndef ICE_API
 #   if defined(ICE_STATIC_LIBS)
 #       define ICE_API /**/

diff --git a/cpp/include/Ice/EndpointF.h b/cpp/include/Ice/EndpointF.h
@@ -1,17 +1,6 @@
 //
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
-//
-// Ice version 3.7.10
-//
-// <auto-generated>
-//
-// Generated from file `EndpointF.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
 
 #ifndef __Ice_EndpointF_h__
 #define __Ice_EndpointF_h__
@@ -28,18 +17,6 @@
 #include <Ice/Optional.h>
 #include <IceUtil/UndefSysMacros.h>
 
-#ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 307
-#       error Ice version mismatch!
-#   endif
-#   if ICE_INT_VERSION % 100 >= 50
-#       error Beta header file detected
-#   endif
-#   if ICE_INT_VERSION % 100 < 10
-#       error Ice patch level mismatch!
-#   endif
-#endif
-
 #ifndef ICE_API
 #   if defined(ICE_STATIC_LIBS)
 #       define ICE_API /**/

diff --git a/cpp/include/Ice/EndpointSelectionType.h b/cpp/include/Ice/EndpointSelectionType.h
@@ -1,17 +1,6 @@
 //
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
-//
-// Ice version 3.7.10
-//
-// <auto-generated>
-//
-// Generated from file `EndpointTypes.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
 
 #ifndef __Ice_EndpointSelectionType_h__
 #define __Ice_EndpointSelectionType_h__
@@ -28,18 +17,6 @@
 #include <Ice/Optional.h>
 #include <IceUtil/UndefSysMacros.h>
 
-#ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 307
-#       error Ice version mismatch!
-#   endif
-#   if ICE_INT_VERSION % 100 >= 50
-#       error Beta header file detected
-#   endif
-#   if ICE_INT_VERSION % 100 < 10
-#       error Ice patch level mismatch!
-#   endif
-#endif
-
 #ifndef ICE_API
 #   if defined(ICE_STATIC_LIBS)
 #       define ICE_API /**/