summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/Make.rules4
-rw-r--r--config/iphoneos-SDKSettings.plist2
-rw-r--r--config/iphonesimulator-SDKSettings.plist2
-rw-r--r--config/macosx-SDKSettings.plist2
-rw-r--r--cpp/config/templates.xml4
-rw-r--r--cpp/include/IceUtil/Config.h6
-rw-r--r--cpp/include/IceUtil/ResourceConfig.h6
-rw-r--r--cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS8
-rw-r--r--cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS2
-rw-r--r--cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS2
-rw-r--r--swift/Rakefile4
-rw-r--r--swift/src/Ice/Initialize.swift4
12 files changed, 23 insertions, 23 deletions
diff --git a/config/Make.rules b/config/Make.rules
index 015e9643cec..254bd4f574b 100644
--- a/config/Make.rules
+++ b/config/Make.rules
@@ -102,9 +102,9 @@ supported-languages ?= $(strip cpp java java-compat python ruby php \
$(if $(filter Darwin,$(os)),objective-c))
supported-configs ?= shared
-version = 3.7b1
+version = 3.7b2
mmversion = 3.7
-soversion = 37b1
+soversion = 37b2
#
# The compatversion is the lowest patch release with the same API.
diff --git a/config/iphoneos-SDKSettings.plist b/config/iphoneos-SDKSettings.plist
index 2f81ef3ce0d..0c0cf636f8f 100644
--- 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.7b1</string>
+ <string>3.7b2</string>
</dict>
</plist>
diff --git a/config/iphonesimulator-SDKSettings.plist b/config/iphonesimulator-SDKSettings.plist
index fb52053f909..b238066ac4e 100644
--- 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.7b1</string>
+ <string>3.7b2</string>
</dict>
</plist>
diff --git a/config/macosx-SDKSettings.plist b/config/macosx-SDKSettings.plist
index 8509a21dc4b..741c5686430 100644
--- 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.7b1</string>
+ <string>3.7b2</string>
</dict>
</plist>
diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml
index a50b4f932d8..a98061b03dc 100644
--- 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,37b1:createIceStorm">
+ <service name="${instance-name}" entry="IceStormService,37b2: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,37b1:createIceStorm">
+ <service name="${instance-name}${node-id}" entry="IceStormService,37b2:createIceStorm">
<adapter name="${service}.TopicManager"
id="${instance-name}${node-id}.TopicManager"
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index f12da0ece4a..f4f1ded5e17 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -275,9 +275,9 @@
//
// The Ice version.
//
-#define ICE_STRING_VERSION "3.7b1" // "A.B.C", with A=major, B=minor, C=patch
-#define ICE_INT_VERSION 30761 // AABBCC, with AA=major, BB=minor, CC=patch
-#define ICE_SO_VERSION "37b1" // "ABC", with A=major, B=minor, C=patch
+#define ICE_STRING_VERSION "3.7b2" // "A.B.C", with A=major, B=minor, C=patch
+#define ICE_INT_VERSION 30762 // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICE_SO_VERSION "37b2" // "ABC", with A=major, B=minor, C=patch
#if !defined(ICE_BUILDING_ICE) && defined(ICE_API_EXPORTS)
# define ICE_BUILDING_ICE
diff --git a/cpp/include/IceUtil/ResourceConfig.h b/cpp/include/IceUtil/ResourceConfig.h
index e446105a345..420a2dba6f3 100644
--- a/cpp/include/IceUtil/ResourceConfig.h
+++ b/cpp/include/IceUtil/ResourceConfig.h
@@ -7,9 +7,9 @@
#include "winver.h"
-#define ICE_VERSION 3,7,61,0
-#define ICE_STRING_VERSION "3.7b1\0"
-#define ICE_SO_VERSION "37b1\0"
+#define ICE_VERSION 3,7,62,0
+#define ICE_STRING_VERSION "3.7b2\0"
+#define ICE_SO_VERSION "37b2\0"
#define ICE_COMPANY_NAME "ZeroC, Inc.\0"
#define ICE_COPYRIGHT "\251 ZeroC, Inc.\0"
#define ICE_PRODUCT_NAME "Ice\0"
diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS b/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS
index 0cba425ebe5..56aad941676 100644
--- a/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS
+++ b/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS
@@ -1,7 +1,7 @@
- 0 IceUtil::Exception::Exception(char const*, int) in libIce.3.7b1.dylib
- 1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper(char const*, int) in libIce.3.7b1.dylib
- 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b1.dylib
- 3 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b1.dylib
+ 0 IceUtil::Exception::Exception(char const*, int) in libIce.3.7b2.dylib
+ 1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper(char const*, int) in libIce.3.7b2.dylib
+ 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b2.dylib
+ 3 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b2.dylib
4 (anonymous namespace)::Thrower::fifth() in client
5 (anonymous namespace)::Thrower::forth() in client
6 (anonymous namespace)::Thrower::third() in client
diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS
index cf223bb842d..72ba6b5f005 100644
--- a/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS
+++ b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS
@@ -1,4 +1,4 @@
- 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b1.dylib
+ 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b2.dylib
1 (anonymous namespace)::Thrower::fifth() in client
2 (anonymous namespace)::Thrower::forth() in client
3 (anonymous namespace)::Thrower::third() in client
diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS
index 282221ff313..8ce1c4f6e76 100644
--- a/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS
+++ b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS
@@ -1,3 +1,3 @@
- 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b1.dylib
+ 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7b2.dylib
1 Client::run(int, char**) in client
2 int Test::runTest<Client>(int, char**) in client
diff --git a/swift/Rakefile b/swift/Rakefile
index 8f03c5de19d..a29cffca0cf 100644
--- a/swift/Rakefile
+++ b/swift/Rakefile
@@ -603,8 +603,8 @@ def target_set_common_build_settings(target, product, plist: nil, swift: false)
config.build_settings["GCC_SYMBOLS_PRIVATE_EXTERN"] = "YES"
config.build_settings["ENABLE_TESTABILITY"] = "NO"
config.build_settings["CODE_SIGN_STYLE"] = "Automatic"
- config.build_settings["CURRENT_PROJECT_VERSION"] = "3.7.61"
- config.build_settings["DYLIB_CURRENT_VERSION"] = "3.7.61"
+ config.build_settings["CURRENT_PROJECT_VERSION"] = "3.7.62"
+ config.build_settings["DYLIB_CURRENT_VERSION"] = "3.7.62"
config.build_settings["DYLIB_COMPATIBILITY_VERSION"] = "0"
if plist then
diff --git a/swift/src/Ice/Initialize.swift b/swift/src/Ice/Initialize.swift
index 561727b449d..15fef58d81e 100644
--- a/swift/src/Ice/Initialize.swift
+++ b/swift/src/Ice/Initialize.swift
@@ -230,11 +230,11 @@ public func createProperties(_ args: inout [String], defaults: Properties? = nil
/// indicates the major version, BB indicates the minor version, and CC
/// indicates the patch level. For example, for Ice 3.3.1, the returned
/// value is 30301.
-public let intVersion: Int = 30761
+public let intVersion: Int = 30762
/// The Ice version in the form A.B.C, where A indicates the major version,
/// B indicates the minor version, and C indicates the patch level.
-public let stringVersion: String = "3.7b1"
+public let stringVersion: String = "3.7b2"
public let Encoding_1_0 = EncodingVersion(major: 1, minor: 0)
public let Encoding_1_1 = EncodingVersion(major: 1, minor: 1)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 20:44:59 +0000