Skip to content

Commit 06e217d

Browse files
tpgkevinRAcopybara-github
authored andcommitted
[MJ3.3.1] Bumping internal version number.
PiperOrigin-RevId: 731876412 Change-Id: I1c0f4a18bbc2e0bf80e01512ea196841848220af
1 parent 8de9b4e commit 06e217d

File tree

16 files changed

+34
-34
lines changed

16 files changed

+34
-34
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ set(MSVC_INCREMENTAL_DEFAULT ON)
2828

2929
project(
3030
mujoco
31-
VERSION 3.3.0
31+
VERSION 3.3.1
3232
DESCRIPTION "MuJoCo Physics Simulator"
3333
HOMEPAGE_URL "https://mujoco.org"
3434
)

dist/mujoco.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
1 VERSIONINFO
2-
FILEVERSION 3,3,0,0
3-
PRODUCTVERSION 3,3,0,0
2+
FILEVERSION 3,3,1,0
3+
PRODUCTVERSION 3,3,1,0
44
FILEOS 0x4
55
FILETYPE 0x1
66
{
@@ -9,9 +9,9 @@ FILETYPE 0x1
99
BLOCK "040904b0"
1010
{
1111
VALUE "ProductName", "MuJoCo"
12-
VALUE "ProductVersion", "3.3.0"
12+
VALUE "ProductVersion", "3.3.1"
1313
VALUE "FileDescription", "MuJoCo"
14-
VALUE "FileVersion", "3.3.0"
14+
VALUE "FileVersion", "3.3.1"
1515
VALUE "InternalName", "mujoco.dll"
1616
VALUE "OriginalFilename", "mujoco.dll"
1717
VALUE "CompanyName", "Google DeepMind"

dist/simulate.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
MUJOCO ICON "mujoco.ico"
22

33
1 VERSIONINFO
4-
FILEVERSION 3,3,0,0
5-
PRODUCTVERSION 3,3,0,0
4+
FILEVERSION 3,3,1,0
5+
PRODUCTVERSION 3,3,1,0
66
FILEOS 0x4
77
FILETYPE 0x1
88
{
@@ -11,9 +11,9 @@ FILETYPE 0x1
1111
BLOCK "040904b0"
1212
{
1313
VALUE "ProductName", "MuJoCo"
14-
VALUE "ProductVersion", "3.3.0"
14+
VALUE "ProductVersion", "3.3.1"
1515
VALUE "FileDescription", "MuJoCo"
16-
VALUE "FileVersion", "3.3.0"
16+
VALUE "FileVersion", "3.3.1"
1717
VALUE "InternalName", "simulate.exe"
1818
VALUE "OriginalFilename", "simulate.exe"
1919
VALUE "CompanyName", "Google DeepMind"

doc/APIreference/APIglobals.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ shown in the table below. Their names are in the format ``mjKEY_XXX``. They corr
517517
- Maximum number of UI rectangles.
518518
Defined in `mjui.h <https://github.com/google-deepmind/mujoco/blob/main/include/mujoco/mjui.h>`_.
519519
* - ``mjVERSION_HEADER``
520-
- 330
520+
- 331
521521
- The version of the MuJoCo headers; changes with every release. This is an integer equal to 100x the software
522522
version, so 210 corresponds to version 2.1. Defined in mujoco.h. The API function :ref:`mj_version` returns a
523523
number with the same meaning but for the compiled library.

doc/unity.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ _____
3737

3838
The MuJoCo app needs to be run at least once before the native library can be used, in order to register the library as
3939
a trusted binary. Then, copy the dynamic library file from
40-
``/Applications/MuJoCo.app/Contents/Frameworks/mujoco.framework/Versions/Current/libmujoco.3.3.0.dylib`` (it can be
40+
``/Applications/MuJoCo.app/Contents/Frameworks/mujoco.framework/Versions/Current/libmujoco.3.3.1.dylib`` (it can be
4141
found by browsing the contents of ``MuJoCo.app``) and rename it as ``mujoco.dylib``.
4242

4343
Linux
4444
_____
4545

4646
Expand the ``tar.gz`` archive to ``~/.mujoco``. Then copy the dynamic library from
47-
``~/.mujoco/mujoco-3.3.0/lib/libmujoco.so.3.3.0`` and rename it as ``libmujoco.so``.
47+
``~/.mujoco/mujoco-3.3.1/lib/libmujoco.so.3.3.1`` and rename it as ``libmujoco.so``.
4848

4949
Windows
5050
_______

include/mujoco/mujoco.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define MUJOCO_MUJOCO_H_
1717

1818
// header version; should match the library version as returned by mj_version()
19-
#define mjVERSION_HEADER 330
19+
#define mjVERSION_HEADER 331
2020

2121
// needed to define size_t, fabs and log10
2222
#include <stdlib.h>

mjx/pyproject.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name="mujoco-mjx"
7-
version = "3.3.0"
7+
version = "3.3.1"
88
authors = [
99
{name = "Google DeepMind", email = "[email protected]"},
1010
]
@@ -30,7 +30,7 @@ dependencies = [
3030
"etils[epath]",
3131
"jax",
3232
"jaxlib",
33-
"mujoco>=3.3.0.dev0",
33+
"mujoco>=3.3.1.dev0",
3434
"scipy",
3535
"trimesh",
3636
]
@@ -41,9 +41,9 @@ mjx-viewer = "mujoco.mjx.viewer:main"
4141

4242
[project.urls]
4343
Homepage = "https://github.com/google-deepmind/mujoco/tree/main/mjx"
44-
Documentation = "https://mujoco.readthedocs.io/en/3.3.0"
44+
Documentation = "https://mujoco.readthedocs.io/en/3.3.1"
4545
Repository = "https://github.com/google-deepmind/mujoco/tree/main/mjx"
46-
Changelog = "https://mujoco.readthedocs.io/en/3.3.0/changelog.html"
46+
Changelog = "https://mujoco.readthedocs.io/en/3.3.1/changelog.html"
4747

4848
[tool.isort]
4949
force_single_line = true

python/mujoco/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ if(NOT TARGET mujoco)
8484
if(MUJOCO_FRAMEWORK)
8585
message("MuJoCo framework is at ${MUJOCO_FRAMEWORK}/mujoco.framework")
8686
set(MUJOCO_LIBRARY
87-
${MUJOCO_FRAMEWORK}/mujoco.framework/Versions/A/libmujoco.3.3.0.dylib
87+
${MUJOCO_FRAMEWORK}/mujoco.framework/Versions/A/libmujoco.3.3.1.dylib
8888
)
8989
target_compile_options(mujoco INTERFACE -F${MUJOCO_FRAMEWORK})
9090
endif()
9191
endif()
9292

9393
if(NOT MUJOCO_FRAMEWORK)
9494
find_library(
95-
MUJOCO_LIBRARY mujoco mujoco.3.3.0 HINTS ${MUJOCO_LIBRARY_DIR} REQUIRED
95+
MUJOCO_LIBRARY mujoco mujoco.3.3.1 HINTS ${MUJOCO_LIBRARY_DIR} REQUIRED
9696
)
9797
find_path(MUJOCO_INCLUDE mujoco/mujoco.h HINTS ${MUJOCO_INCLUDE_DIR} REQUIRED)
9898
message("MuJoCo is at ${MUJOCO_LIBRARY}")

python/mujoco/mjpython/Info.plist

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<key>CFBundleIdentifier</key>
88
<string>org.mujoco.mjpython</string>
99
<key>CFBundleVersion</key>
10-
<string>3.3.0</string>
10+
<string>3.3.1</string>
1111
<key>CFBundleGetInfoString</key>
12-
<string>3.3.0</string>
12+
<string>3.3.1</string>
1313
<key>CFBundleLongVersionString</key>
14-
<string>3.3.0</string>
14+
<string>3.3.1</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>3.3.0</string>
16+
<string>3.3.1</string>
1717
<key>CFBundleExecutable</key>
1818
<string>mjpython</string>
1919
<key>CFBundleIconFile</key>

python/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "mujoco"
7-
version = "3.3.0"
7+
version = "3.3.1"
88
authors = [
99
{name = "Google DeepMind", email = "[email protected]"},
1010
]
@@ -35,9 +35,9 @@ dynamic = ["readme", "scripts"]
3535

3636
[project.urls]
3737
Homepage = "https://github.com/google-deepmind/mujoco"
38-
Documentation = "https://mujoco.readthedocs.io/en/3.3.0"
38+
Documentation = "https://mujoco.readthedocs.io/en/3.3.1"
3939
Repository = "https://github.com/google-deepmind/mujoco"
40-
Changelog = "https://mujoco.readthedocs.io/en/3.3.0/changelog.html"
40+
Changelog = "https://mujoco.readthedocs.io/en/3.3.1/changelog.html"
4141

4242
[tool.setuptools]
4343
include-package-data = false

sample/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ set(MSVC_INCREMENTAL_DEFAULT ON)
2424

2525
project(
2626
mujoco_samples
27-
VERSION 3.3.0
27+
VERSION 3.3.1
2828
DESCRIPTION "MuJoCo samples binaries"
2929
HOMEPAGE_URL "https://mujoco.org"
3030
)

simulate/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ set(MUJOCO_DEP_VERSION_lodepng
2929

3030
project(
3131
mujoco_simulate
32-
VERSION 3.3.0
32+
VERSION 3.3.1
3333
DESCRIPTION "MuJoCo simulate binaries"
3434
HOMEPAGE_URL "https://mujoco.org"
3535
)

src/engine/engine_support.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141

4242
//-------------------------- Constants -------------------------------------------------------------
4343

44-
#define mjVERSION 330
45-
#define mjVERSIONSTRING "3.3.0"
44+
#define mjVERSION 331
45+
#define mjVERSIONSTRING "3.3.1"
4646

4747
// names of disable flags
4848
const char* mjDISABLESTRING[mjNDISABLE] = {

unity/Editor/Bindings/MujocoBinaryRetriever.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ static void RegisteredPackagesEventHandler(
3737
if (AssetDatabase.LoadMainAssetAtPath(mujocoPath + "/mujoco.dylib") == null) {
3838
File.Copy(
3939
"/Applications/MuJoCo.app/Contents/Frameworks" +
40-
"/mujoco.framework/Versions/Current/libmujoco.3.3.0.dylib",
40+
"/mujoco.framework/Versions/Current/libmujoco.3.3.1.dylib",
4141
mujocoPath + "/mujoco.dylib");
4242
AssetDatabase.Refresh();
4343
}
4444
} else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) {
4545
if (AssetDatabase.LoadMainAssetAtPath(mujocoPath + "/libmujoco.so") == null) {
4646
File.Copy(
4747
Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) +
48-
"/.mujoco/mujoco-3.3.0/lib/libmujoco.so.3.3.0",
48+
"/.mujoco/mujoco-3.3.1/lib/libmujoco.so.3.3.1",
4949
mujocoPath + "/libmujoco.so");
5050
AssetDatabase.Refresh();
5151
}

unity/Runtime/Bindings/MjBindings.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public static class MujocoLib {
110110
public const int mjMAXPLANEGRID = 200;
111111
public const bool THIRD_PARTY_MUJOCO_MJXMACRO_H_ = true;
112112
public const bool THIRD_PARTY_MUJOCO_MUJOCO_H_ = true;
113-
public const int mjVERSION_HEADER = 330;
113+
public const int mjVERSION_HEADER = 331;
114114

115115

116116
// ------------------------------------Enums------------------------------------

unity/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "org.mujoco",
33
"displayName": "MuJoCo",
4-
"version": "3.3.0",
4+
"version": "3.3.1",
55
"description": "MuJoCo importer and runtime plug-in",
66
"dependencies": {},
77
"author": {

0 commit comments

Comments
 (0)