Merge branch 'stable' into v99bugfix

google · Jan 8, 2025 · 753ac5f · 753ac5f
2 parents bc8d068 + f99e8e9
commit 753ac5f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/ortools/julia/ORToolsGenerated.jl/Project.toml b/ortools/julia/ORToolsGenerated.jl/Project.toml
@@ -1,12 +1,15 @@
-name = "ORTools"
+name = "ORToolsGenerated"
 uuid = "6b269722-41d3-11ee-be56-0242ac120002"
 version = "0.0.1"
 
 [deps]
 ORTools_jll = "717719f8-c30c-5086-8f3c-70cd6a1e3a46"
+ProtoBuf = "3349acd9-ac6a-5e09-bcdb-63829b23a429"
 
 [compat]
-ORTools_jll = "9.7.0+2"
+ORTools_jll = "9.11.0"
+ProtoBuf = "1.0.15"
+julia = "1.9"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

diff --git a/ortools/julia/ORToolsGenerated.jl/src/genproto/google/google.jl b/ortools/julia/ORToolsGenerated.jl/src/genproto/google/google.jl
@@ -1,5 +1,5 @@
 module google
 
-include("google/protobuf/protobuf.jl")
+include("protobuf/protobuf.jl")
 
 end # module google
diff --git a/ortools/julia/ORToolsGenerated.jl/src/genproto/operations_research/operations_research.jl b/ortools/julia/ORToolsGenerated.jl/src/genproto/operations_research/operations_research.jl
@@ -19,7 +19,7 @@ include("scheduling/scheduling.jl")
 include("glop/glop.jl")
 include("bop/bop.jl")
 include("packing/packing.jl")
-include("ortools/pdlp/pdlp.jl")
+include("pdlp/pdlp.jl")
 include("math_opt/math_opt.jl")
 
 end # module operations_research